task: proper XML escaping in notification

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

diff --git a/widgets/fs.lua b/widgets/fs.lua
index a01d3cf6c0a174e26784a843a8c6110bb35812b2..5215c8632de1996283b3855a9e1ebb3f7a091911 100644 (file)
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -38,7 +38,7 @@ end
 function fs:show(t_out)
     fs:hide()
 
 function fs:show(t_out)
     fs:hide()
 

-    ws = helpers.read_pipe(helpers.scripts_dir .. "dfs"):gsub("\n*$", "")
+    local ws = helpers.read_pipe(helpers.scripts_dir .. "dfs"):gsub("\n*$", "")

 
     if fs.followmouse then
         fs.notification_preset.screen = mouse.screen
 
     if fs.followmouse then
         fs.notification_preset.screen = mouse.screen


@@ -58,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


@@ -92,10 +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
 

+        notification_preset = fs.notification_preset

         widget = fs.widget
         settings()
 
         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",


@@ -110,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)