X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/8d3868d7ce528cfc075e246c8935bae2724e0868..f76d33e8cd5bc84f44758e8047294227deb3f29d:/widget/weather.lua diff --git a/widget/weather.lua b/widget/weather.lua index 1b2e80f..a9b886a 100644 --- a/widget/weather.lua +++ b/widget/weather.lua @@ -1,43 +1,31 @@ - --[[ - - 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") -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 tonumber = tonumber -local setmetatable = setmetatable +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, os, string, tonumber = math, os, string, tonumber -- OpenWeatherMap -- current weather and X-days forecast -- lain.widget.weather -local function worker(args) +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 @@ -54,6 +42,7 @@ local function worker(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) @@ -103,11 +92,10 @@ local function worker(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 @@ -123,29 +111,25 @@ local function worker(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 + local loc_now = os.time() -- local time + local loc_m = os.time { year = os.date("%Y"), month = os.date("%m"), day = os.date("%d"), hour = 0 } -- local time from midnight + local loc_d = os.date("*t", loc_now) -- table YMDHMS for current local time (for TZ calculation) + local utc_d = os.date("!*t", loc_now) -- table YMDHMS for current UTC time + local utc_now = os.time(utc_d) -- UTC time now + local offdt = (loc_d.isdst and 1 or 0) * 3600 + 100 * (loc_d.min - utc_d.min) / 60 -- DST offset + local offset = os.difftime(loc_now, utc_now) + (loc_d.isdst and 1 or 0) * 3600 + 100 * (loc_d.min - utc_d.min) / 60 -- TZ offset (including DST) + local offday = (offset < 0 and -86400) or 86400 -- 24 hour correction value (+86400 or -86400) + + -- if current UTC time is earlier then local midnight -> positive offset (negative otherwise) + if offset * (loc_m - utc_now + offdt) > 0 then + sunrise = sunrise + offday -- Shift sunset and sunrise times by 24 hours + sunset = sunset + offday end - 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") @@ -163,7 +147,7 @@ local function worker(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) @@ -171,4 +155,4 @@ local function worker(args) return weather end -return setmetatable({}, { __call = function(_, ...) return worker(...) end }) +return factory