modified: widgets/weather.lua - fixed the OWM "feature" for icon day/night state...

diff --git a/widgets/weather.lua b/widgets/weather.lua
index ca0ceed7cf639a27c26594ca1c81162b9e65b32a..f60a8fc4d67f1cc31578ee83e890854865bc2d91 100644 (file)
--- a/widgets/weather.lua
+++ b/widgets/weather.lua
@@ -117,11 +117,20 @@ 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, sunrise, sunset, current_dt, datetime, 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"
+                current_dt = os.time()
+                sunrise = weather_now["sys"]["sunrise"]
+                sunset  = weather_now["sys"]["sunset"]
+                if current_dt > sunrise and current_dt < sunset then 
+                    datetime="d"
+                else
+                    datetime="n"
+                end
+                icon = weather_now["weather"][1]["icon"]
+                weather.icon_path = icons_path .. icon:sub(1,2) .. datetime .. ".png"

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