awesomewm-mirrors
/
lain
mirror of https://github.com/lcpz/lain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Weather widget rewritten; first authorship updated

This commit is contained in:
Aleksandr Beliaev 2017-09-11 16:51:52 +12:00 committed by Luca CPZ
parent 003beff59f
commit 31d64906a0
29 changed files with 41 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helpers.lua
View File

@ -1,7 +1,7 @@
--[[
Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
--]]

2
init.lua
View File

@ -4,7 +4,7 @@
Layouts, widgets and utilities for Awesome WM
Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
--]]

2
layout/cascade.lua
View File

@ -2,7 +2,7 @@
Licensed under GNU General Public License v2
* (c) 2014, projektile
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
* (c) 2010-2012, Peter Hofmann
--]]

2
layout/centerwork.lua
View File

@ -4,7 +4,7 @@
* (c) 2016, Henrik Antonsson
* (c) 2015, Joerg Jaspert
* (c) 2014, projektile
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
* (c) 2010-2012, Peter Hofmann
--]]

2
layout/init.lua
View File

@ -6,7 +6,7 @@
Layouts section
Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
* (c) 2010-2012, Peter Hofmann
--]]

2
layout/termfair.lua
View File

@ -2,7 +2,7 @@
Licensed under GNU General Public License v2
* (c) 2014, projektile
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
* (c) 2010, Nicolas Estibals
* (c) 2010-2012, Peter Hofmann

2
util/init.lua
View File

@ -6,7 +6,7 @@
Utilities section
Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
* (c) 2010-2012, Peter Hofmann
--]]

2
util/markup.lua
View File

@ -1,7 +1,7 @@
--[[
Licensed under MIT License
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
* (c) 2009, Uli Schlachter
* (c) 2009, Majic

2
util/quake.lua
View File

@ -1,7 +1,7 @@
--[[
Licensed under GNU General Public License v2
* (c) 2016, Luke Bonham
* (c) 2016, Luca CPZ
* (c) 2015, unknown
--]]

2
util/separators.lua
View File

@ -1,7 +1,7 @@
--[[
Licensed under GNU General Public License v2
* (c) 2015, Luke Bonham
* (c) 2015, Luca CPZ
* (c) 2015, plotnikovanton
--]]

2
widget/alsa.lua
View File

@ -1,7 +1,7 @@
--[[
Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
* (c) 2010, Adrian C. <anrxc@sysphere.org>
--]]

2
widget/alsabar.lua
View File

@ -1,7 +1,7 @@
--[[
Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
* (c) 2013, Rman
--]]

2
widget/bat.lua
View File

@ -1,7 +1,7 @@
--[[
Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
* (c) 2010-2012, Peter Hofmann
--]]

2
widget/calendar.lua
View File

@ -1,7 +1,7 @@
--[[
Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
--]]

2
widget/contrib/init.lua
View File

@ -6,7 +6,7 @@
Users contributed widgets section
Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
--]]

2
widget/contrib/tpbat/init.lua
View File

@ -8,7 +8,7 @@
Licensed under GNU General Public License v2
* (c) 2013, Conor Heine
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
* (c) 2010-2012, Peter Hofmann
--]]

2
widget/cpu.lua
View File

@ -1,7 +1,7 @@
--[[
Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
* (c) 2010-2012, Peter Hofmann
--]]

2
widget/fs.lua
View File

@ -1,7 +1,7 @@
--[[
Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
--]]

2
widget/imap.lua
View File

@ -1,7 +1,7 @@
--[[
Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
--]]

2
widget/init.lua
View File

@ -6,7 +6,7 @@
Widgets section
Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
* (c) 2010-2012, Peter Hofmann
--]]

2
widget/mem.lua
View File

@ -1,7 +1,7 @@
--[[
Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
* (c) 2010-2012, Peter Hofmann
--]]

2
widget/mpd.lua
View File

@ -1,7 +1,7 @@
--[[
Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
* (c) 2010, Adrian C. <anrxc@sysphere.org>
--]]

2
widget/net.lua
View File

@ -1,7 +1,7 @@
--[[
Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
* (c) 2010-2012, Peter Hofmann
--]]

2
widget/pulse.lua
View File

@ -1,7 +1,7 @@
--[[
Licensed under GNU General Public License v2
* (c) 2016, Luke Bonham
* (c) 2016, Luca CPZ
--]]

2
widget/pulsebar.lua
View File

@ -1,7 +1,7 @@
--[[
Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
* (c) 2013, Rman
--]]

2
widget/sysload.lua
View File

@ -1,7 +1,7 @@
--[[
Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
* (c) 2010-2012, Peter Hofmann
--]]

2
widget/temp.lua
View File

@ -1,7 +1,7 @@
--[[
Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham
* (c) 2013, Luca CPZ
--]]

30
widget/weather.lua
View File

@ -1,7 +1,7 @@
--[[
Licensed under GNU General Public License v2
* (c) 2015, Luke Bonham
* (c) 2015, Luca CPZ
--]]
@ -20,7 +20,7 @@ local math, os, string, tonumber = math, os, string, tonumber
local function factory(args)
local weather = { widget = wibox.widget.textbox() }
local args = args or {}
local APPID = args.APPID or "3e321f9414eaedbfab34983bda77a66e" -- lain default
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'"
@ -114,22 +114,18 @@ local function factory(args)
local sunrise = tonumber(weather_now["sys"]["sunrise"])
local sunset = tonumber(weather_now["sys"]["sunset"])
local icon = weather_now["weather"][1]["icon"]
local loc_now = os.time()
local loc_m = os.time { year = os.date("%Y"), month = os.date("%m"), day = os.date("%d"), hour = 0 }
local loc_t = os.difftime(loc_now, loc_m)
local loc_d = os.date("*t", loc_now)
local utc_d = os.date("!*t", loc_now)
local utc_now = os.time(utc_d)
local offdt = (loc_d.isdst and 1 or 0) * 3600 + 100 * (loc_d.min - utc_d.min) / 60
local offset = os.difftime(loc_now, utc_now) + offdt
local offday = (offset < 0 and -86400) or 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 math.abs(loc_now - utc_now - offdt + loc_t) >= 86400 then
utc_now = utc_now + offday
end
if offday * (loc_now - utc_now - offdt) > 0 then
sunrise = sunrise + offday
-- 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

2
wiki

@ -1 +1 @@
Subproject commit b0eb6680557d182bc0c9379d0294913f93e33a27
Subproject commit 2859d4049cf9b96ffa8ac2c872428d730b6477c9