[fs] reformat
This commit is contained in:
streetturtle
parent
2e2ae410de
commit
3a26ea67be
|
|
@ -8,7 +8,7 @@ local storage_bar_widget = {}
|
||||||
|
|
||||||
local function worker(user_args)
|
local function worker(user_args)
|
||||||
local args = user_args or {}
|
local args = user_args or {}
|
||||||
local mounts = args.mounts or {'/'}
|
local mounts = args.mounts or { '/' }
|
||||||
local timeout = args.timeout or 60
|
local timeout = args.timeout or 60
|
||||||
|
|
||||||
storage_bar_widget = wibox.widget {
|
storage_bar_widget = wibox.widget {
|
||||||
|
|
@ -24,9 +24,9 @@ local function worker(user_args)
|
||||||
bar_border_width = 1,
|
bar_border_width = 1,
|
||||||
bar_border_color = beautiful.bg_focus,
|
bar_border_color = beautiful.bg_focus,
|
||||||
color = "linear:150,0:0,0:0,"
|
color = "linear:150,0:0,0:0,"
|
||||||
.. beautiful.fg_normal
|
.. beautiful.fg_normal
|
||||||
.. ":0.3," .. beautiful.bg_urgent .. ":0.6,"
|
.. ":0.3," .. beautiful.bg_urgent .. ":0.6,"
|
||||||
.. beautiful.fg_normal,
|
.. beautiful.fg_normal,
|
||||||
widget = wibox.widget.progressbar,
|
widget = wibox.widget.progressbar,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -36,117 +36,116 @@ local function worker(user_args)
|
||||||
layout = wibox.layout.fixed.vertical,
|
layout = wibox.layout.fixed.vertical,
|
||||||
}
|
}
|
||||||
|
|
||||||
local disk_header = wibox.widget{
|
local disk_header = wibox.widget {
|
||||||
{
|
{
|
||||||
markup = '<b>Mount</b>',
|
markup = '<b>Mount</b>',
|
||||||
forced_width = 150,
|
forced_width = 150,
|
||||||
align = 'left',
|
align = 'left',
|
||||||
widget = wibox.widget.textbox,
|
widget = wibox.widget.textbox,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
markup = '<b>Used</b>',
|
markup = '<b>Used</b>',
|
||||||
align = 'left',
|
align = 'left',
|
||||||
widget = wibox.widget.textbox,
|
widget = wibox.widget.textbox,
|
||||||
},
|
},
|
||||||
layout = wibox.layout.ratio.horizontal
|
layout = wibox.layout.ratio.horizontal
|
||||||
}
|
}
|
||||||
disk_header:ajust_ratio(1, 0, 0.3, 0.7)
|
disk_header:ajust_ratio(1, 0, 0.3, 0.7)
|
||||||
|
|
||||||
local popup = awful.popup{
|
local popup = awful.popup {
|
||||||
ontop = true,
|
ontop = true,
|
||||||
visible = false,
|
visible = false,
|
||||||
shape = gears.shape.rounded_rect,
|
shape = gears.shape.rounded_rect,
|
||||||
border_width = 1,
|
border_width = 1,
|
||||||
border_color = beautiful.bg_normal,
|
border_color = beautiful.bg_normal,
|
||||||
maximum_width = 400,
|
maximum_width = 400,
|
||||||
offset = { y = 5 },
|
offset = { y = 5 },
|
||||||
widget = {}
|
widget = {}
|
||||||
}
|
}
|
||||||
|
|
||||||
storage_bar_widget:buttons(
|
storage_bar_widget:buttons(
|
||||||
awful.util.table.join(
|
awful.util.table.join(
|
||||||
awful.button({}, 1, function()
|
awful.button({}, 1, function()
|
||||||
if popup.visible then
|
if popup.visible then
|
||||||
popup.visible = not popup.visible
|
popup.visible = not popup.visible
|
||||||
else
|
else
|
||||||
popup:move_next_to(mouse.current_widget_geometry)
|
popup:move_next_to(mouse.current_widget_geometry)
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
local disk_widget = wibox.container.margin(storage_bar_widget, 0, 0, 0, 0)
|
local disk_widget = wibox.container.margin(storage_bar_widget, 0, 0, 0, 0)
|
||||||
|
|
||||||
local disks = {}
|
local disks = {}
|
||||||
watch([[bash -c "df | tail -n +2"]], timeout,
|
watch([[bash -c "df | tail -n +2"]], timeout,
|
||||||
function(widget, stdout)
|
function(widget, stdout)
|
||||||
for line in stdout:gmatch("[^\r\n$]+") do
|
for line in stdout:gmatch("[^\r\n$]+") do
|
||||||
local filesystem, size, used, avail, perc, mount =
|
local filesystem, size, used, avail, perc, mount = line:match('([%p%w]+)%s+([%d%w]+)%s+([%d%w]+)%s+([%d%w]+)%s+([%d]+)%%%s+([%p%w]+)')
|
||||||
line:match('([%p%w]+)%s+([%d%w]+)%s+([%d%w]+)%s+([%d%w]+)%s+([%d]+)%%%s+([%p%w]+)')
|
|
||||||
|
|
||||||
disks[mount] = {}
|
disks[mount] = {}
|
||||||
disks[mount].filesystem = filesystem
|
disks[mount].filesystem = filesystem
|
||||||
disks[mount].size = size
|
disks[mount].size = size
|
||||||
disks[mount].used = used
|
disks[mount].used = used
|
||||||
disks[mount].avail = avail
|
disks[mount].avail = avail
|
||||||
disks[mount].perc = perc
|
disks[mount].perc = perc
|
||||||
disks[mount].mount = mount
|
disks[mount].mount = mount
|
||||||
|
|
||||||
if disks[mount].mount == mounts[1] then
|
if disks[mount].mount == mounts[1] then
|
||||||
widget.value = tonumber(disks[mount].perc)
|
widget.value = tonumber(disks[mount].perc)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
for k,v in ipairs(mounts) do
|
for k, v in ipairs(mounts) do
|
||||||
|
|
||||||
local row = wibox.widget{
|
local row = wibox.widget {
|
||||||
{
|
{
|
||||||
text = disks[v].mount,
|
text = disks[v].mount,
|
||||||
forced_width = 150,
|
forced_width = 150,
|
||||||
widget = wibox.widget.textbox
|
widget = wibox.widget.textbox
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
max_value = 100,
|
max_value = 100,
|
||||||
value = tonumber(disks[v].perc),
|
value = tonumber(disks[v].perc),
|
||||||
forced_height = 20,
|
forced_height = 20,
|
||||||
paddings = 1,
|
paddings = 1,
|
||||||
margins = 4,
|
margins = 4,
|
||||||
border_width = 1,
|
border_width = 1,
|
||||||
border_color = beautiful.bg_focus,
|
border_color = beautiful.bg_focus,
|
||||||
background_color = beautiful.bg_normal,
|
background_color = beautiful.bg_normal,
|
||||||
bar_border_width = 1,
|
bar_border_width = 1,
|
||||||
bar_border_color = beautiful.bg_focus,
|
bar_border_color = beautiful.bg_focus,
|
||||||
color = "linear:150,0:0,0:0,"
|
color = "linear:150,0:0,0:0,"
|
||||||
.. beautiful.fg_normal
|
.. beautiful.fg_normal
|
||||||
.. ":0.3," .. beautiful.bg_urgent .. ":0.6,"
|
.. ":0.3," .. beautiful.bg_urgent .. ":0.6,"
|
||||||
.. beautiful.fg_normal,
|
.. beautiful.fg_normal,
|
||||||
widget = wibox.widget.progressbar,
|
widget = wibox.widget.progressbar,
|
||||||
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text = math.floor(disks[v].used/1024/1024)
|
text = math.floor(disks[v].used / 1024 / 1024)
|
||||||
.. '/'
|
.. '/'
|
||||||
.. math.floor(disks[v].size/1024/1024) .. 'GB('
|
.. math.floor(disks[v].size / 1024 / 1024) .. 'GB('
|
||||||
.. math.floor(disks[v].perc) .. '%)',
|
.. math.floor(disks[v].perc) .. '%)',
|
||||||
widget = wibox.widget.textbox
|
widget = wibox.widget.textbox
|
||||||
},
|
},
|
||||||
layout = wibox.layout.ratio.horizontal
|
layout = wibox.layout.ratio.horizontal
|
||||||
}
|
}
|
||||||
row:ajust_ratio(2, 0.3, 0.3, 0.4)
|
row:ajust_ratio(2, 0.3, 0.3, 0.4)
|
||||||
|
|
||||||
disk_rows[k] = row
|
disk_rows[k] = row
|
||||||
end
|
end
|
||||||
popup:setup {
|
popup:setup {
|
||||||
{
|
{
|
||||||
disk_header,
|
disk_header,
|
||||||
disk_rows,
|
disk_rows,
|
||||||
layout = wibox.layout.fixed.vertical,
|
layout = wibox.layout.fixed.vertical,
|
||||||
},
|
},
|
||||||
margins = 8,
|
margins = 8,
|
||||||
widget = wibox.container.margin
|
widget = wibox.container.margin
|
||||||
}
|
}
|
||||||
end,
|
end,
|
||||||
storage_bar_widget
|
storage_bar_widget
|
||||||
)
|
)
|
||||||
|
|
||||||
return disk_widget
|
return disk_widget
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue