madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Weather status icon fix
authorAleksandr Beliaev <trap000d@gmail.com>
Sun, 12 May 2019 23:08:46 +0000 (11:08 +1200)
committerAleksandr Beliaev <trap000d@gmail.com>
Sun, 12 May 2019 23:08:46 +0000 (11:08 +1200)
widget/weather.lua

index c998ed9754f8873e75ea1073620faa10a6e9a3ed..9c1e797fe8bb69eabc47b10f0b22f53395310ab3 100644 (file)
@@ -117,20 +117,7 @@ local function factory(args)
                 local sunrise = tonumber(weather_now["sys"]["sunrise"])
                 local sunset  = tonumber(weather_now["sys"]["sunset"])
                 local icon    = weather_now["weather"][1]["icon"]
-                local loc_now = os.time() -- local time
-                local loc_m   = os.time { year = os.date("%Y"), month = os.date("%m"), day = os.date("%d"), hour = 0 } -- local time from midnight
-                local loc_d   = os.date("*t",  loc_now) -- table YMDHMS for current local time (for TZ calculation)
-                local utc_d   = os.date("!*t", loc_now) -- table YMDHMS for current UTC time
-                local utc_now = os.time(utc_d) -- UTC time now
-                local offdt   = (loc_d.isdst and 1 or 0) * 3600 + 100 * (loc_d.min  - utc_d.min) / 60 -- DST offset
-                local offset  = os.difftime(loc_now, utc_now) + (loc_d.isdst and 1 or 0) * 3600 + 100 * (loc_d.min  - utc_d.min) / 60 -- TZ offset (including DST)
-                local offday  = (offset < 0 and -86400) or 86400 -- 24 hour correction value (+86400 or -86400)
-
-                -- if current UTC time is earlier then local midnight -> positive offset (negative otherwise)
-                if offset * (loc_m - utc_now + offdt) > 0 then
-                    sunrise = sunrise + offday -- Shift sunset and sunrise times by 24 hours
-                    sunset  = sunset  + offday
-                end
+                local loc_now = os.time()
 
                 if sunrise <= loc_now and loc_now <= sunset then
                     icon = string.gsub(icon, "n", "d")