weather: icons based on localtime; closes pull #198

diff --git a/widgets/borderbox.lua b/widgets/borderbox.lua
index fb992de8975c26374e0bd4826a41fafa6c12bcb5..149b83517f29467125eddeaf82b0569b51836ac0 100644 (file)
--- a/widgets/borderbox.lua
+++ b/widgets/borderbox.lua
@@ -15,14 +15,11 @@ local setmetatable = setmetatable
 local borderbox = {}
 
 local function worker(relbox, s, args)
 local borderbox = {}
 
 local function worker(relbox, s, args)

-    local where = args.position or 'top'
-    local color = args.color or '#FFFFFF'
-    local size = args.size or 1
-    local box = nil
-    local wiboxarg = {
-        position = nil,
-        bg = color
-    }
+    local where    = args.position or 'top'
+    local color    = args.color or '#FFFFFF'
+    local size     = args.size or 1
+    local box      = nil
+    local wiboxarg = { position = nil, bg = color }

 
     if where == 'top'
     then
 
     if where == 'top'
     then

diff --git a/widgets/temp.lua b/widgets/temp.lua
index a857e71e3de7f80167df6c67817c9f24d9290b8f..a4ada5276de7d667d8ad8fb5c155935651f099c3 100644 (file)
--- a/widgets/temp.lua
+++ b/widgets/temp.lua
@@ -29,8 +29,7 @@ local function worker(args)
 
     function update()
         local f = io.open(tempfile)
 
     function update()
         local f = io.open(tempfile)

-        if f ~= nil
-        then
+        if f then

             coretemp_now = tonumber(f:read("*all")) / 1000
             f:close()
         else
             coretemp_now = tonumber(f:read("*all")) / 1000
             f:close()
         else

diff --git a/widgets/weather.lua b/widgets/weather.lua
index ca0ceed7cf639a27c26594ca1c81162b9e65b32a..37a92ff80f1106c2ab376845ca5a569f6c5754b8 100644 (file)
--- a/widgets/weather.lua
+++ b/widgets/weather.lua
@@ -18,9 +18,11 @@ local wibox        = require("wibox")
 
 local math         = { floor  = math.floor }
 local mouse        = mouse
 
 local math         = { floor  = math.floor }
 local mouse        = mouse

+local os           = { time   = os.time }

 local string       = { format = string.format,
                        gsub   = string.gsub }
 
 local string       = { format = string.format,
                        gsub   = string.gsub }
 

+local tonumber     = tonumber

 local setmetatable = setmetatable
 
 -- OpenWeatherMap
 local setmetatable = setmetatable
 
 -- OpenWeatherMap


@@ -36,6 +38,7 @@ local function worker(args)
     local current_call          = args.current_call  or "curl -s 'http://api.openweathermap.org/data/2.5/weather?id=%s&units=%s&lang=%s&APPID=%s'"
     local forecast_call         = args.forecast_call or "curl -s 'http://api.openweathermap.org/data/2.5/forecast/daily?id=%s&units=%s&lang=%s&cnt=%s&APPID=%s'"
     local city_id               = args.city_id or 0 -- placeholder
     local current_call          = args.current_call  or "curl -s 'http://api.openweathermap.org/data/2.5/weather?id=%s&units=%s&lang=%s&APPID=%s'"
     local forecast_call         = args.forecast_call or "curl -s 'http://api.openweathermap.org/data/2.5/forecast/daily?id=%s&units=%s&lang=%s&cnt=%s&APPID=%s'"
     local city_id               = args.city_id or 0 -- placeholder

+         local utc                   = args.utc or 0

     local units                 = args.units or "metric"
     local lang                  = args.lang or "en"
     local cnt                   = args.cnt or 5
     local units                 = args.units or "metric"
     local lang                  = args.lang or "en"
     local cnt                   = args.cnt or 5


@@ -70,6 +73,7 @@ local function worker(args)
             weather.forecast_update()
         end
 
             weather.forecast_update()
         end
 

+

         weather.notification = naughty.notify({
             text    = weather.notification_text,
             icon    = weather.icon_path,
         weather.notification = naughty.notify({
             text    = weather.notification_text,
             icon    = weather.icon_path,


@@ -117,11 +121,24 @@ local function worker(args)
     function weather.update()
         local cmd = string.format(current_call, city_id, units, lang, APPID)
         async.request(cmd, function(f)
     function weather.update()
         local cmd = string.format(current_call, city_id, units, lang, APPID)
         async.request(cmd, function(f)

-            local pos, err
+            local pos, err, icon

             weather_now, pos, err = json.decode(f, 1, nil)
 
             if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
             weather_now, pos, err = json.decode(f, 1, nil)
 
             if not err and weather_now and tonumber(weather_now["cod"]) == 200 then

-                weather.icon_path = icons_path .. weather_now["weather"][1]["icon"] .. ".png"
+                -- weather icon based on localtime
+                now     = os.time() - (utc * 3600)
+                sunrise = tonumber(weather_now["sys"]["sunrise"])
+                sunset  = tonumber(weather_now["sys"]["sunset"])
+                icon    = weather_now["weather"][1]["icon"]
+
+                if sunrise <= now and now <= sunset then
+                    icon = string.gsub(icon, "n", "d")
+                else
+                    icon = string.gsub(icon, "d", "n")
+                end
+
+                weather.icon_path = icons_path .. icon .. ".png"
+

                 widget = weather.widget
                 settings()
             else
                 widget = weather.widget
                 settings()
             else

diff --git a/wiki b/wiki
index ac3af8c33cc593af15b85f68e20c262e847d566b..d567782c4314edc851b86a1ca4f853b238774f2e 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit ac3af8c33cc593af15b85f68e20c262e847d566b
+Subproject commit d567782c4314edc851b86a1ca4f853b238774f2e