Merge branch 'Veratil-awesome-v4-layout-fix'

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

diff --git a/widgets/fs.lua b/widgets/fs.lua
index 391c26009ed3e9960d16bb9ca5e25895330bd486..efd31fb3f19a2f57d8943921f240d58c711c2fb7 100644 (file)
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -20,7 +20,7 @@ local setmetatable = setmetatable
 
 -- File system disk space usage
 -- lain.widgets.fs
 
 -- File system disk space usage
 -- lain.widgets.fs

-local fs = {}
+local fs = helpers.make_widget_textbox()

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


@@ -32,23 +32,20 @@ function fs.hide()
 end
 
 function fs.show(seconds, scr)
 end
 
 function fs.show(seconds, scr)

+    fs.update()
+

     fs.hide()
 
     if fs.followtag then
         fs.notification_preset.screen = focused()
     elseif scr then
     fs.hide()
 
     if fs.followtag then
         fs.notification_preset.screen = focused()
     elseif scr then

-        fs.notification_preset.screen = scr
+        fs.notification_preset.screen = scr or 1

     end
 
     end
 

-    local cmd = (fs.options and string.format("dfs %s", fs.options)) or "dfs"
-
-    helpers.async(helpers.scripts_dir .. cmd, function(ws)
-        fs.notification = naughty.notify({
-            preset      = fs.notification_preset,
-            text        = ws:gsub("\n*$", ""),
-            timeout     = seconds or 5,
-        })
-    end)
+    fs.notification = naughty.notify({
+        preset      = fs.notification_preset,
+        timeout     = seconds or 5
+    })

 end
 
 local function worker(args)
 end
 
 local function worker(args)


@@ -64,20 +61,18 @@ local function worker(args)
     fs.notification_preset = args.notification_preset
 
     if not fs.notification_preset then
     fs.notification_preset = args.notification_preset
 
     if not fs.notification_preset then

-        fs.notification_preset      = naughty.config.defaults
-        fs.notification_preset.font = "Monospace 10"
-        fs.notification_preset.fg   = "#FFFFFF"
-        fs.notification_preset.bg   = "#000000"
+        fs.notification_preset = {
+            font = "Monospace 10",
+            fg   = "#FFFFFF",
+            bg   = "#000000"
+        }

     end
 
     end
 

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

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

-
-    function update()
+    function fs.update()

         fs_info, fs_now  = {}, {}
         fs_info, fs_now  = {}, {}

-        helpers.async(string.format("%s -c 'LC_ALL=C df -k --output=target,size,used,avail,pcent'", shell), function(f)
+        helpers.async({ shell, "-c", "LC_ALL=C df -k --output=target,size,used,avail,pcent" }, 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
             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


@@ -107,17 +102,20 @@ local function worker(args)
 
             if notify == "on" and tonumber(fs_now.used) >= 99 and not helpers.get_map(partition) then
                 naughty.notify({
 
             if notify == "on" and tonumber(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"
+                    preset = naughty.config.presets.critical,
+                    title  = "Warning",
+                    text   = partition .. " is empty",

                 })
                 helpers.set_map(partition, true)
             else
                 helpers.set_map(partition, false)
             end
         end)
                 })
                 helpers.set_map(partition, true)
             else
                 helpers.set_map(partition, false)
             end
         end)

+
+        local notifycmd = (fs.options and string.format("dfs %s", fs.options)) or "dfs"
+        helpers.async(helpers.scripts_dir .. notifycmd, function(ws)
+            fs.notification_preset.text = ws:gsub("\n*$", "")
+        end)

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


@@ -125,7 +123,7 @@ local function worker(args)
        fs.widget:connect_signal('mouse::leave', function () fs.hide() end)
     end
 
        fs.widget:connect_signal('mouse::leave', function () fs.hide() end)
     end
 

-    helpers.newtimer(partition, timeout, update)
+    helpers.newtimer(partition, timeout, fs.update)

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