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 widget working without utc_offset
authorAleksandr Beliaev <trap000d@gmail.com>
Wed, 6 Sep 2017 01:28:18 +0000 (13:28 +1200)
committerLuke Bonham <dada@archlinux.info>
Mon, 11 Sep 2017 09:08:34 +0000 (11:08 +0200)
widget/weather.lua
wiki

index c7563d5ad14a6ee1735f8cca5568737d7a8bd198..b75afc8560936fc3936559fba113ff239bb1f81f 100644 (file)
@@ -26,11 +26,6 @@ local function factory(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_offset            = args.utc_offset or
-                                  function ()
-                                      local now = os.time()
-                                      return os.difftime(now, os.time(os.date("!*t", now))) + ((os.date("*t").isdst and 1 or 0) * 3600)
-                                  end
     local units                 = args.units or "metric"
     local lang                  = args.lang or "en"
     local cnt                   = args.cnt or 5
@@ -119,19 +114,26 @@ 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 now     = os.time()
+                local loc_now = os.time()
                 local loc_m   = os.time { year = os.date("%Y"), month = os.date("%m"), day = os.date("%d"), hour = 0 }
-                local offset  = utc_offset()
-                local utc_m   = loc_m - offset
-
-                -- if we are 1 day after the GMT, return 1 day back, and viceversa
-                if offset > 0 and (now - utc_m) >= 86400 then
-                    utc_m = utc_m + 86400
-                elseif offset < 0 and (utc_m - now) >= 86400 then
-                    utc_m = utc_m - 86400
+                local loc_t   = os.difftime(loc_now, loc_m)
+                local loc_d   = os.date("*t",  loc_now)
+                local utc_d   = os.date("!*t", loc_now)
+                local utc_now = os.time(utc_d)
+                local offdt   = (loc_d.isdst and 1 or 0) * 3600 + 100 * (loc_d.min  - utc_d.min) / 60
+                local offset  = os.difftime(loc_now, utc_now) + offdt
+                local offday  = (offset < 0 and -86400) or 86400
+
+                if math.abs(loc_now - utc_now - offdt + loc_t) >= 86400 then
+                    utc_now = utc_now + offday
+                end
+
+                if offday * (loc_now - utc_now - offdt) > 0 then
+                    sunrise = sunrise + offday
+                    sunset  = sunset  + offday
                 end
 
-                if sunrise <= now and now <= sunset then
+                if sunrise <= loc_now and loc_now <= sunset then
                     icon = string.gsub(icon, "n", "d")
                 else
                     icon = string.gsub(icon, "d", "n")
diff --git a/wiki b/wiki
index 1e2503366ea9ca31378bcb374e13f1bae5e4be94..c221a2725d3968f85615328252b710fe0e60bd9e 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 1e2503366ea9ca31378bcb374e13f1bae5e4be94
+Subproject commit c221a2725d3968f85615328252b710fe0e60bd9e