X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/4c392a6d980af9c72052145c6a7a812c51e6ecee..6207d0d28530fbbf7036db770727cd4b69f271e4:/.config/awesome/lain/widget/weather.lua?ds=sidebyside diff --git a/.config/awesome/lain/widget/weather.lua b/.config/awesome/lain/widget/weather.lua index 1098146..9c1e797 100644 --- a/.config/awesome/lain/widget/weather.lua +++ b/.config/awesome/lain/widget/weather.lua @@ -1,9 +1,8 @@ - --[[ - - Licensed under GNU General Public License v2 - * (c) 2015, Luke Bonham - + + Licensed under GNU General Public License v2 + * (c) 2015, Luca CPZ + --]] local helpers = require("lain.helpers") @@ -11,12 +10,10 @@ local json = require("lain.util").dkjson local focused = require("awful.screen").focused local naughty = require("naughty") local wibox = require("wibox") -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 math = math +local os = os +local string = string +local type = type local tonumber = tonumber -- OpenWeatherMap @@ -26,17 +23,12 @@ local tonumber = tonumber local function factory(args) local weather = { widget = wibox.widget.textbox() } local args = args or {} - 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'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 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 @@ -53,13 +45,14 @@ local function factory(args) 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(t_out) + function weather.show(seconds) weather.hide() if followtag then @@ -71,12 +64,12 @@ local function factory(args) weather.forecast_update() end - weather.notification = naughty.notify({ + weather.notification = naughty.notify { + preset = notification_preset, text = weather.notification_text, icon = weather.icon_path, - timeout = t_out, - preset = notification_preset - }) + timeout = type(seconds == "number") and seconds or notification_preset.timeout + } end function weather.hide() @@ -102,11 +95,10 @@ local function factory(args) 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 = '' + 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 @@ -122,29 +114,12 @@ local function factory(args) 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 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 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 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 - end - - -- 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 + local loc_now = os.time() - 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") @@ -162,7 +137,7 @@ local function factory(args) end) end - weather.attach(weather.widget) + 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)