]>
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 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 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 naughty = require("naughty")
local wibox = require("wibox")
local utc_offset = args.utc_offset or
function ()
local now = os.time()
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 3600)
+ 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"
end
local units = args.units or "metric"
local lang = args.lang or "en"
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 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 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)
local settings = args.settings or function() end
weather.widget = wibox.widget.textbox(weather_na_markup)
function weather.show(t_out)
weather.hide()
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
end
if not weather.notification_text then
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)
- async.request (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)
- 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 ..
weather.notification_text = ''
for i = 1, weather_now["cnt"] do
weather.notification_text = weather.notification_text ..
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)
- async.request (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)
- 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"]
-- 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", "")
- local loc_m = string.gsub(read_pipe(string.format("date -d 'today 00:00:00' +'%%s'")), "\n", "")
-
- loc_m = tonumber(loc_m)
- utc_m = tonumber(utc_m)
- offset = utc_offset()
+ 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
-- if we are 1 day after the GMT, return 1 day back, and viceversa
if offset > 0 and loc_m >= utc_m then
projects / etc / awesome.git / blobdiff