yawn: fetch_weather local -> integrated; net: iface scope fixed

diff --git a/asyncshell.lua b/asyncshell.lua
index 51885e8179715e2d832b2261a32773b6b863691e..4a01caad7f9160a8a6cc9d18f35723df12afd155 100644 (file)
--- a/asyncshell.lua
+++ b/asyncshell.lua
@@ -11,9 +11,9 @@
 -- ...asynchronously:
 -- asyncshell.request('wscript -Kiev', function(f) wwidget.text = f:read("*l") end)
 -- ...synchronously
 -- ...asynchronously:
 -- asyncshell.request('wscript -Kiev', function(f) wwidget.text = f:read("*l") end)
 -- ...synchronously

--- wwidget.text = asyncshell.demand('wscript -Kiev', 5):read("*l") or "Error"
+-- widget:set_text(asyncshell.demand('wscript -Kiev', 5):read("*l") or "Error")

 
 

--- This makes things faster, but puts weight on sysload and is more cpu demanding.
+-- This is more cpu demanding, but makes things faster.

 
 local spawn = require('awful.util').spawn
 
 
 local spawn = require('awful.util').spawn
 


@@ -39,7 +39,7 @@ end
 function asyncshell.request(command, callback)
    local id = next_id()
    local tmpfname = asyncshell.file_template .. id
 function asyncshell.request(command, callback)
    local id = next_id()
    local tmpfname = asyncshell.file_template .. id

-   asyncshell.request_table[id] = {callback = callback}
+   asyncshell.request_table[id] = { callback = callback }

    local req =
       string.format("sh -c '%s > %s; " ..
                     'echo "asyncshell.deliver(%s)" | ' ..
    local req =
       string.format("sh -c '%s > %s; " ..
                     'echo "asyncshell.deliver(%s)" | ' ..

diff --git a/widgets/net.lua b/widgets/net.lua
index 84751b68e925aab3268f00abf1f23fcf0c81c8ab..d1179a28445ad206d6b214cb07529a2d422d5cc9 100644 (file)
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -42,12 +42,13 @@ end
 local function worker(args)
     local args = args or {}
     local timeout = args.timeout or 2
 local function worker(args)
     local args = args or {}
     local timeout = args.timeout or 2

-    local iface = args.iface or net.get_device()

     local units = args.units or 1024 --kb
     local notify = args.notify or "on"
     local screen = args.screen or 1
     local settings = args.settings or function() end
 
     local units = args.units or 1024 --kb
     local notify = args.notify or "on"
     local screen = args.screen or 1
     local settings = args.settings or function() end
 

+    iface = args.iface or net.get_device()
+

     net.widget = wibox.widget.textbox('')
 
     helpers.set_map(iface, true)
     net.widget = wibox.widget.textbox('')
 
     helpers.set_map(iface, true)

diff --git a/widgets/yawn/init.lua b/widgets/yawn/init.lua
index b034395f64681ba64dba40f1dfa2680cc36063f4..be3e614cbeb7890b05772e085af7ffee9591d51a 100644 (file)
--- a/widgets/yawn/init.lua
+++ b/widgets/yawn/init.lua
@@ -45,9 +45,9 @@ local city_id             = nil
 local sky                 = nil
 local settings            = function() end
 
 local sky                 = nil
 local settings            = function() end
 

-yawn_notification_preset = {}
+yawn_notification_preset  = {}

 
 

-local function fetch_weather()
+function yawn.fetch_weather()

     local url = api_url .. units_set .. city_id
     local cmd = "curl --connect-timeout 1 -fsm 3 '" .. url .. "'"
 
     local url = api_url .. units_set .. city_id
     local cmd = "curl --connect-timeout 1 -fsm 3 '" .. url .. "'"
 


@@ -157,7 +157,7 @@ end
 function yawn.show(t_out)
     if yawn.widget._layout.text:match("?")
     then
 function yawn.show(t_out)
     if yawn.widget._layout.text:match("?")
     then

-        fetch_weather(settings)
+        yawn.fetch_weather()

     end
 
     yawn.hide()
     end
 
     yawn.hide()


@@ -179,7 +179,7 @@ function yawn.register(id, args)
 
     city_id = id
 
 
     city_id = id
 

-    newtimer("yawn", timeout, fetch_weather)
+    newtimer("yawn", timeout, yawn.fetch_weather)

 
     yawn.icon:connect_signal("mouse::enter", function()
         yawn.show(0)
 
     yawn.icon:connect_signal("mouse::enter", function()
         yawn.show(0)