X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/fd2e616097ac4cb072957b3f0b8134ac1970f831..d3b5b5a94d974e678d10a8670886e17a354eede5:/widget/fs.lua

diff --git a/widget/fs.lua b/widget/fs.lua
index fcc6a26..58fbf93 100644
--- a/widget/fs.lua
+++ b/widget/fs.lua
@@ -69,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
@@ -95,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
@@ -121,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