#424: assert that timeout seconds in every naughty notification are numbers

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

diff --git a/widget/fs.lua b/widget/fs.lua
index e680a3c42a94065722708d7a5167cb6a8d4f4bf2..fcc6a26a733132d0be9ef6b119862a1a50f5fc93 100644 (file)
--- a/widget/fs.lua
+++ b/widget/fs.lua
@@ -13,8 +13,9 @@ local focused    = require("awful.screen").focused
 local wibox      = require("wibox")
 local naughty    = require("naughty")
 local math       = math
 local wibox      = require("wibox")
 local naughty    = require("naughty")
 local math       = math

-local sformat    = string.format
+local string     = string

 local tconcat    = table.concat
 local tconcat    = table.concat

+local type       = type

 local tonumber   = tonumber
 local query_size = Gio.FILE_ATTRIBUTE_FILESYSTEM_SIZE
 local query_free = Gio.FILE_ATTRIBUTE_FILESYSTEM_FREE
 local tonumber   = tonumber
 local query_size = Gio.FILE_ATTRIBUTE_FILESYSTEM_SIZE
 local query_free = Gio.FILE_ATTRIBUTE_FILESYSTEM_FREE


@@ -45,13 +46,14 @@ local function factory(args)
         fs.notification_preset.screen = fs.followtag and focused() or scr or 1
         fs.notification = naughty.notify {
             preset  = fs.notification_preset,
         fs.notification_preset.screen = fs.followtag and focused() or scr or 1
         fs.notification = naughty.notify {
             preset  = fs.notification_preset,

-            timeout = seconds or 5
+            timeout = type(seconds) == "number" and seconds or 5

         }
     end
 
     local args      = args or {}
     local timeout   = args.timeout or 600
     local partition = args.partition
         }
     end
 
     local args      = args or {}
     local timeout   = args.timeout or 600
     local partition = args.partition

+    local threshold = args.threshold or 99

     local showpopup = args.showpopup or "on"
     local settings  = args.settings or function() end
 
     local showpopup = args.showpopup or "on"
     local settings  = args.settings or function() end
 


@@ -67,7 +69,8 @@ local function factory(args)
     end
 
     function fs.update()
     end
 
     function fs.update()

-        local notifytable = { [1] = sformat("%-10s %-5s %s\t%s\t\n", "fs", "used", "free", "size") }
+        local notifytable = { [1] = string.format("%-10s %-5s %s\t%s\t\n", "path", "used", "free", "size") }
+        local pathlen = 10

         fs_now = {}
 
         for _, mount in ipairs(Gio.unix_mounts_get()) do
         fs_now = {}
 
         for _, mount in ipairs(Gio.unix_mounts_get()) do


@@ -92,9 +95,11 @@ local function factory(args)
                     }
 
                     if fs_now[path].percentage > 0 then -- don't notify unused file systems
                     }
 
                     if fs_now[path].percentage > 0 then -- don't notify unused file systems

-                        notifytable[#notifytable+1] = sformat("\n%-10s %-5s %3.2f\t%3.2f\t%s", path,
+                        notifytable[#notifytable+1] = string.format("\n%-10s %-5s %.2f\t%.2f\t%s", path,

                         fs_now[path].percentage .. "%", fs_now[path].free, fs_now[path].size,
                         fs_now[path].units)
                         fs_now[path].percentage .. "%", fs_now[path].free, fs_now[path].size,
                         fs_now[path].units)

+
+                        pathlen = math.max(pathlen, #path)

                     end
                 end
             end
                     end
                 end
             end


@@ -103,12 +108,12 @@ local function factory(args)
         widget = fs.widget
         settings()
 
         widget = fs.widget
         settings()
 

-        if partition and fs_now[partition] and fs_now[partition].used >= 99 then
+        if partition and fs_now[partition] and fs_now[partition].percentage >= threshold then

             if not helpers.get_map(partition) then
                 naughty.notify {
                     preset = naughty.config.presets.critical,
                     title  = "Warning",
             if not helpers.get_map(partition) then
                 naughty.notify {
                     preset = naughty.config.presets.critical,
                     title  = "Warning",

-                    text   = partition .. " is full",
+                    text   = string.format("%s is above %d%% (%d%%)", partition, threshold, fs_now[partition].percentage)

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


@@ -116,6 +121,13 @@ local function factory(args)
             end
         end
 
             end
         end
 

+        if pathlen > 10 then -- formatting aesthetics
+            for i = 1, #notifytable do
+                local pathspaces = notifytable[i]:match("/%w*[/%w*]*%s*") or notifytable[i]:match("path%s*")
+                notifytable[i] = notifytable[i]:gsub(pathspaces, pathspaces .. string.rep(" ", pathlen - 10) .. "\t")
+            end
+        end
+

         fs.notification_preset.text = tconcat(notifytable)
     end
 
         fs.notification_preset.text = tconcat(notifytable)
     end