Padding removed, along with deprecated helper functions.

If you have any use for it then continue using an older vicious tag,
or keep maintaining it in your local vicious copy.

1 files changed, 1 insertions, 18 deletions

diff --git a/net.lua b/net.lua
index c9f0fb2..6e7163e 100644
--- a/net.lua
+++ b/net.lua
@@ -9,7 +9,6 @@ local os = { time = os.time }
 local io = { open = io.open }
 local setmetatable = setmetatable
 local math = { floor = math.floor }
-local helpers = require("vicious.helpers")
 -- }}}
 
 
@@ -21,7 +20,7 @@ module("vicious.net")
 local nets = {}
 
 -- {{{ Net widget type
-function worker(format, padding)
+function worker(format)
     -- Get /proc/net/dev
     local f = io.open("/proc/net/dev")
     local args = {}
@@ -36,14 +35,6 @@ function worker(format, padding)
             -- Transmited bytes, 7 fields from end of the line
             send = tonumber(line:match("([%d]+)%s+%d+%s+%d+%s+%d+%s+%d+%s+%d+%s+%d+%s+%d$"))
 
-            if padding then
-                args["{"..name.." rx}"] = helpers.bytes_to_string(recv, nil, padding)
-                args["{"..name.." tx}"] = helpers.bytes_to_string(send, nil, padding)
-            else
-                args["{"..name.." rx}"] = helpers.bytes_to_string(recv)
-                args["{"..name.." tx}"] = helpers.bytes_to_string(send)
-            end
-
             args["{"..name.." rx_b}"]  = math.floor(recv*10)/10
             args["{"..name.." tx_b}"]  = math.floor(send*10)/10
             
@@ -83,14 +74,6 @@ function worker(format, padding)
                 down = (recv - nets[name][1])/interval
                 up   = (send - nets[name][2])/interval
 
-                if padding then
-                    args["{"..name.." down}"] = helpers.bytes_to_string(down, true, padding)
-                    args["{"..name.." up}"] = helpers.bytes_to_string(up, true, padding)
-                else
-                    args["{"..name.." down}"] = helpers.bytes_to_string(down, true)
-                    args["{"..name.." up}"] = helpers.bytes_to_string(up, true)
-                end
-
                 args["{"..name.." down_b}"] = math.floor(down*10)/10
                 args["{"..name.." up_b}"] = math.floor(up*10)/10