]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/yawn/init.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / etc / awesome.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge pull request #50 from blueluke/widget_redshift
[etc/awesome.git] / widgets / yawn / init.lua
diff --git a/widgets/yawn/init.lua b/widgets/yawn/init.lua
index 20c90b182a51664531551dadeebb019cd48cd271..4109d6c90152903274b460405034d92152e02f47 100644 (file)
--- a/widgets/yawn/init.lua
+++ b/widgets/yawn/init.lua
@@ -6,9 +6,8 @@
                                                   
 --]]
 
                                                   
 --]]
 
-local markup       = require("lain.util.markup")
+local newtimer     = require("lain.helpers").newtimer
 
 
-local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
@@ -28,31 +27,27 @@ local setmetatable = setmetatable
 -- lain.widgets.yawn
 local yawn =
 {
 -- lain.widgets.yawn
 local yawn =
 {
-    units    = "",
-    forecast = "",
-    icon     = wibox.widget.imagebox(),
-    widget   = wibox.widget.textbox()
+    icon   = wibox.widget.imagebox(),
+    widget = wibox.widget.textbox('')
 }
 
 }
 
-local project_path       = debug.getinfo(1, 'S').source:match[[^@(.*/).*$]]
-local localizations_path = project_path .. 'localizations/'
-local icon_path          = project_path .. 'icons/'
-local api_url            = 'http://weather.yahooapis.com/forecastrss'
-local units_set          = '?u=c&w=' -- Default is Celsius
-local language           = string.match(os.getenv("LANG"), "(%S*$*)[.]")
-local weather_data       = nil
-local notification       = nil
-local city_id            = nil
-local sky                = nil
-local settings           = {}
-local update_timer       = nil
-
-local function fetch_weather(args)
-    local toshow = args.toshow or "forecast"
-
+local project_path        = debug.getinfo(1, 'S').source:match[[^@(.*/).*$]]
+local localizations_path  = project_path .. 'localizations/'
+local icon_path           = project_path .. 'icons/'
+local api_url             = 'http://weather.yahooapis.com/forecastrss'
+local units_set           = '?u=c&w=' -- Default is Celsius
+local language            = string.match(os.getenv("LANG"), "(%S*$*)[.]") or "en_US" -- if LANG is not set
+local weather_data        = nil
+local notification        = nil
+local city_id             = nil
+local sky                 = nil
+local settings            = function() end
+
+yawn_notification_preset = {}
+
+local function fetch_weather()
     local url = api_url .. units_set .. city_id
     local url = api_url .. units_set .. city_id
-    local f = io.popen("curl --connect-timeout 1 -fsm 2 '"
-                       .. url .. "'" )
+    local f = io.popen("curl --connect-timeout 1 -fsm 3 '" .. url .. "'" )
     local text = f:read("*all")
     f:close()
 
     local text = f:read("*all")
     f:close()
 
@@ -60,22 +55,30 @@ local function fetch_weather(args)
     -- widgets won't display
     if text == "" or text:match("City not found")
     then
     -- widgets won't display
     if text == "" or text:match("City not found")
     then
-        sky = icon_path .. "na.png"
-        yawn.icon:set_image(sky)
+        yawn.icon:set_image(icon_path .. "na.png")
         if text == "" then
             weather_data = "Service not available at the moment."
         if text == "" then
             weather_data = "Service not available at the moment."
-            return "N/A"
+            yawn.widget:set_text(" N/A ")
         else
             weather_data = "City not found!\n" ..
                            "Are you sure " .. city_id ..
                            " is your Yahoo city ID?"
         else
             weather_data = "City not found!\n" ..
                            "Are you sure " .. city_id ..
                            " is your Yahoo city ID?"
-            return "?"
+            yawn.widget:set_text(" ? ")
         end
         end
+        return
     end
 
     -- Processing raw data
     weather_data = text:gsub("<.->", "")
     end
 
     -- Processing raw data
     weather_data = text:gsub("<.->", "")
-    weather_data = weather_data:match("Current Conditions:.-Full")
+    weather_data = weather_data:match("Current Conditions:.-Full") or ""
+
+    -- may still happens in case of bad connectivity
+    if weather_data == "" then
+        yawn.icon:set_image(icon_path .. "na.png")
+        yawn.widget:set_text(" ? ")
+        return
+    end
+
     weather_data = weather_data:gsub("Current Conditions:.-\n", "Now: ")
     weather_data = weather_data:gsub("Forecast:.-\n", "")
     weather_data = weather_data:gsub("\nFull", "")
     weather_data = weather_data:gsub("Current Conditions:.-\n", "Now: ")
     weather_data = weather_data:gsub("Forecast:.-\n", "")
     weather_data = weather_data:gsub("\nFull", "")
