mem: adjusted calculation; #271

diff --git a/widgets/mem.lua b/widgets/mem.lua
index 763ac4b4925b83a7695c9290862472197795b140..443047c3f59d8327f13f84a931670bb532a6d618 100644 (file)
--- a/widgets/mem.lua
+++ b/widgets/mem.lua
@@ -11,7 +11,7 @@ local newtimer     = require("lain.helpers").newtimer
 local wibox        = require("wibox")
 local gmatch       = string.gmatch
 local lines        = io.lines
 local wibox        = require("wibox")
 local gmatch       = string.gmatch
 local lines        = io.lines

-local math         = { ceil = math.ceil, floor = math.floor }
+local floor        = math.floor

 local setmetatable = setmetatable
 
 -- Memory usage (ignoring caches)
 local setmetatable = setmetatable
 
 -- Memory usage (ignoring caches)


@@ -29,13 +29,13 @@ local function worker(args)
         mem_now = {}
         for line in lines("/proc/meminfo") do
             for k, v in gmatch(line, "([%a]+):[%s]+([%d]+).+") do
         mem_now = {}
         for line in lines("/proc/meminfo") do
             for k, v in gmatch(line, "([%a]+):[%s]+([%d]+).+") do

-                if     k == "MemTotal"     then mem_now.total = math.ceil(v / 1024)
-                elseif k == "MemFree"      then mem_now.free  = math.ceil(v / 1024)
-                elseif k == "Buffers"      then mem_now.buf   = math.ceil(v / 1024)
-                elseif k == "Cached"       then mem_now.cache = math.ceil(v / 1024)
-                elseif k == "SwapTotal"    then mem_now.swap  = math.ceil(v / 1024)
-                elseif k == "SwapFree"     then mem_now.swapf = math.ceil(v / 1024)
-                elseif k == "SReclaimable" then mem_now.srec  = math.ceil(v / 1024)
+                if     k == "MemTotal"     then mem_now.total = floor(v / 1024 + 0.5)
+                elseif k == "MemFree"      then mem_now.free  = floor(v / 1024 + 0.5)
+                elseif k == "Buffers"      then mem_now.buf   = floor(v / 1024 + 0.5)
+                elseif k == "Cached"       then mem_now.cache = floor(v / 1024 + 0.5)
+                elseif k == "SwapTotal"    then mem_now.swap  = floor(v / 1024 + 0.5)
+                elseif k == "SwapFree"     then mem_now.swapf = floor(v / 1024 + 0.5)
+                elseif k == "SReclaimable" then mem_now.srec  = floor(v / 1024 + 0.5)

                 end
             end
         end
                 end
             end
         end

diff --git a/widgets/net.lua b/widgets/net.lua
index 922e5e18a19a6b3f573b1e2b79a0f81c18c739d3..81345fc3bcd19040c00990180608afd0db231087 100644 (file)
--- a/widgets/net.lua
+++ b/widgets/net.lua
@@ -32,8 +32,8 @@ local function worker(args)
     local settings   = args.settings or function() end
 
     -- Compatibility with old API where iface was a string corresponding to 1 interface
     local settings   = args.settings or function() end
 
     -- Compatibility with old API where iface was a string corresponding to 1 interface

-    net.iface = (args.iface and (type(args.iface) == "string" and {args.iface}) or (type(args.iface) == "table" and args.iface)) or {}
-
+    net.iface = (args.iface and (type(args.iface) == "string" and {args.iface}) or
+                (type(args.iface) == "table" and args.iface)) or {}

 
     function net.get_device()
         helpers.async(string.format("ip link show", device_cmd), function(ws)
 
     function net.get_device()
         helpers.async(string.format("ip link show", device_cmd), function(ws)