Merge branch 'master' of github.com:trap000d/lain

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

diff --git a/widgets/weather.lua b/widgets/weather.lua
index 37a92ff80f1106c2ab376845ca5a569f6c5754b8..c684fe22583f51494ebf6d46b1ef8e4384cb693d 100644 (file)
--- a/widgets/weather.lua
+++ b/widgets/weather.lua
@@ -38,7 +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 utc                   = args.utc or 0
+    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,9 +73,8 @@ local function worker(args)
             weather.forecast_update()
         end
 
-
         weather.notification = naughty.notify({
-            text    = weather.notification_text,
+            text    = weather.current_text .. weather.notification_text,
             icon    = weather.icon_path,
             timeout = t_out,
             preset  = notification_preset
@@ -123,8 +122,9 @@ local function worker(args)
         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)
                 sunrise = tonumber(weather_now["sys"]["sunrise"])
@@ -133,13 +133,28 @@ local function worker(args)
 
                 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"