From ad71a6bc497a258cbdbb0821484f3d47bb2f19f6 Mon Sep 17 00:00:00 2001 From: copycat-killer Date: Sat, 10 Oct 2015 10:20:45 +0200 Subject: [PATCH] dfs: fix misalignments; widgets/weather: added APPID argument --- scripts/dfs | 4 ++-- widgets/weather.lua | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/dfs b/scripts/dfs index f04b051..bc27b81 100755 --- a/scripts/dfs +++ b/scripts/dfs @@ -212,7 +212,7 @@ echo "$SORTED_FILE_SYSTEMS_INFO" | $AWK_COMMAND -v DEBUG=$DEBUG -v PATTERN=$PATT printf ("\n%s", narrow_margin); else printf ("%-*s", LEFT_COLUMN + 2, ""); - print " Used Free Total "; + print " Used Free Total "; if (! NARROW_MODE) print ""; } @@ -352,7 +352,7 @@ $0 ~ PATTERN { # printf ("stars_number = %d\n", stars_number); printf ("|"); - for (i = 1; i <= stars_number; i++) + for (i = 1; i <= stars_number && i <= 49; i++) { printf ("%s", "*"); } diff --git a/widgets/weather.lua b/widgets/weather.lua index de3163c..68abae9 100644 --- a/widgets/weather.lua +++ b/widgets/weather.lua @@ -30,10 +30,11 @@ local setmetatable = setmetatable local function worker(args) local weather = {} local args = args or {} + local APPID = args.APPID or 1 -- mandatory 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'" - local forecast_call = "curl -s 'http://api.openweathermap.org/data/2.5/forecast/daily?id=%s&units=%s&lang=%s&cnt=%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&APPID=%s'" local city_id = args.city_id or 0 -- placeholder local units = args.units or "metric" local lang = args.lang or "en" @@ -83,7 +84,7 @@ local function worker(args) end 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) local pos, err weather_now, pos, err = json.decode(f, 1, nil) @@ -112,7 +113,7 @@ local function worker(args) end 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) local pos, err weather_now, pos, err = json.decode(f, 1, nil) -- 2.39.5