From: Luke Bonham <dada@archlinux.info>
Date: Tue, 31 May 2016 08:00:28 +0000 (+0200)
Subject: #198 fix attempt 2
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/5efaca89d0c0f44464bd7dbd5b9278b5cf492d86?ds=inline

#198 fix attempt 2
---

diff --git a/widgets/weather.lua b/widgets/weather.lua
index 75c2342..c8c34f9 100644
--- 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 naughty = require("naughty")
 local tonumber     = tonumber
 local setmetatable = setmetatable
 
@@ -126,10 +126,15 @@ local function worker(args)
 
             if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
                 -- weather icon based on localtime
-                now     = os.time()
-                sunrise = tonumber(weather_now["sys"]["sunrise"]) + (utc * 3600)
-                sunset  = tonumber(weather_now["sys"]["sunset"]) + (utc * 3600)
-                icon    = weather_now["weather"][1]["icon"]
+                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")
diff --git a/wiki b/wiki
index fea7079..184b98a 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit fea7079ab58cbbea9c18733485f264bc154fe580
+Subproject commit 184b98a8e765fe48f31c30a0ac5d3a3962ed46a1