X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/1afe5367af3f643144ba7cdc1d6e289ec9b9b096..fc5974a9c2838efa8dedbd350d9623e193ab71a3:/widgets/weather.lua?ds=sidebyside
diff --git a/widgets/weather.lua b/widgets/weather.lua
index c8c34f9..ff86d7e 100644
--- a/widgets/weather.lua
+++ b/widgets/weather.lua
@@ -6,22 +6,19 @@
--]]
+local async = require("lain.helpers").async
local newtimer = require("lain.helpers").newtimer
-local read_pipe = require("lain.helpers").read_pipe
-
-local async = require("lain.asyncshell")
-local json = require("lain.util").dkjson
local lain_icons = require("lain.helpers").icons_dir
-
+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 mouse = mouse
-local os = { time = os.time }
-local string = { format = string.format,
- gsub = string.gsub }
-local naughty = require("naughty")
+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
@@ -38,7 +35,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 utc = args.utc or 0
+ 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
@@ -47,15 +48,14 @@ local function worker(args)
local notification_preset = args.notification_preset or {}
local notification_text_fun = args.notification_text_fun or
function (wn)
- local day = string.gsub(read_pipe(string.format(date_cmd, wn["dt"])), "\n", "")
+ 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 followmouse = args.followmouse or false
+ local followtag = args.followtag or false
local settings = args.settings or function() end
weather.widget = wibox.widget.textbox(weather_na_markup)
@@ -65,15 +65,14 @@ local function worker(args)
function weather.show(t_out)
weather.hide()
- if followmouse then
- notification_preset.screen = mouse.screen
+ if followtag then
+ notification_preset.screen = focused()
end
if not weather.notification_text then
weather.forecast_update()
end
-
weather.notification = naughty.notify({
text = weather.notification_text,
icon = weather.icon_path,
@@ -100,11 +99,11 @@ local function worker(args)
function weather.forecast_update()
local cmd = string.format(forecast_call, city_id, units, lang, cnt, APPID)
- async.request(cmd, function(f)
+ async(cmd, function(f)
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 ..
@@ -120,20 +119,25 @@ local function worker(args)
function weather.update()
local cmd = string.format(current_call, city_id, units, lang, APPID)
- async.request(cmd, function(f)
+ async(cmd, function(f)
local pos, err, icon
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 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", "")
-
- if now > tonumber(utc_m) then
- now = now - (utc * 3600)
+ 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 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
@@ -143,7 +147,6 @@ local function worker(args)
end
weather.icon_path = icons_path .. icon .. ".png"
-
widget = weather.widget
settings()
else
@@ -157,8 +160,8 @@ local function worker(args)
weather.attach(weather.widget)
- newtimer("weather-" .. city_id, timeout, weather.update)
- newtimer("weather_forecast-" .. city_id, timeout, weather.forecast_update)
+ weather.timer = newtimer("weather-" .. city_id, timeout, weather.update, false, true)
+ weather.timer_forecast = newtimer("weather_forecast-" .. city_id, timeout, weather.forecast_update, false, true)
return setmetatable(weather, { __index = weather.widget })
end