pull #201 fixes

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

diff --git a/widgets/fs.lua b/widgets/fs.lua
index 4d9d27844204e81974c7d1e0efcdc3815dbea811..a1d5d95beaa896362f403a59f8c2b81cf7ce77c7 100644 (file)
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -14,8 +14,9 @@ local beautiful    = require("beautiful")
 local wibox        = require("wibox")
 local naughty      = require("naughty")
 
 local wibox        = require("wibox")
 local naughty      = require("naughty")
 

-local io           = io
+local io           = { popen  = io.popen }

 local pairs        = pairs
 local pairs        = pairs

+local mouse        = mouse

 local string       = { match  = string.match,
                        format = string.format }
 local tonumber     = tonumber
 local string       = { match  = string.match,
                        format = string.format }
 local tonumber     = tonumber


@@ -25,49 +26,51 @@ local setmetatable = setmetatable
 -- File system disk space usage
 -- lain.widgets.fs
 local fs = {}
 -- File system disk space usage
 -- lain.widgets.fs
 local fs = {}

-
-local notification  = nil
-fs_notification_preset = { fg = beautiful.fg_normal }
+local fs_notification  = nil

 
 function fs:hide()
 
 function fs:hide()

-    if notification ~= nil then
-        naughty.destroy(notification)
-        notification = nil
+    if fs_notification ~= nil then
+        naughty.destroy(fs_notification)
+        fs_notification = nil

     end
 end
 
 function fs:show(t_out)
     fs:hide()
 
     end
 end
 
 function fs:show(t_out)
     fs:hide()
 

-    local f = io.popen(helpers.scripts_dir .. "dfs")
-    ws = f:read("*all"):gsub("\n*$", "")
-    f:close()
+    local ws = helpers.read_pipe(helpers.scripts_dir .. "dfs"):gsub("\n*$", "")
+
+    if fs.followmouse then
+        fs.notification_preset.screen = mouse.screen
+    end

 
 

-    notification = naughty.notify({
-        preset = fs_notification_preset,
-        text = ws,
-       timeout = t_out
+    fs_notification = naughty.notify({
+        preset  = fs.notification_preset,
+        text    = ws,
+        timeout = t_out

     })
 end
 
     })
 end
 

--- Units definitions
+-- Unit definitions

 local unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
 
 local function worker(args)
 local unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
 
 local function worker(args)

-    local args      = args or {}
-    local timeout   = args.timeout or 600
-    local partition = args.partition or "/"
-    local settings  = args.settings or function() end
+    local args             = args or {}
+    local timeout          = args.timeout or 600
+    local partition        = args.partition or "/"
+    local settings         = args.settings or function() end
+
+    fs.followmouse         = args.followmouse 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("fs", false)
+    helpers.set_map(partition, false)

 
     function update()
         fs_info = {}
         fs_now  = {}
 
     function update()
         fs_info = {}
         fs_now  = {}

-
-        local f = io.popen("LC_ALL=C df -kP " .. partition)
+        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]+)")
 
         for line in f:lines() do -- Match: (size) (used)(avail)(use%) (mount)
             local s     = string.match(line, "^.-[%s]([%d]+)")


@@ -84,8 +87,6 @@ local function worker(args)
 
         f:close()
 
 
         f:close()
 

-        -- chosen partition easy stuff
-        -- you can however check whatever partition else

         fs_now.used      = tonumber(fs_info[partition .. " used_p"])  or 0
         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.used      = tonumber(fs_info[partition .. " used_p"])  or 0
         fs_now.available = tonumber(fs_info[partition .. " avail_p"]) or 0
         fs_now.size_mb   = tonumber(fs_info[partition .. " size_mb"]) or 0


@@ -94,25 +95,25 @@ local function worker(args)
         widget = fs.widget
         settings()
 
         widget = fs.widget
         settings()
 

-        if fs_now.used >= 99 and not helpers.get_map("fs")
+        if 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",
         then
             naughty.notify({
                 title = "warning",
                 text = partition .. " ran out!\nmake some room",
                 timeout = 8,
                 fg = "#000000",

-                bg = "#FFFFFF"
+                bg = "#FFFFFF",

             })
             })

-            helpers.set_map("fs", true)
+            helpers.set_map(partition, true)

         else
         else

-            helpers.set_map("fs", false)
+            helpers.set_map(partition, false)

         end
     end
 
         end
     end
 

-    helpers.newtimer(partition, timeout, update)
+    fs.widget:connect_signal('mouse::enter', function () fs:show(0) end)
+    fs.widget:connect_signal('mouse::leave', function () fs:hide() end)

 
 

-    widget:connect_signal('mouse::enter', function () fs:show(0) end)
-    widget:connect_signal('mouse::leave', function () fs:hide() end)
+    helpers.newtimer(partition, timeout, update)

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