Merge pull request #110 from dnedbaylo/master

[etc/awesome.git] / widgets / mem.lua

diff --git a/widgets/mem.lua b/widgets/mem.lua
index d0ff223966549c845dd48d9440ee3a2db3d1ffe0..46bb5f90dc593631b270b5d41ff428208382d8c7 100644 (file)
--- a/widgets/mem.lua
+++ b/widgets/mem.lua
@@ -1,12 +1,10 @@
 
 --[[
 
 --[[

-                                                           
-     Licensed under GNU General Public License v2          
-      * (c) 2013,      Luke Bonham                         
-      * (c) 2010-2012, Peter Hofmann                       
-      * (c) 2010,      Adrian C.      <anrxc@sysphere.org> 
-      * (c) 2009,      Lucas de Vries <lucas@glacicle.com> 
-                                                           
+                                                  
+     Licensed under GNU General Public License v2 
+      * (c) 2013,      Luke Bonham                
+      * (c) 2010-2012, Peter Hofmann              
+                                                  

 --]]
 
 local newtimer        = require("lain.helpers").newtimer
 --]]
 
 local newtimer        = require("lain.helpers").newtimer


@@ -15,9 +13,7 @@ local wibox           = require("wibox")
 
 local io              = { lines  = io.lines }
 local math            = { floor  = math.floor }
 
 local io              = { lines  = io.lines }
 local math            = { floor  = math.floor }

-local string          = { format = string.format,
-                          gmatch = string.gmatch,
-                          len    = string.len }
+local string          = { gmatch = string.gmatch }

 
 local setmetatable    = setmetatable
 
 
 local setmetatable    = setmetatable
 


@@ -25,38 +21,39 @@ local setmetatable    = setmetatable
 -- lain.widgets.mem
 local mem = {}
 
 -- lain.widgets.mem
 local mem = {}
 

-function worker(args)
+local function worker(args)

     local args     = args or {}
     local timeout  = args.timeout or 3
     local settings = args.settings or function() end
 
     local args     = args or {}
     local timeout  = args.timeout or 3
     local settings = args.settings or function() end
 

-    widget = wibox.widget.textbox('')
+    mem.widget = wibox.widget.textbox('')

 
     function update()
 
     function update()

-        mem = {}
+        mem_now = {}

         for line in io.lines("/proc/meminfo")
         do
             for k, v in string.gmatch(line, "([%a]+):[%s]+([%d]+).+")
             do
         for line in io.lines("/proc/meminfo")
         do
             for k, v in string.gmatch(line, "([%a]+):[%s]+([%d]+).+")
             do

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

                 end
             end
         end
 
                 end
             end
         end
 

-        used = mem.total - (mem.free + mem.buf + mem.cache)
-        swapused = mem.swap - mem.swapf
+        mem_now.used = mem_now.total - (mem_now.free + mem_now.buf + mem_now.cache)
+        mem_now.swapused = mem_now.swap - mem_now.swapf

 
 

+        widget = mem.widget

         settings()
     end
 
     newtimer("mem", timeout, update)
 
         settings()
     end
 
     newtimer("mem", timeout, update)
 

-    return widget
+    return mem.widget

 end
 
 return setmetatable(mem, { __call = function(_, ...) return worker(...) end })
 end
 
 return setmetatable(mem, { __call = function(_, ...) return worker(...) end })