X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/053ce982b8fc2f4ec3a4865cb41204331faab6eb..40d3c9e33af88711c78b50b5eb3d2d48388f796e:/widgets/weather.lua

diff --git a/widgets/weather.lua b/widgets/weather.lua
index c684fe2..84c1564 100644
--- a/widgets/weather.lua
+++ b/widgets/weather.lua
@@ -39,6 +39,7 @@ local function worker(args)
     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
@@ -73,8 +74,9 @@ local function worker(args)
             weather.forecast_update()
         end
 
+
         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
@@ -119,42 +121,40 @@ local function worker(args)
 
     function weather.update()
         local cmd = string.format(current_call, city_id, units, lang, APPID)
+        local utc_midnight_cmd   = ("date -u -d 'today 00:00:00' +'%%s'")
+
         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
-<<<<<<< HEAD
                 -- weather icon based on localtime
-                now     = os.time() - (utc * 3600)
+
+                now     = os.time()
+                utc_midnight   = string.gsub(read_pipe(string.format(utc_midnight_cmd)), "\n", "")
+
+                if utc > 0 then
+                    if (now  - (utc * 3600)) >= tonumber(utc_midnight) then 
+                       now = now - 86400
+                    end
+                else
+                    if (now  - (utc * 3600)) <= tonumber(utc_midnight) then 
+                       now = now + 86400
+                    end
+                end
                 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")
-=======
-                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
-<<<<<<< HEAD
 
                 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
-                weather.current_text = "Now:" .. weather_now["weather"][1]["description"] .. "\n"
                 settings()
             else
                 weather.icon_path = icons_path .. "na.png"