another attempt to fix weather widget behaviour

[etc/awesome.git] / widgets / weather.lua

diff --git a/widgets/weather.lua b/widgets/weather.lua
index c684fe22583f51494ebf6d46b1ef8e4384cb693d..042d1e777c2b3a662993cea2abdbad2a9c7df29c 100644 (file)
--- a/widgets/weather.lua
+++ b/widgets/weather.lua
@@ -21,7 +21,7 @@ local mouse        = mouse
 local os           = { time   = os.time }
 local string       = { format = string.format,
                        gsub   = string.gsub }
 local os           = { time   = os.time }
 local string       = { format = string.format,
                        gsub   = string.gsub }

-
+local naughty = require("naughty")

 local tonumber     = tonumber
 local setmetatable = setmetatable
 
 local tonumber     = tonumber
 local setmetatable = setmetatable
 


@@ -73,8 +73,9 @@ local function worker(args)
             weather.forecast_update()
         end
 
             weather.forecast_update()
         end
 

+

         weather.notification = naughty.notify({
         weather.notification = naughty.notify({

-            text    = weather.current_text .. weather.notification_text,
+            text    = weather.notification_text,

             icon    = weather.icon_path,
             timeout = t_out,
             preset  = notification_preset
             icon    = weather.icon_path,
             timeout = t_out,
             preset  = notification_preset


@@ -119,42 +120,44 @@ local function worker(args)
 
     function weather.update()
         local cmd = string.format(current_call, city_id, units, lang, APPID)
 
     function weather.update()
         local cmd = string.format(current_call, city_id, units, lang, APPID)

+        local utc_midnight_cmd   = string.format("date -u -d 'today 00:00:00' +'%%s'")
+        local local_midnight_cmd = string.format("date -d 'today 00:00:00' +'%%s'")
+

         async.request(cmd, function(f)
             local pos, err, icon
             weather_now, pos, err = json.decode(f, 1, nil)
         async.request(cmd, function(f)
             local pos, err, icon
             weather_now, pos, err = json.decode(f, 1, nil)

-            weather.current_text=''
+

             if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
             if not err and weather_now and tonumber(weather_now["cod"]) == 200 then

-<<<<<<< HEAD

                 -- weather icon based on localtime
                 -- 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"]
+                now                  = os.time()
+                local utc_midnight   = string.gsub(read_pipe(utc_midnight_cmd), "\n", "")
+                local local_midnight = string.gsub(read_pipe(local_midnight_cmd), "\n", "")
+             
+                if utc > 0 then -- we are to the East from GMT
+                    if tonumber(local_midnight) >= tonumber(utc_midnight) then -- we are 1 day after the GMT, so have to return 1 day back
+                       now = now - 86400
+                    end
+                end
+
+                if utc < 0 then -- we are to the West from GMT
+                    if tonumber(local_midnight) <= tonumber(utc_midnight) then -- we are 1 day before the GMT
+                       now = now + 86400
+                    end
+                end
+                -- if utc==0 leave it as is
+                local sunrise = tonumber(weather_now["sys"]["sunrise"])
+                local sunset  = tonumber(weather_now["sys"]["sunset"])
+                local icon    = weather_now["weather"][1]["icon"]

 
                 if sunrise <= now and now <= sunset then
                     icon = string.gsub(icon, "n", "d")
 
                 if sunrise <= now and now <= sunset then
                     icon = string.gsub(icon, "n", "d")

-=======
-                current_dt = os.time()
-                sunrise = weather_now["sys"]["sunrise"]
-                sunset  = weather_now["sys"]["sunset"]
-                if current_dt> sunrise and current_dt> sunset then current_dt = current_dt - 86400 end
-                if current_dt > sunrise and current_dt < sunset then 
-                    datetime="d"
->>>>>>> e3a5dd623700b2cad423c8179141124e6e9b9027

                 else
                     icon = string.gsub(icon, "d", "n")
                 end
                 else
                     icon = string.gsub(icon, "d", "n")
                 end

-<<<<<<< HEAD

 
                 weather.icon_path = icons_path .. icon .. ".png"
 
 
                 weather.icon_path = icons_path .. icon .. ".png"
 

-=======
-                -- error("dt sr:" .. sunrise .. "ss: " .. sunset .. "dt: " .. current_dt .. "d/n: " .. datetime .. "hehe")
-                icon = weather_now["weather"][1]["icon"]
-                weather.icon_path = icons_path .. icon:sub(1,2) .. datetime .. ".png"
->>>>>>> e3a5dd623700b2cad423c8179141124e6e9b9027

                 widget = weather.widget
                 widget = weather.widget

-                weather.current_text = "Now:" .. weather_now["weather"][1]["description"] .. "\n"

                 settings()
             else
                 weather.icon_path = icons_path .. "na.png"
                 settings()
             else
                 weather.icon_path = icons_path .. "na.png"