[contrib.openweather] added app id to warg; added {temp min c}, {temp max c}, {sunrise} and {sunset}

contrib/openweather_all.lua

@@ -16,37 +16,35 @@
 --
 -- You should have received a copy of the GNU General Public License
 -- along with Vicious.  If not, see <https://www.gnu.org/licenses/>.
-
 -- {{{ Grab environment
 local tonumber = tonumber
-local io = { popen = io.popen }
+local io = {popen = io.popen}
 local setmetatable = setmetatable
-local string = { match = string.match }
-local math = {
-    ceil = math.ceil,
-    floor = math.floor
-}
+local string = {match = string.match}
+local math = {ceil = math.ceil, floor = math.floor}
 -- }}}
 
-
 -- Openweather: provides weather information for a requested station
 -- vicious.widgets.openweather
 local openweather_all = {}
 
-
 -- Initialize function tables
-local _wdirs = { "N", "NE", "E", "SE", "S", "SW", "W", "NW", "N" }
+local _wdirs = {"N", "NE", "E", "SE", "S", "SW", "W", "NW", "N"}
 local _wdata = {
-    ["{city}"]      = "N/A",
-    ["{wind deg}"]  = "N/A",
-    ["{wind aim}"]  = "N/A",
-    ["{wind mps}"]  = "N/A",
-    ["{wind kmh}"]  = "N/A",
-    ["{sky}"]       = "N/A",
-    ["{weather}"]   = "N/A",
-    ["{temp c}"]    = "N/A",
-    ["{humid}"]     = "N/A",
-    ["{press}"]     = "N/A"
+    ["{city}"] = "N/A",
+    ["{wind deg}"] = "N/A",
+    ["{wind aim}"] = "N/A",
+    ["{wind mps}"] = "N/A",
+    ["{wind kmh}"] = "N/A",
+    ["{sky}"] = "N/A",
+    ["{weather}"] = "N/A",
+    ["{temp c}"] = "N/A",
+    ["{temp min c}"] = "N/A",
+    ["{temp max c}"] = "N/A",
+    ["{sunrise}"] = -1,
+    ["{sunset}"] = -1,
+    ["{humid}"] = "N/A",
+    ["{press}"] = "N/A"
 }
 
 -- {{{ Openweather widget type
@@ -55,30 +53,41 @@ local function worker(format, warg)
 
     -- Get weather forceast using the city ID code, from:
     -- * OpenWeatherMap.org
-    local openweather = "http://api.openweathermap.org/data/2.5/weather?id="..warg.."&mode=json&units=metric"
-    local f = io.popen("curl --connect-timeout 1 -fsm 3 '"..openweather.."'")
+    local openweather = "http://api.openweathermap.org/data/2.5/weather?id=" ..
+                            warg.city_id .. "&appid=" .. warg.app_id ..
+                            "&mode=json&units=metric"
+    local f =
+        io.popen("curl --connect-timeout 1 -fsm 3 '" .. openweather .. "'")
     local ws = f:read("*all")
     f:close()
 
     -- Check if there was a timeout or a problem with the station
     if ws == nil then return _wdata end
 
-    _wdata["{city}"]     = -- City name
-        string.match(ws, '"name":"([%a%s%-]+)"') or _wdata["{city}"]
+    _wdata["{city}"] = -- City name
+    string.match(ws, '"name":"([%a%s%-]+)"') or _wdata["{city}"]
     _wdata["{wind deg}"] = -- Wind degrees
-        string.match(ws, '"deg":([%d]+)') or _wdata["{wind deg}"]
-    _wdata["{wind mps}"]  = -- Wind speed in meters per second
-        string.match(ws, '"speed":([%d%.]+)') or _wdata["{wind mps}"]
-    _wdata["{sky}"]      = -- Sky conditions
-        string.match(ws, '"main":"([%a]+)"') or _wdata["{sky}"]
-    _wdata["{weather}"]  = -- Weather description
-        string.match(ws, '"description":"([%a%s]+)"') or _wdata["{weather}"]
-    _wdata["{temp c}"]    = -- Temperature in celsius
-        string.match(ws, '"temp":([%-]?[%d%.]+)') or _wdata["{temp c}"]
-    _wdata["{humid}"]    = -- Relative humidity in percent
-        string.match(ws, '"humidity":([%d]+)') or _wdata["{humid}"]
-    _wdata["{press}"]    = -- Pressure in hPa
-        string.match(ws, '"pressure":([%d%.]+)') or _wdata["{press}"]
+    string.match(ws, '"deg":([%d]+)') or _wdata["{wind deg}"]
+    _wdata["{wind mps}"] = -- Wind speed in meters per second
+    string.match(ws, '"speed":([%d%.]+)') or _wdata["{wind mps}"]
+    _wdata["{sky}"] = -- Sky conditions
+    string.match(ws, '"main":"([%a]+)"') or _wdata["{sky}"]
+    _wdata["{weather}"] = -- Weather description
+    string.match(ws, '"description":"([%a%s]+)"') or _wdata["{weather}"]
+    _wdata["{temp c}"] = -- Temperature in celsius
+    string.match(ws, '"temp":([%-]?[%d%.]+)') or _wdata["{temp c}"]
+    _wdata["{temp min c}"] = -- Minimal Temperature in celsius
+    string.match(ws, '"temp_min":([%-]?[%d%.]+)') or _wdata["{temp min c}"]
+    _wdata["{temp max c}"] = -- Maximal Temperature in celsius
+    string.match(ws, '"temp_max":([%-]?[%d%.]+)') or _wdata["{temp max c}"]
+    _wdata["{humid}"] = -- Relative humidity in percent
+    string.match(ws, '"humidity":([%d]+)') or _wdata["{humid}"]
+    _wdata["{sunrise}"] = -- Sunrise
+    tonumber(string.match(ws, '"sunrise":([%d]+)')) or _wdata["{sunrise}"]
+    _wdata["{sunset}"] = -- Sunset
+    tonumber(string.match(ws, '"sunset":([%d]+)')) or _wdata["{sunset}"]
+    _wdata["{press}"] = -- Pressure in hPa
+    string.match(ws, '"pressure":([%d%.]+)') or _wdata["{press}"]
 
     -- Wind speed in km/h
     if _wdata["{wind mps}"] ~= "N/A" then
@@ -92,12 +101,13 @@ local function worker(format, warg)
         _wdata["{wind deg}"] = tonumber(_wdata["{wind deg}"])
 
         -- Lua tables start at [1]
-        if (_wdata["{wind deg}"] / 45)%1 == 0 then
+        if (_wdata["{wind deg}"] / 45) % 1 == 0 then
             _wdata["{wind aim}"] = _wdirs[_wdata["{wind deg}"] / 45 + 1]
         else
-            _wdata["{wind aim}"] =
-                _wdirs[math.ceil(_wdata["{wind deg}"] / 45) + 1]..
-                _wdirs[math.floor(_wdata["{wind deg}"] / 45) + 1]
+            _wdata["{wind aim}"] = _wdirs[math.ceil(_wdata["{wind deg}"] / 45) +
+                                       1] ..
+                                       _wdirs[math.floor(
+                                           _wdata["{wind deg}"] / 45) + 1]
         end
     end
 
@@ -105,4 +115,5 @@ local function worker(format, warg)
 end
 -- }}}
 
-return setmetatable(openweather_all, { __call = function(_, ...) return worker(...) end })
+return setmetatable(openweather_all,
+                    {__call = function(_, ...) return worker(...) end})