]> 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
alsa: some indentation
[etc/awesome.git] / widgets / weather.lua
diff --git a/widgets/weather.lua b/widgets/weather.lua
index 173601a5593178b5ef237bd01ce2b68ce1afd197..ca0ceed7cf639a27c26594ca1c81162b9e65b32a 100644 (file)
--- a/widgets/weather.lua
+++ b/widgets/weather.lua
@@ -33,18 +33,23 @@ local function worker(args)
     local APPID                 = args.APPID or "3e321f9414eaedbfab34983bda77a66e" -- lain default
     local timeout               = args.timeout or 900   -- 15 min
     local timeout_forecast      = args.timeout or 86400 -- 24 hrs
     local APPID                 = args.APPID or "3e321f9414eaedbfab34983bda77a66e" -- lain default
     local timeout               = args.timeout or 900   -- 15 min
     local timeout_forecast      = args.timeout or 86400 -- 24 hrs
-    local current_call          = "curl -s 'http://api.openweathermap.org/data/2.5/weather?id=%s&units=%s&lang=%s&APPID=%s'"
-    local forecast_call         = "curl -s 'http://api.openweathermap.org/data/2.5/forecast/daily?id=%s&units=%s&lang=%s&cnt=%s&APPID=%s'"
+    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 units                 = args.units or "metric"
     local lang                  = args.lang or "en"
     local city_id               = args.city_id or 0 -- placeholder
     local units                 = args.units or "metric"
     local lang                  = args.lang or "en"
-    local cnt                   = args.cnt or 7
+    local cnt                   = args.cnt or 5
     local date_cmd              = args.date_cmd or "date -u -d @%d +'%%a %%d'"
     local icons_path            = args.icons_path or lain_icons .. "openweathermap/"
     local notification_preset   = args.notification_preset or {}
     local notification_text_fun = args.notification_text_fun or
     local date_cmd              = args.date_cmd or "date -u -d @%d +'%%a %%d'"
     local icons_path            = args.icons_path or lain_icons .. "openweathermap/"
     local notification_preset   = args.notification_preset or {}
     local notification_text_fun = args.notification_text_fun or
-                                  function (day, desc, tmin, tmax)
-                                      return string.format("<b>%s</b>: %s, %d - %d  ", day, desc, tmin, tmax)
+                                  function (wn)
+                                      local day = string.gsub(read_pipe(string.format(date_cmd, wn["dt"])), "\n", "")
+                                      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 "
     local followmouse           = args.followmouse or false
                                   end
     local weather_na_markup     = args.weather_na_markup or " N/A "
     local followmouse           = args.followmouse or false
@@ -61,9 +66,12 @@ local function worker(args)
             notification_preset.screen = mouse.screen
         end
 
             notification_preset.screen = mouse.screen
         end
 
+        if not weather.notification_text then
+            weather.forecast_update()
+        end
+
         weather.notification = naughty.notify({
         weather.notification = naughty.notify({
-            text    = weather.notification_text
-                      or "Waiting for the server to respond...",
+            text    = weather.notification_text,
             icon    = weather.icon_path,
             timeout = t_out,
             preset  = notification_preset
             icon    = weather.icon_path,
             timeout = t_out,
             preset  = notification_preset
@@ -71,7 +79,7 @@ local function worker(args)
     end
 
     function weather.hide()
     end
 
     function weather.hide()
-        if weather.notification ~= nil then
+        if weather.notification then
             naughty.destroy(weather.notification)
             weather.notification = nil
         end
             naughty.destroy(weather.notification)
             weather.notification = nil
         end
@@ -92,24 +100,16 @@ 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 ~= nil and tonumber(weather_now["cod"]) == 200 then
+            if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
                 weather.notification_text = ''
                 for i = 1, weather_now["cnt"] do
                 weather.notification_text = ''
                 for i = 1, weather_now["cnt"] do
-                    local day = string.gsub(read_pipe(string.format(date_cmd, weather_now["list"][i]["dt"])), "\n", "")
-
-                    local tmin = math.floor(weather_now["list"][i]["temp"]["min"])
-                    local tmax = math.floor(weather_now["list"][i]["temp"]["max"])
-                    local desc = weather_now["list"][i]["weather"][1]["description"]
-
                     weather.notification_text = weather.notification_text ..
                     weather.notification_text = weather.notification_text ..
-                                                notification_text_fun(day, desc, tmin, tmax)
+                                                notification_text_fun(weather_now["list"][i])
 
                     if i < weather_now["cnt"] then
                         weather.notification_text = weather.notification_text .. "\n"
                     end
                 end
 
                     if i < weather_now["cnt"] then
                         weather.notification_text = weather.notification_text .. "\n"
                     end
                 end
-            else
-                weather.notification_text = "API/connection error or bad/not set city ID"
             end
         end)
     end
             end
         end)
     end
@@ -120,7 +120,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 ~= nil and tonumber(weather_now["cod"]) == 200 then
+            if not err and weather_now and tonumber(weather_now["cod"]) == 200 then
                 weather.icon_path = icons_path .. weather_now["weather"][1]["icon"] .. ".png"
                 widget = weather.widget
                 settings()
                 weather.icon_path = icons_path .. weather_now["weather"][1]["icon"] .. ".png"
                 widget = weather.widget
                 settings()
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.