]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/net.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:

Merge branch 'InfinityTotality-master'
[etc/awesome.git] / widgets / net.lua
index 2b066229e45f303dca18e04e038e552c471843f2..a578ae4ca9cc405454c4cc57a6b23cd5a9be2a0e 100644 (file)
@@ -13,8 +13,6 @@ local notify_fg    = require("beautiful").fg_focus
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
-local io           = { popen  = io.popen }
-local tostring     = tostring
 local string       = { format = string.format,
                        gsub   = string.gsub,
                        match  = string.match }
@@ -29,9 +27,7 @@ local net = {
 }
 
 function net.get_device()
-    f = io.popen("ip link show | cut -d' ' -f2,9")
-    ws = f:read("*a")
-    f:close()
+    local ws = helpers.read_pipe("ip link show | cut -d' ' -f2,9")
     ws = ws:match("%w+: UP") or ws:match("ppp%w+: UNKNOWN")
     if ws ~= nil then
         return ws:match("(%w+):")
@@ -71,10 +67,10 @@ local function worker(args)
         local now_r = helpers.first_line('/sys/class/net/' .. iface ..
                                            '/statistics/rx_bytes') or 0
 
-        net_now.sent = tostring((now_t - net.last_t) / timeout / units)
+        net_now.sent = (now_t - net.last_t) / timeout / units
         net_now.sent = string.gsub(string.format('%.1f', net_now.sent), ",", ".")
 
-        net_now.received = tostring((now_r - net.last_r) / timeout / units)
+        net_now.received = (now_r - net.last_r) / timeout / units
         net_now.received = string.gsub(string.format('%.1f', net_now.received), ",", ".")
 
         widget = net.widget