Merge pull request #398 from BarbUk/feature/tpbat/configurable-battery-thresholds

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

diff --git a/widget/fs.lua b/widget/fs.lua
index 5e18491390b49bfc300ff13661dd465f54a16060..358d4dd71ded95f8f1102641f530e515efecb70a 100644 (file)
--- a/widget/fs.lua
+++ b/widget/fs.lua
@@ -13,7 +13,7 @@ local focused    = require("awful.screen").focused
 local wibox      = require("wibox")
 local naughty    = require("naughty")
 local math       = math
-local sformat    = string.format
+local string     = string
 local tconcat    = table.concat
 local tonumber   = tonumber
 local query_size = Gio.FILE_ATTRIBUTE_FILESYSTEM_SIZE
@@ -67,33 +67,38 @@ local function factory(args)
     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
             local path = Gio.unix_mount_get_mount_path(mount)
             local root = Gio.File.new_for_path(path)
             local info = root:query_filesystem_info(query)
-            local size = info:get_attribute_uint64(query_size)
-            local used = info:get_attribute_uint64(query_used)
-            local free = info:get_attribute_uint64(query_free)
-
-            if size > 0 then
-                local units = math.floor(math.log(size)/math.log(1024))
-
-                fs_now[path] = {
-                    units      = fs.units[units],
-                    percentage = math.floor(100 * used / size), -- used percentage
-                    size       = size / math.pow(1024, math.floor(units)),
-                    used       = used / math.pow(1024, math.floor(units)),
-                    free       = free / math.pow(1024, math.floor(units))
-                }
 
-                -- don't notify unused file systems
-                if fs_now[path].percentage > 0 then
-                    notifytable[#notifytable+1] = sformat("\n%-10s %-5s %3.2f\t%3.2f\t%s", path,
-                    fs_now[path].percentage .. "%", fs_now[path].free, fs_now[path].size,
-                    fs_now[path].units)
+            if info then
+                local size = info:get_attribute_uint64(query_size)
+                local used = info:get_attribute_uint64(query_used)
+                local free = info:get_attribute_uint64(query_free)
+
+                if size > 0 then
+                    local units = math.floor(math.log(size)/math.log(1024))
+
+                    fs_now[path] = {
+                        units      = fs.units[units],
+                        percentage = math.floor(100 * used / size), -- used percentage
+                        size       = size / math.pow(1024, math.floor(units)),
+                        used       = used / math.pow(1024, math.floor(units)),
+                        free       = free / math.pow(1024, math.floor(units))
+                    }
+
+                    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,
+                        fs_now[path].units)
+
+                        pathlen = math.max(pathlen, #path)
+                    end
                 end
             end
         end
@@ -114,6 +119,13 @@ local function factory(args)
             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