]>
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:
-local async = require("lain.helpers").async
-local newtimer = require("lain.helpers").newtimer
-local lain_icons = require("lain.helpers").icons_dir
+local helpers = require("lain.helpers")
local json = require("lain.util").dkjson
local json = require("lain.util").dkjson
local focused = require("awful.screen").focused
local naughty = require("naughty")
local wibox = require("wibox")
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 = { 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 tonumber = tonumber
local setmetatable = setmetatable
-- lain.widgets.weather
local function worker(args)
-- lain.widgets.weather
local function worker(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 args = args or {}
local APPID = args.APPID or "3e321f9414eaedbfab34983bda77a66e" -- lain default
local timeout = args.timeout or 900 -- 15 min
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 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 lain_icons .. "openweathermap/"
+ 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 notification_preset = args.notification_preset or {}
local notification_text_fun = args.notification_text_fun or
function (wn)
local followtag = args.followtag or false
local settings = args.settings or function() end
local followtag = args.followtag or false
local settings = args.settings or function() end
- weather.widget = wibox.widget.textbox (weather_na_markup)
+ weather.widget:set_markup (weather_na_markup)
weather.icon_path = icons_path .. "na.png"
weather.icon_path = icons_path .. "na.png"
- weather.icon = wibox.widget.imagebox(weather.icon_path)
+ weather.icon = wibox.widget.imagebox(weather.icon_path)
function weather.show(t_out)
weather.hide()
function weather.show(t_out)
weather.hide()
end
if not weather.notification_text then
end
if not weather.notification_text then
weather.forecast_update()
end
weather.forecast_update()
end
function weather.forecast_update()
local cmd = string.format(forecast_call, city_id, units, lang, cnt, APPID)
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)
local pos, err
weather_now, pos, err = json.decode(f, 1, nil)
function weather.update()
local cmd = string.format(current_call, city_id, units, lang, APPID)
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)
local pos, err, icon
weather_now, pos, err = json.decode(f, 1, nil)
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 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
+ 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
-- if we are 1 day after the GMT, return 1 day back, and viceversa
if offset > 0 and loc_m >= utc_m then
weather.attach(weather.widget)
weather.attach(weather.widget)
- newtimer("weather-" .. city_id, timeout, weather.updat e)
- newtimer("weather_forecast-" .. city_id, timeout, weather.forecast_updat e)
+ weather.timer = helpers.newtimer("weather-" .. city_id, timeout, weather.update, false, tru e)
+ weather.timer_forecast = helpers.newtimer("weather_forecast-" .. city_id, timeout, weather.forecast_update, false, tru e)
- return setmetatable(weather, { __index = weather.widget })
end
return setmetatable({}, { __call = function(_, ...) return worker(...) end })
end
return setmetatable({}, { __call = function(_, ...) return worker(...) end })
projects / etc / awesome.git / blobdiff