]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/weather.lua

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:

projects / etc / awesome.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge remote-tracking branch 'upstream/master'
[etc/awesome.git] / widgets / weather.lua
diff --git a/widgets/weather.lua b/widgets/weather.lua
index 042d1e777c2b3a662993cea2abdbad2a9c7df29c..b074cff41d555701281be65ec79568525d73ae01 100644 (file)
--- a/widgets/weather.lua
+++ b/widgets/weather.lua
@@ -16,12 +16,14 @@ local lain_icons   = require("lain.helpers").icons_dir
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
-local math         = { floor  = math.floor }
+local math         = { floor    = math.floor }
+local os           = { time     = os.time,
+                       date     = os.date,
+                       difftime = os.difftime }
+local string       = { format   = string.format,
+                       gsub     = string.gsub }
+
 local mouse        = mouse
 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
 
 local tonumber     = tonumber
 local setmetatable = setmetatable
 
@@ -38,7 +40,11 @@ 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 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 3600)
+                                  end
     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
@@ -51,7 +57,6 @@ local function worker(args)
                                       local tmin = math.floor(wn["temp"]["min"])
                                       local tmax = math.floor(wn["temp"]["max"])
                                       local desc = wn["weather"][1]["description"]
                                       local tmin = math.floor(wn["temp"]["min"])
                                       local tmax = math.floor(wn["temp"]["max"])
                                       local desc = wn["weather"][1]["description"]
-
                                       return string.format("<b>%s</b>: %s, %d - %d ", day, desc, tmin, tmax)
                                   end
     local weather_na_markup     = args.weather_na_markup or " N/A "
                                       return string.format("<b>%s</b>: %s, %d - %d ", day, desc, tmin, tmax)
                                   end
     local weather_na_markup     = args.weather_na_markup or " N/A "
@@ -73,7 +78,6 @@ 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,
@@ -120,34 +124,29 @@ local function worker(args)
 
     function weather.update()
         local cmd = string.format(current_call, city_id, units, lang, APPID)
 
     function weather.update()
         local cmd = string.format(current_call, city_id, units, lang, APPID)
-        local utc_midnight_cmd   = string.format("date -u -d 'today 00:00:00' +'%%s'")
-        local local_midnight_cmd = string.format("date -d 'today 00:00:00' +'%%s'")
-
         async.request(cmd, function(f)
             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 icon based on localtime
         async.request(cmd, function(f)
             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 icon based on localtime
-                now                  = os.time()
-                local utc_midnight   = string.gsub(read_pipe(utc_midnight_cmd), "\n", "")
-                local local_midnight = string.gsub(read_pipe(local_midnight_cmd), "\n", "")
-             
-                if utc > 0 then -- we are to the East from GMT
-                    if tonumber(local_midnight) >= tonumber(utc_midnight) then -- we are 1 day after the GMT, so have to return 1 day back
-                       now = now - 86400
-                    end
-                end
-
-                if utc < 0 then -- we are to the West from GMT
-                    if tonumber(local_midnight) <= tonumber(utc_midnight) then -- we are 1 day before the GMT
-                       now = now + 86400
-                    end
-                end
-                -- if utc==0 leave it as is
+                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 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", "")
+                local loc_m   = string.gsub(read_pipe(string.format("date -d 'today 00:00:00' +'%%s'")), "\n", "")
+
+                loc_m  = tonumber(loc_m)
+                utc_m  = tonumber(utc_m)
+                offset = utc_offset()
+
+                -- if we are 1 day after the GMT, return 1 day back, and viceversa
+                if offset > 0 and loc_m >= utc_m then
+                    now = now - 86400
+                elseif offset < 0 and loc_m <= utc_m then
+                    now = now + 86400
+                end
 
                 if sunrise <= now and now <= sunset then
                     icon = string.gsub(icon, "n", "d")
 
                 if sunrise <= now and now <= sunset then
                     icon = string.gsub(icon, "n", "d")
@@ -156,7 +155,6 @@ local function worker(args)
                 end
 
                 weather.icon_path = icons_path .. icon .. ".png"
                 end
 
                 weather.icon_path = icons_path .. icon .. ".png"
-
                 widget = weather.widget
                 settings()
             else
                 widget = weather.widget
                 settings()
             else
awesome window-manager configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.