mirror of https://github.com/lcpz/lain.git
Merge branch 'master' of https://github.com/copycat-killer/lain
This commit is contained in:
commit
13f4cf6988
|
@ -71,7 +71,6 @@ local function worker(args)
|
|||
for k, v in string.gmatch(line, "([%w]+):[%s](.*)$") do
|
||||
if k == "state" then mpd_now.state = v
|
||||
elseif k == "file" then mpd_now.file = v
|
||||
elseif k == "Name" then mpd_now.name = escape_f(v)
|
||||
elseif k == "Artist" then mpd_now.artist = escape_f(v)
|
||||
elseif k == "Title" then mpd_now.title = escape_f(v)
|
||||
elseif k == "Album" then mpd_now.album = escape_f(v)
|
||||
|
|
|
@ -30,7 +30,7 @@ local setmetatable = setmetatable
|
|||
local function worker(args)
|
||||
local weather = {}
|
||||
local args = args or {}
|
||||
local APPID = args.APPID or 1 -- mandatory
|
||||
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 current_call = "curl -s 'http://api.openweathermap.org/data/2.5/weather?id=%s&units=%s&lang=%s&APPID=%s'"
|
||||
|
|
2
wiki
2
wiki
|
@ -1 +1 @@
|
|||
Subproject commit d7aa1a7b8428211a1c4c71865fd64302e013d62b
|
||||
Subproject commit 35cc75dcb382fccdec6941698a1e96cc875fae1f
|
Loading…
Reference in New Issue