adam/lina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

widget.fs: fixed first column formatting adjustment; closes #423

Browse source
This commit is contained in:
Luca Capezzuto 2019-04-09 18:25:02 +01:00
parent 012c6b6215
commit 0a0a077b86
No known key found for this signature in database
GPG key ID: EDCFE1C5B0CD8FB5
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
widget/fs.lua
View file

@ -71,6 +71,7 @@ local function factory(args)
function fs.update() 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 %-5s %s\t%s\t\n", "path", "used", "free", "size") }
local pathlen = 10 local pathlen = 10
local maxpathidx = 1
fs_now = {} fs_now = {}
for _, mount in ipairs(Gio.unix_mounts_get()) do 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 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, notifytable[#notifytable+1] = string.format("\n%-10s %-3s\t%.2f\t%.2f\t%s", path,
fs_now[path].percentage .. "%", fs_now[path].free, fs_now[path].size, math.floor(fs_now[path].percentage) .. "%", fs_now[path].free, fs_now[path].size,
fs_now[path].units) fs_now[path].units)
pathlen = math.max(pathlen, #path) if #path > pathlen then
pathlen = #path
maxpathidx = #notifytable
end
end end
end end
end end
@ -122,9 +126,12 @@ local function factory(args)
end end
if pathlen > 10 then -- formatting aesthetics if pathlen > 10 then -- formatting aesthetics
local pathspaces
for i = 1, #notifytable do for i = 1, #notifytable do
local pathspaces = notifytable[i]:match("/%w*[/%w*]*%s*") or notifytable[i]:match("path%s*") pathspaces = notifytable[i]:match("[ ]+")
notifytable[i] = notifytable[i]:gsub(pathspaces, pathspaces .. string.rep(" ", pathlen - 10) .. "\t") if i ~= maxpathidx and pathspaces then
notifytable[i] = notifytable[i]:gsub(pathspaces, pathspaces .. string.rep(" ", pathlen - 10))
end
end end
end end

2
wiki

@ -1 +1 @@
Subproject commit d03338fa6ba63bf3beee408c852a55aaebb2f838 Subproject commit e5a195cfc013627f21d242fa5110b3added00eb2