@@ -88,8 +91,8 @@ local function fetch_weather(args)
     -- Getting info for text widget
     local now      = weather_data:sub(weather_data:find("Now:")+5,
                      weather_data:find("\n")-1)
     -- Getting info for text widget
     local now      = weather_data:sub(weather_data:find("Now:")+5,
                      weather_data:find("\n")-1)
-    local forecast = now:sub(1, now:find(",")-1)
-    local units    = now:sub(now:find(",")+2, -2)
+    forecast       = now:sub(1, now:find(",")-1)
+    units          = now:sub(now:find(",")+2, -2)
 
     -- Day/Night icon change
     local hour = tonumber(os.date("%H"))
 
     -- Day/Night icon change
     local hour = tonumber(os.date("%H"))
@@ -111,11 +114,8 @@ local function fetch_weather(args)
     sky = sky  .. forecast:gsub(" ", ""):gsub("/", "") .. ".png"
 
     -- In case there's no defined icon for current forecast
     sky = sky  .. forecast:gsub(" ", ""):gsub("/", "") .. ".png"
 
     -- In case there's no defined icon for current forecast
-    f = io.popen(sky)
-    if f == nil then
+    if io.open(sky) == nil then
         sky = icon_path .. "na.png"
         sky = icon_path .. "na.png"
-    else
-        f:close()
     end
 
     -- Localization
     end
 
     -- Localization
@@ -132,21 +132,14 @@ local function fetch_weather(args)
     end
 
     -- Finally setting infos
     end
 
     -- Finally setting infos
-    both = weather_data:match(": %S+.-\n"):gsub(": ", "")
-    forecast = weather_data:match(": %S+.-,"):gsub(": ", ""):gsub(",", "\n")
-    units = units:gsub(" ", "")
-
-    yawn.forecast = markup(yawn.color, " " .. markup.font(beautiful.font, forecast) .. " ")
-    yawn.units = markup(yawn.color, " " .. markup.font(beautiful.font, units))
     yawn.icon:set_image(sky)
     yawn.icon:set_image(sky)
+    widget = yawn.widget
 
 
-    if toshow == "forecast" then
-        return yawn.forecast
-    elseif toshow == "units" then
-        return yawn.units
-    else
-        return both 
-    end
+    _data = weather_data:match(": %S.-,") or weather_data
+    forecast = _data:gsub(": ", ""):gsub(",", "")
+    units = units:gsub(" ", "")
+
+    settings()
 end
 
 function yawn.hide()
 end
 
 function yawn.hide()
@@ -157,43 +150,31 @@ function yawn.hide()
 end
 
 function yawn.show(t_out)
 end
 
 function yawn.show(t_out)
-    if yawn.widget._layout.text == "?"
+    if yawn.widget._layout.text:match("?")
     then
     then
-        if update_timer ~= nil
-        then
-            update_timer:emit_signal("timeout")
-        else
-            fetch_weather(settings)
-        end
+        fetch_weather(settings)
     end
 
     yawn.hide()
 
     notification = naughty.notify({
     end
 
     yawn.hide()
 
     notification = naughty.notify({
+        preset = yawn_notification_preset,
         text = weather_data,
         icon = sky,
         text = weather_data,
         icon = sky,
-        timeout = t_out,
-        fg = yawn.color
+        timeout = t_out
     })
 end
 
 function yawn.register(id, args)
     })
 end
 
 function yawn.register(id, args)
-    local args = args or {}
-
-    settings = args 
-
-    yawn.color = args.color or beautiful.fg_normal or "#FFFFFF"
+    local args     = args or {}
+    local timeout  = args.timeout or 600
+    settings       = args.settings or function() end
 
     if args.u == "f" then units_set = '?u=f&w=' end
 
     city_id = id
 
 
     if args.u == "f" then units_set = '?u=f&w=' end
 
     city_id = id
 
-    update_timer = timer({ timeout = 600 }) -- 10 mins
-    update_timer:connect_signal("timeout", function()
-        yawn.widget:set_markup(fetch_weather(settings))
-    end)
-    update_timer:start()
-    update_timer:emit_signal("timeout")
+    newtimer("yawn", timeout, fetch_weather)
 
     yawn.icon:connect_signal("mouse::enter", function()
         yawn.show(0)
 
     yawn.icon:connect_signal("mouse::enter", function()
         yawn.show(0)
@@ -217,6 +198,4 @@ function yawn.attach(widget, id, args)
     end)
 end
 
     end)
 end
 
--- }}}
-
 return setmetatable(yawn, { __call = function(_, ...) return yawn.register(...) end })
 return setmetatable(yawn, { __call = function(_, ...) return yawn.register(...) end })
awesome window-manager configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.