fixed typo

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

diff --git a/widgets/fs.lua b/widgets/fs.lua
index 374d6eba05af0e57557dc6514b629648f40827f3..eda3ffcdb9c8dc80a67ff5655074a83ceefd99e4 100644 (file)
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -9,7 +9,6 @@
 local helpers      = require("lain.helpers")
 
 local shell        = require("awful.util").shell
 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 focused      = require("awful.screen").focused
 local wibox        = require("wibox")
 local naughty      = require("naughty")


@@ -26,25 +25,30 @@ local fs = {}
 -- Unit definitions
 fs.unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
 
 -- Unit definitions
 fs.unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
 

-function fs.hide() naughty.destroy(fs.notification) end
+function fs.hide()
+    if not fs.notification then return end
+    naughty.destroy(fs.notification)
+    fs.notification = nil
+end

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

-    local cmd = (fs.options and string.format("dfs %s", fs.options)) or "dfs"
-    local ws = helpers.read_pipe(helpers.scripts_dir .. cmd):gsub("\n*$", "")
-

     if fs.followtag then
         fs.notification_preset.screen = focused()
     elseif scr then
     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
 

-    fs.notification = naughty.notify({
-        preset      = fs.notification_preset,
-        text        = ws,
-        timeout     = seconds or 5,
-    })
+    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)

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


@@ -57,16 +61,22 @@ local function worker(args)
 
     fs.options             = args.options
     fs.followtag           = args.followtag or false
 
     fs.options             = args.options
     fs.followtag           = args.followtag or false

-    fs.notification_preset = args.notification_preset or { fg = beautiful.fg_normal }
+    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"
+    end

 
     fs.widget = wibox.widget.textbox()
 
     helpers.set_map(partition, false)
 
 
     fs.widget = wibox.widget.textbox()
 
     helpers.set_map(partition, false)
 

-

     function update()
         fs_info, fs_now  = {}, {}
     function update()
         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


@@ -94,13 +104,11 @@ local function worker(args)
             widget = fs.widget
             settings()
 
             widget = fs.widget
             settings()
 

-            if notify == "on" and fs_now.used >= 99 and not helpers.get_map(partition) then
+            if notify == "on" and tonumber(fs_now.used) >= 99 and not helpers.get_map(partition) then

                 naughty.notify({
                 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, true)
             else