]> git.madduck.net Git - etc/awesome.git/blobdiff - .config/awesome/lain/widget/static/git-logo.png

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:

Merge commit '33c0e0c2360a04fcc6f51bccb0ad2a7a9e9c07b3'
[etc/awesome.git] / .config / awesome / lain / widget / static / git-logo.png
diff --git a/widget/weather.lua b/widget/weather.lua
deleted file mode 100644 (file)
index 9c1e797..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
---[[
-
-     Licensed under GNU General Public License v2
-      * (c) 2015, Luca CPZ
-
---]]
-
-local helpers  = require("lain.helpers")
-local json     = require("lain.util").dkjson
-local focused  = require("awful.screen").focused
-local naughty  = require("naughty")
-local wibox    = require("wibox")
-local math     = math
-local os       = os
-local string   = string
-local type     = type
-local tonumber = tonumber
-
--- OpenWeatherMap
--- current weather and X-days forecast
--- lain.widget.weather
-
-local function factory(args)
-    local weather               = { widget = wibox.widget.textbox() }
-    local args                  = args or {}
-    local APPID                 = args.APPID or "3e321f9414eaedbfab34983bda77a66e" -- lain's default
-    local timeout               = args.timeout or 60 * 15 -- 15 min
-    local timeout_forecast      = args.timeout or 60 * 60 * 24 -- 24 hrs
-    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 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 helpers.icons_dir .. "openweathermap/"
-    local notification_preset   = args.notification_preset or {}
-    local notification_text_fun = args.notification_text_fun or
-                                  function (wn)
-                                      local day = os.date("%a %d", wn["dt"])
-                                      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 followtag             = args.followtag or false
-    local showpopup             = args.showpopup or "on"
-    local settings              = args.settings or function() end
-
-    weather.widget:set_markup(weather_na_markup)
-    weather.icon_path = icons_path .. "na.png"
-    weather.icon = wibox.widget.imagebox(weather.icon_path)
-
-    function weather.show(seconds)
-        weather.hide()
-
-        if followtag then
-            notification_preset.screen = focused()
-        end
-
-        if not weather.notification_text then
-            weather.update()
-            weather.forecast_update()
-        end
-
-        weather.notification = naughty.notify {
-            preset  = notification_preset,
-            text    = weather.notification_text,
-            icon    = weather.icon_path,
-            timeout = type(seconds == "number") and seconds or notification_preset.timeout
-        }
-    end
-
-    function weather.hide()
-        if weather.notification then
-            naughty.destroy(weather.notification)
-            weather.notification = nil
-        end
-    end
-
-    function weather.attach(obj)
-        obj:connect_signal("mouse::enter", function()
-            weather.show(0)
-        end)
-        obj:connect_signal("mouse::leave", function()
-            weather.hide()
-        end)
-    end
-
-    function weather.forecast_update()
-        local cmd = string.format(forecast_call, city_id, units, lang, cnt, APPID)
-        helpers.async(cmd, function(f)
-            local pos, err
-            weather_now, pos, err = json.decode(f, 1, nil)
-
-            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 ..
-                                                notification_text_fun(weather_now["list"][i])
-                    if i < weather_now["cnt"] then
-                        weather.notification_text = weather.notification_text .. "\n"
-                    end
-                end
-            end
-        end)
-    end
-
-    function weather.update()
-        local cmd = string.format(current_call, city_id, units, lang, APPID)
-        helpers.async(cmd, function(f)
-            local pos, err, icon
-            weather_now, pos, err = json.decode(f, 1, nil)
-
-            if not err and type(weather_now) == "table" and tonumber(weather_now["cod"]) == 200 then
-                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()
-
-                if sunrise <= loc_now and loc_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
-                weather.icon_path = icons_path .. "na.png"
-                weather.widget:set_markup(weather_na_markup)
-            end
-
-            weather.icon:set_image(weather.icon_path)
-        end)
-    end
-
-    if showpopup == "on" then weather.attach(weather.widget) end
-
-    weather.timer = helpers.newtimer("weather-" .. city_id, timeout, weather.update, false, true)
-    weather.timer_forecast = helpers.newtimer("weather_forecast-" .. city_id, timeout, weather.forecast_update, false, true)
-
-    return weather
-end
-
-return factory