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

diff --git a/scripts/dfs b/scripts/dfs
index f04b05127597e0d8322b4d35ebafa01795c3c9a1..bc27b816a552fffcc17ff4b716dd2bdf2f129037 100755 (executable)
--- 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, "");
                                                         printf ("\n%s", narrow_margin);
                                                 else
                                                         printf ("%-*s", LEFT_COLUMN + 2, "");

-                                        print "                                                     Used    Free     Total ";
+                                        print "                                                    Used     Free       Total ";

                                         if (! NARROW_MODE)
                                                 print "";
                                 }
                                         if (! NARROW_MODE)
                                                 print "";
                                 }


@@ -352,7 +352,7 @@ $0 ~ PATTERN    {
 #           printf ("stars_number = %d\n", stars_number);
 
                        printf ("|");
 #           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", "*");
                        }
                        {
                                printf ("%s", "*");
                        }

diff --git a/widgets/weather.lua b/widgets/weather.lua
index de3163c9602ffb8e27d78329ba14817e2eddad9e..68abae99ff195eebc94d8f6f52d76a5f695dd436 100644 (file)
--- 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 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 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"
     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()
     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)
         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()
     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)
         async.request(cmd, function(f)
             local pos, err
             weather_now, pos, err = json.decode(f, 1, nil)