fs: asynchronous

diff --git a/widgets/fs.lua b/widgets/fs.lua
index f578f8bb240bfe150c354f2363e7fd5f692509a2..374d6eba05af0e57557dc6514b629648f40827f3 100644 (file)
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -1,24 +1,20 @@
 
 --[[
 
 --[[

-                                                      
-     Licensed under GNU General Public License v2     
-      * (c) 2013, Luke Bonham                         
-      * (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                     
+                                                  

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

+local shell        = require("awful.util").shell

 local beautiful    = require("beautiful")
 local focused      = require("awful.screen").focused
 local wibox        = require("wibox")
 local naughty      = require("naughty")
 
 local beautiful    = require("beautiful")
 local focused      = require("awful.screen").focused
 local wibox        = require("wibox")
 local naughty      = require("naughty")
 

-local io           = { popen  = io.popen }
-local pairs        = pairs
-local string       = { match  = string.match,
-                       format = string.format }
+local string       = string

 local tonumber     = tonumber
 
 local setmetatable = setmetatable
 local tonumber     = tonumber
 
 local setmetatable = setmetatable


@@ -26,14 +22,11 @@ local setmetatable = setmetatable
 -- File system disk space usage
 -- lain.widgets.fs
 local fs = {}
 -- File system disk space usage
 -- lain.widgets.fs
 local fs = {}

-local fs_notification  = nil

 
 

-function fs.hide()
-    if fs_notification ~= nil then
-        naughty.destroy(fs_notification)
-        fs_notification = nil
-    end
-end
+-- Unit definitions
+fs.unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
+
+function fs.hide() naughty.destroy(fs.notification) end

 
 function fs.show(seconds, scr)
     fs.hide()
 
 function fs.show(seconds, scr)
     fs.hide()


@@ -47,16 +40,13 @@ function fs.show(seconds, scr)
         fs.notification_preset.screen = scr
     end
 
         fs.notification_preset.screen = scr
     end
 

-    fs_notification = naughty.notify({
-        preset  = fs.notification_preset,
-        text    = ws,
-        timeout = seconds or 5
+    fs.notification = naughty.notify({
+        preset      = fs.notification_preset,
+        text        = ws,
+        timeout     = seconds or 5,

     })
 end
 
     })
 end
 

--- Unit definitions
-local unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
-

 local function worker(args)
     local args             = args or {}
     local timeout          = args.timeout or 600
 local function worker(args)
     local args             = args or {}
     local timeout          = args.timeout or 600


@@ -69,56 +59,54 @@ local function worker(args)
     fs.followtag           = args.followtag or false
     fs.notification_preset = args.notification_preset or { fg = beautiful.fg_normal }
 
     fs.followtag           = args.followtag or false
     fs.notification_preset = args.notification_preset or { fg = beautiful.fg_normal }
 

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

 
     helpers.set_map(partition, false)
 
 
     helpers.set_map(partition, false)
 

+

     function update()
     function update()

-        fs_info = {}
-        fs_now  = {}
-        local f = assert(io.popen("LC_ALL=C df -kP"))
-
-        for line in f:lines() do -- Match: (size) (used)(avail)(use%) (mount)
-            local s     = string.match(line, "^.-[%s]([%d]+)")
-            local u,a,p = string.match(line, "([%d]+)[%D]+([%d]+)[%D]+([%d]+)%%")
-            local m     = string.match(line, "%%[%s]([%p%w]+)")
-
-            if u and m then -- Handle 1st line and broken regexp
-                fs_info[m .. " size_mb"]  = string.format("%.1f", tonumber(s) / unit["mb"])
-                fs_info[m .. " size_gb"]  = string.format("%.1f", tonumber(s) / unit["gb"])
-                fs_info[m .. " used_mb"]  = string.format("%.1f", tonumber(u) / unit["mb"])
-                fs_info[m .. " used_gb"]  = string.format("%.1f", tonumber(u) / unit["gb"])
-                fs_info[m .. " used_p"]   = tonumber(p)
-                fs_info[m .. " avail_p"]  = 100 - tonumber(p)
+        fs_info, fs_now  = {}, {}
+        helpers.async(string.format("%s -c 'LC_ALL=C df -k --output=target,size,used,avail,pcent'", shell), function(f)
+            for line in string.gmatch(f, "\n[^\n]+") do
+                local m,s,u,a,p = string.match(line, "(/.-%s).-(%d+).-(%d+).-(%d+).-([%d]+)%%")
+                m = m:gsub(" ", "") -- clean target from any whitespace
+
+                fs_info[m .. " size_mb"]  = string.format("%.1f", tonumber(s) / fs.unit["mb"])
+                fs_info[m .. " size_gb"]  = string.format("%.1f", tonumber(s) / fs.unit["gb"])
+                fs_info[m .. " used_mb"]  = string.format("%.1f", tonumber(u) / fs.unit["mb"])
+                fs_info[m .. " used_gb"]  = string.format("%.1f", tonumber(u) / fs.unit["gb"])
+                fs_info[m .. " used_p"]   = p
+                fs_info[m .. " avail_mb"] = string.format("%.1f", tonumber(a) / fs.unit["mb"])
+                fs_info[m .. " avail_gb"] = string.format("%.1f", tonumber(a) / fs.unit["gb"])
+                fs_info[m .. " avail_p"]  = string.format("%d", 100 - tonumber(p))
+            end
+
+            fs_now.size_mb      = fs_info[partition .. " size_mb"]  or "N/A"
+            fs_now.size_gb      = fs_info[partition .. " size_gb"]  or "N/A"
+            fs_now.used         = fs_info[partition .. " used_p"]   or "N/A"
+            fs_now.used_mb      = fs_info[partition .. " used_mb"]  or "N/A"
+            fs_now.used_gb      = fs_info[partition .. " used_gb"]  or "N/A"
+            fs_now.available    = fs_info[partition .. " avail_p"]  or "N/A"
+            fs_now.available_mb = fs_info[partition .. " avail_mb"] or "N/A"
+            fs_now.available_gb = fs_info[partition .. " avail_gb"] or "N/A"
+
+            notification_preset = fs.notification_preset
+            widget = fs.widget
+            settings()
+
+            if notify == "on" and fs_now.used >= 99 and not helpers.get_map(partition) then
+                naughty.notify({
+                    title   = "warning",
+                    text    = partition .. " is empty!",
+                    timeout = 8,
+                    fg      = "#000000",
+                    bg      = "#FFFFFF"
+                })
+                helpers.set_map(partition, true)
+            else
+                helpers.set_map(partition, false)

             end
             end

-        end
-
-        f:close()
-
-        fs_now.available = tonumber(fs_info[partition .. " avail_p"]) or 0
-        fs_now.size_mb   = tonumber(fs_info[partition .. " size_mb"]) or 0
-        fs_now.size_gb   = tonumber(fs_info[partition .. " size_gb"]) or 0
-        fs_now.used      = tonumber(fs_info[partition .. " used_p"])  or 0
-        fs_now.used_mb   = tonumber(fs_info[partition .. " used_mb"]) or 0
-        fs_now.used_gb   = tonumber(fs_info[partition .. " used_gb"]) or 0
-
-        notification_preset = fs.notification_preset
-        widget = fs.widget
-        settings()
-
-        if notify == "on" and fs_now.used >= 99 and not helpers.get_map(partition)
-        then
-            naughty.notify({
-                title = "warning",
-                text = partition .. " ran out!\nmake some room",
-                timeout = 8,
-                fg = "#000000",
-                bg = "#FFFFFF",
-            })
-            helpers.set_map(partition, true)
-        else
-            helpers.set_map(partition, false)
-        end
+        end)

     end
 
     if showpopup == "on" then
     end
 
     if showpopup == "on" then

diff --git a/widgets/maildir.lua b/widgets/maildir.lua
index 7d4ca28bd3d999bdd9839f39ec87346d6e24d210..2f435b3294aafae65f4cfb5526e87d511d3b1d28 100644 (file)
--- a/widgets/maildir.lua
+++ b/widgets/maildir.lua
@@ -7,24 +7,18 @@
                                                   
 --]]
 
                                                   
 --]]
 

-local spawn            = require("awful").spawn
-local wibox            = require("wibox")
+local awful        = require("awful")
+local wibox        = require("wibox")
+local helpers      = require("lain.helpers")

 
 

-local element_in_table = require("lain.helpers").element_in_table
-local newtimer         = require("lain.helpers").newtimer
-local read_pipe        = require("lain.helpers").read_pipe
-local spairs           = require("lain.helpers").spairs
+local io           = { popen  = io.popen }
+local os           = { getenv = os.getenv }
+local string       = { format = string.format,
+                       match  = string.match }

 
 

-local io               = { popen  = io.popen }
-local os               = { getenv = os.getenv }
-local pairs            = pairs
-local string           = { format = string.format,
-                           len    = string.len,
-                           match  = string.match }
+local setmetatable = setmetatable

 
 

-local setmetatable     = setmetatable
-
--- Maildir check
+-- Maildir check (synchronous)

 -- lain.widgets.maildir
 local maildir = {}
 
 -- lain.widgets.maildir
 local maildir = {}
 


@@ -36,7 +30,7 @@ local function worker(args)
     local settings     = args.settings or function() end
     local ext_mail_cmd = args.external_mail_cmd
 
     local settings     = args.settings or function() end
     local ext_mail_cmd = args.external_mail_cmd
 

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

 
     function update()
         if ext_mail_cmd then awful.spawn(ext_mail_cmd) end
 
     function update()
         if ext_mail_cmd then awful.spawn(ext_mail_cmd) end


@@ -52,11 +46,11 @@ local function worker(args)
                 -- match files that begin with a dot.
                 -- Afterwards the length of this string is the number of
                 -- new mails in that box.
                 -- match files that begin with a dot.
                 -- Afterwards the length of this string is the number of
                 -- new mails in that box.

-                local mailstring = read_pipe(string.format("find %s /new -mindepth 1 -type f -not -name '.*' -printf a", line))
+                local mailstring = helpers.read_pipe(string.format("find %s /new -mindepth 1 -type f -not -name '.*' -printf a", line))

 
                 -- Strip off leading mailpath.
                 local box      = string.match(line, mailpath .. "/(.*)")
 
                 -- Strip off leading mailpath.
                 local box      = string.match(line, mailpath .. "/(.*)")

-                local nummails = string.len(mailstring)
+                local nummails = #mailstring

 
                 if nummails > 0 then
                     boxes[box] = nummails
 
                 if nummails > 0 then
                     boxes[box] = nummails


@@ -68,9 +62,9 @@ local function worker(args)
         local newmail = "no mail"
         local total = 0
 
         local newmail = "no mail"
         local total = 0
 

-        for box, number in spairs(boxes) do
+        for box, number in helpers.spairs(boxes) do

             -- Add this box only if it's not to be ignored.
             -- Add this box only if it's not to be ignored.

-            if not util.element_in_table(box, ignore_boxes) then
+            if not helpers.element_in_table(box, ignore_boxes) then

                 total = total + number
                 if newmail == "no mail" then
                     newmail = string.format("%s(%s)", box, number)
                 total = total + number
                 if newmail == "no mail" then
                     newmail = string.format("%s(%s)", box, number)


@@ -81,11 +75,10 @@ local function worker(args)
         end
 
         widget = maildir.widget
         end
 
         widget = maildir.widget

-

         settings()
     end
 
         settings()
     end
 

-    newtimer(mailpath, timeout, update, true)
+    helpers.newtimer(mailpath, timeout, update, true)

 
     return setmetatable(maildir, { __index = maildir.widget })
 end
 
     return setmetatable(maildir, { __index = maildir.widget })
 end

diff --git a/wiki b/wiki
index fd369119050a6674c7bb4ef3b2b1d6c6dbdecb83..3e321046961aed74ac3cbc02ace4d61b11a29ad1 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit fd369119050a6674c7bb4ef3b2b1d6c6dbdecb83
+Subproject commit 3e321046961aed74ac3cbc02ace4d61b11a29ad1