pull #201 fixes

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

diff --git a/widgets/weather.lua b/widgets/weather.lua
index ca0ceed7cf639a27c26594ca1c81162b9e65b32a..c8c34f973e5b3ce2e5675f0fc43ec2ce585c147b 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 naughty = require("naughty")
+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,29 @@ 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
+                local now     = os.time()
+                local sunrise = tonumber(weather_now["sys"]["sunrise"])
+                local sunset  = tonumber(weather_now["sys"]["sunset"])
+                local icon    = weather_now["weather"][1]["icon"]
+                local utc_m   = string.gsub(read_pipe(string.format("date -u -d 'today 00:00:00' +'%%s'")), "\n", "")
+
+                if now > tonumber(utc_m) then
+                    now = now - (utc * 3600)
+                end
+
+                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