added issue_template

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

diff --git a/widgets/mem.lua b/widgets/mem.lua
index 986fa7668c7be37a34145cad34f2906392d03c52..7f4f346b99d7ae8880e00f465212855529c5f902 100644 (file)
--- a/widgets/mem.lua
+++ b/widgets/mem.lua
@@ -7,17 +7,12 @@
                                                   
 --]]
 
                                                   
 --]]
 

-local newtimer        = require("lain.helpers").newtimer
-
-local wibox           = require("wibox")
-
-local io              = { lines  = io.lines }
-local math            = { floor  = math.floor }
-local string          = { format = string.format,
-                          gmatch = string.gmatch,
-                          len    = string.len }
-
-local setmetatable    = setmetatable
+local newtimer     = require("lain.helpers").newtimer
+local wibox        = require("wibox")
+local io           = { lines  = io.lines }
+local math         = { floor  = math.floor }
+local string       = { gmatch = string.gmatch }
+local setmetatable = setmetatable

 
 -- Memory usage (ignoring caches)
 -- lain.widgets.mem
 
 -- Memory usage (ignoring caches)
 -- lain.widgets.mem


@@ -25,17 +20,15 @@ local mem = {}
 
 local function worker(args)
     local args     = args or {}
 
 local function worker(args)
     local args     = args or {}

-    local timeout  = args.timeout or 3
+    local timeout  = args.timeout or 2

     local settings = args.settings or function() end
 
     local settings = args.settings or function() end
 

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

 
     function update()
         mem_now = {}
 
     function update()
         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_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)
                 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)


@@ -48,6 +41,7 @@ local function worker(args)
 
         mem_now.used = mem_now.total - (mem_now.free + mem_now.buf + mem_now.cache)
         mem_now.swapused = mem_now.swap - mem_now.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

+        mem_now.perc = math.floor(mem_now.used / mem_now.total * 100)

 
         widget = mem.widget
         settings()
 
         widget = mem.widget
         settings()