adam/lina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dfs: fix misalignments; widgets/weather: added APPID argument

Browse source
This commit is contained in:
copycat-killer 2015-10-10 10:20:45 +02:00
parent 9c40d29ecb
commit ad71a6bc49
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/dfs
View file

@ -352,7 +352,7 @@ $0 ~ PATTERN {
# printf ("stars_number = %d\n", stars_number); # printf ("stars_number = %d\n", stars_number);
printf ("|"); printf ("|");
for (i = 1; i <= stars_number; i++) for (i = 1; i <= stars_number && i <= 49; i++)
{ {
printf ("%s", "*"); printf ("%s", "*");
} }

9
widgets/weather.lua
View file

@ -30,10 +30,11 @@ local setmetatable = setmetatable
local function worker(args) local function worker(args)
local weather = {} local weather = {}
local args = args or {} local args = args or {}
local APPID = args.APPID or 1 -- mandatory
local timeout = args.timeout or 900 -- 15 min local timeout = args.timeout or 900 -- 15 min
local timeout_forecast = args.timeout or 86400 -- 24 hrs 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'" local current_call = "curl -s 'http://api.openweathermap.org/data/2.5/weather?id=%s&units=%s&lang=%s&APPID=%s'"
local forecast_call = "curl -s 'http://api.openweathermap.org/data/2.5/forecast/daily?id=%s&units=%s&lang=%s&cnt=%s'" local forecast_call = "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 city_id = args.city_id or 0 -- placeholder
local units = args.units or "metric" local units = args.units or "metric"
local lang = args.lang or "en" local lang = args.lang or "en"
@ -83,7 +84,7 @@ local function worker(args)
end end
function weather.forecast_update() function weather.forecast_update()
local cmd = string.format(forecast_call, city_id, units, lang, cnt) local cmd = string.format(forecast_call, city_id, units, lang, cnt, APPID)
async.request(cmd, function(f) async.request(cmd, function(f)
local pos, err local pos, err
weather_now, pos, err = json.decode(f, 1, nil) weather_now, pos, err = json.decode(f, 1, nil)
@ -112,7 +113,7 @@ local function worker(args)
end end
function weather.update() function weather.update()
local cmd = string.format(current_call, city_id, units, lang) local cmd = string.format(current_call, city_id, units, lang, APPID)
async.request(cmd, function(f) async.request(cmd, function(f)
local pos, err local pos, err
weather_now, pos, err = json.decode(f, 1, nil) weather_now, pos, err = json.decode(f, 1, nil)