net: ip: revert to default path; wiki updated; #102

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

diff --git a/widgets/fs.lua b/widgets/fs.lua
index 8b2886b23fe1cc3688cfdc32832e6452929150ae..5215c8632de1996283b3855a9e1ebb3f7a091911 100644 (file)
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -26,8 +26,7 @@ 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
+local fs_notification  = nil

 
 function fs:hide()
     if fs_notification ~= nil then
 
 function fs:hide()
     if fs_notification ~= nil then


@@ -42,11 +41,11 @@ function fs:show(t_out)
     local ws = helpers.read_pipe(helpers.scripts_dir .. "dfs"):gsub("\n*$", "")
 
     if fs.followmouse then
     local ws = helpers.read_pipe(helpers.scripts_dir .. "dfs"):gsub("\n*$", "")
 
     if fs.followmouse then

-        fs_notification_preset.screen = mouse.screen
+        fs.notification_preset.screen = mouse.screen

     end
 
     fs_notification = naughty.notify({
     end
 
     fs_notification = naughty.notify({

-        preset  = fs_notification_preset,
+        preset  = fs.notification_preset,

         text    = ws,
         timeout = t_out
     })
         text    = ws,
         timeout = t_out
     })


@@ -59,6 +58,8 @@ local function worker(args)
     local args             = args or {}
     local timeout          = args.timeout or 600
     local partition        = args.partition or "/"
     local args             = args or {}
     local timeout          = args.timeout or 600
     local partition        = args.partition or "/"

+    local showpopup        = args.showpopup or "on"
+    local notify           = args.notify or "on"

     local settings         = args.settings or function() end
 
     fs.followmouse         = args.followmouse or false
     local settings         = args.settings or function() end
 
     fs.followmouse         = args.followmouse or false


@@ -67,7 +68,6 @@ local function worker(args)
     fs.widget = wibox.widget.textbox('')
 
     helpers.set_map(partition, false)
     fs.widget = wibox.widget.textbox('')
 
     helpers.set_map(partition, false)

-    helpers.set_map("fsused", 0)

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


@@ -94,13 +94,11 @@ local function worker(args)
         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.size_mb   = tonumber(fs_info[partition .. " size_mb"]) or 0
         fs_now.size_gb   = tonumber(fs_info[partition .. " size_gb"]) or 0
 

-        if helpers.get_map("fsused") ~= fs_now.used then
-            widget = fs.widget
-            settings()
-            helpers.set_map("fsused", fs_now.used)
-        end
+        notification_preset = fs.notification_preset
+        widget = fs.widget
+        settings()

 
 

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

         then
             naughty.notify({
                 title = "warning",
         then
             naughty.notify({
                 title = "warning",


@@ -115,8 +113,10 @@ local function worker(args)
         end
     end
 
         end
     end
 

-    fs.widget:connect_signal('mouse::enter', function () fs:show(0) end)
-    fs.widget:connect_signal('mouse::leave', function () fs:hide() end)
+    if showpopup == "on" then
+        fs.widget:connect_signal('mouse::enter', function () fs:show(0) end)
+        fs.widget:connect_signal('mouse::leave', function () fs:hide() end)
+    end

 
     helpers.newtimer(partition, timeout, update)
 
 
     helpers.newtimer(partition, timeout, update)