X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/a34e72b42bfa681afba744a190d8bb3e26252310..e8a34ec0e718448d367e677fdd88eda8c3ceaefc:/widget/fs.lua?ds=sidebyside

diff --git a/widget/fs.lua b/widget/fs.lua
index 358d4dd..58fbf93 100644
--- a/widget/fs.lua
+++ b/widget/fs.lua
@@ -15,6 +15,7 @@ local naughty    = require("naughty")
 local math       = math
 local string     = string
 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
@@ -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,
-            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
+    local threshold = args.threshold or 99
     local showpopup = args.showpopup or "on"
     local settings  = args.settings or function() end
 
@@ -67,8 +69,9 @@ local function factory(args)
     end
 
     function fs.update()
-        local notifytable = { [1] = string.format("%-10s %-5s %s\t%s\t\n", "path", "used", "free", "size") }
+        local notifytable = { [1] = string.format("%-10s %4s\t%6s\t%6s\t\n", "path", "used", "free", "size") }
         local pathlen = 10
+        local maxpathidx = 1
         fs_now = {}
 
         for _, mount in ipairs(Gio.unix_mounts_get()) do
@@ -93,11 +96,14 @@ local function factory(args)
                     }
 
                     if fs_now[path].percentage > 0 then -- don't notify unused file systems
-                        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,
+                        notifytable[#notifytable+1] = string.format("\n%-10s %3s%%\t%6.2f\t%6.2f\t%s", path,
+                        math.floor(fs_now[path].percentage), fs_now[path].free, fs_now[path].size,
                         fs_now[path].units)
 
-                        pathlen = math.max(pathlen, #path)
+                        if #path > pathlen then
+                            pathlen = #path
+                            maxpathidx = #notifytable
+                        end
                     end
                 end
             end
@@ -106,12 +112,12 @@ local function factory(args)
         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",
-                    text   = partition .. " is full",
+                    text   = string.format("%s is above %d%% (%d%%)", partition, threshold, fs_now[partition].percentage)
                 }
                 helpers.set_map(partition, true)
             else
@@ -119,10 +125,13 @@ local function factory(args)
             end
         end
 
-        if pathlen > 10 then -- formatting aesthetics
+        if pathlen > 10 then -- if are there paths longer than 10 chars, reformat first column accordingly
+            local pathspaces
             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")
+                pathspaces = notifytable[i]:match("[ ]+")
+                if i ~= maxpathidx and pathspaces then
+                    notifytable[i] = notifytable[i]:gsub(pathspaces, pathspaces .. string.rep(" ", pathlen - 10))
+                end
             end
         end