From fa11ea427938371aaba1552f0d81eaf291052e0c Mon Sep 17 00:00:00 2001 From: Dario Gjorgjevski Date: Sat, 29 Aug 2015 15:03:24 +0200 Subject: [PATCH 1/3] make notification text customizable --- widgets/weather.lua | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/widgets/weather.lua b/widgets/weather.lua index 8a0d751..debe12f 100644 --- a/widgets/weather.lua +++ b/widgets/weather.lua @@ -28,21 +28,25 @@ local setmetatable = setmetatable -- lain.widgets.weather local function worker(args) - local weather = {} - local args = args or {} - 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 city_id = args.city_id or 0 -- placeholder - local units = args.units or "metric" - local lang = args.lang or "en" - local cnt = args.cnt or 7 - local date_cmd = args.date_cmd or "date -u -d @%d +'%%a %%d'" - local icons_path = args.icons_path or lain_icons .. "openweathermap/" - local notification_preset = args.notification_preset or {} - local followmouse = args.followmouse or false - local settings = args.settings or function() end + local weather = {} + local args = args or {} + 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 city_id = args.city_id or 0 -- placeholder + local units = args.units or "metric" + local lang = args.lang or "en" + local cnt = args.cnt or 7 + local date_cmd = args.date_cmd or "date -u -d @%d +'%%a %%d'" + local icons_path = args.icons_path or lain_icons .. "openweathermap/" + local notification_preset = args.notification_preset or {} + local notification_text_cmd = args.notification_text_cmd or + function (day, desc, tmin, tmax) + return string.format("%s: %s, %d - %d ", day, desc, tmin, tmax) + end + local followmouse = args.followmouse or false + local settings = args.settings or function() end weather.widget = wibox.widget.textbox('') weather.icon = wibox.widget.imagebox() @@ -93,7 +97,7 @@ local function worker(args) desc = weather_now["list"][i]["weather"][1]["description"] weather.notification_text = weather.notification_text .. - string.format("%s: %s, %d - %d ", day, desc, tmin, tmax) + notification_text_cmd(day, desc, tmin, tmax) if i < weather_now["cnt"] then weather.notification_text = weather.notification_text .. "\n" From ca6119899ad44854d75d7a89ffaa4e65bcce3b3e Mon Sep 17 00:00:00 2001 From: Dario Gjorgjevski Date: Sat, 29 Aug 2015 15:16:07 +0200 Subject: [PATCH 2/3] localize variables --- widgets/weather.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/widgets/weather.lua b/widgets/weather.lua index debe12f..b745ebe 100644 --- a/widgets/weather.lua +++ b/widgets/weather.lua @@ -85,16 +85,17 @@ local function worker(args) function weather.forecast_update() local cmd = string.format(forecast_call, city_id, units, lang, cnt) async.request(cmd, function(f) + local pos, err weather_now, pos, err = json.decode(f, 1, nil) if not err and weather_now ~= nil and tonumber(weather_now["cod"]) == 200 then weather.notification_text = '' for i = 1, weather_now["cnt"] do - day = string.gsub(read_pipe(string.format(date_cmd, weather_now["list"][i]["dt"])), "\n", "") + local day = string.gsub(read_pipe(string.format(date_cmd, weather_now["list"][i]["dt"])), "\n", "") - tmin = math.floor(weather_now["list"][i]["temp"]["min"]) - tmax = math.floor(weather_now["list"][i]["temp"]["max"]) - desc = weather_now["list"][i]["weather"][1]["description"] + local tmin = math.floor(weather_now["list"][i]["temp"]["min"]) + local tmax = math.floor(weather_now["list"][i]["temp"]["max"]) + local desc = weather_now["list"][i]["weather"][1]["description"] weather.notification_text = weather.notification_text .. notification_text_cmd(day, desc, tmin, tmax) @@ -113,6 +114,7 @@ local function worker(args) function weather.update() local cmd = string.format(current_call, city_id, units, lang) async.request(cmd, function(f) + local pos, err weather_now, pos, err = json.decode(f, 1, nil) if not err and weather_now ~= nil and tonumber(weather_now["cod"]) == 200 then From 10e71d2e460cd417a97d7db6b339dabc61ae433b Mon Sep 17 00:00:00 2001 From: Dario Gjorgjevski Date: Sat, 29 Aug 2015 15:16:53 +0200 Subject: [PATCH 3/3] make forecast timer naming consistent --- widgets/weather.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widgets/weather.lua b/widgets/weather.lua index b745ebe..dacdd41 100644 --- a/widgets/weather.lua +++ b/widgets/weather.lua @@ -132,7 +132,7 @@ local function worker(args) weather.attach(weather.widget) newtimer("weather-" .. city_id, timeout, weather.update) - newtimer("weather_forecast" .. city_id, timeout, weather.forecast_update) + newtimer("weather_forecast-" .. city_id, timeout, weather.forecast_update) return setmetatable(weather, { __index = weather.widget }) end