]> 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
adding .rockspec file to generate a luarocks rock
[etc/awesome.git] / widgets / weather.lua
diff --git a/widgets/weather.lua b/widgets/weather.lua
index ca0ceed7cf639a27c26594ca1c81162b9e65b32a..545e6d1a3c6ca6e7a6867150689f45c4e62100f9 100644 (file)
--- a/widgets/weather.lua
+++ b/widgets/weather.lua
@@ -16,11 +16,15 @@ 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 mouse        = mouse
-local string       = { format = string.format,
-                       gsub   = string.gsub }
+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 tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- OpenWeatherMap
 local setmetatable = setmetatable
 
 -- OpenWeatherMap
@@ -36,6 +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_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
     local units                 = args.units or "metric"
     local lang                  = args.lang or "en"
     local cnt                   = args.cnt or 5
@@ -48,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 "
@@ -100,7 +108,7 @@ local function worker(args)
             local pos, err
             weather_now, pos, err = json.decode(f, 1, nil)
 
             local pos, err
             weather_now, pos, err = json.decode(f, 1, nil)
 
-            if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
+            if not err and type(weather_now) == "table" and tonumber(weather_now["cod"]) == 200 then
                 weather.notification_text = ''
                 for i = 1, weather_now["cnt"] do
                     weather.notification_text = weather.notification_text ..
                 weather.notification_text = ''
                 for i = 1, weather_now["cnt"] do
                     weather.notification_text = weather.notification_text ..
@@ -117,11 +125,36 @@ local function worker(args)
     function weather.update()
         local cmd = string.format(current_call, city_id, units, lang, APPID)
         async.request(cmd, function(f)
     function weather.update()
         local cmd = string.format(current_call, city_id, units, lang, APPID)
         async.request(cmd, function(f)
-            local pos, err
+            local pos, err, icon
             weather_now, pos, err = json.decode(f, 1, nil)
 
             weather_now, pos, err = json.decode(f, 1, nil)
 
-            if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
-                weather.icon_path = icons_path .. weather_now["weather"][1]["icon"] .. ".png"
+            if not err and type(weather_now) == "table" and tonumber(weather_now["cod"]) == 200 then
+                -- weather icon based on localtime
+                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", "")
+                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")
+                else
+                    icon = string.gsub(icon, "d", "n")
+                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.