Merge pull request #43 from marc-queiroz/master

Including Swap to raw-widget
This commit is contained in:
streetturtle 2018-04-15 14:19:22 -04:00 committed by GitHub
commit 70790737e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions

View File

@ -37,21 +37,21 @@ w:setup {
widget = wibox.widget.piechart
}
local total, used, free, shared, buff_cache, available
local total, used, free, shared, buff_cache, available, total_swap, used_swap, free_swap
local function getPercentage(value)
return math.floor(value / total * 100 + 0.5) .. '%'
return math.floor(value / (total+total_swap) * 100 + 0.5) .. '%'
end
watch('bash -c "free | grep Mem"', 1,
watch('bash -c "free | grep -z Mem.*Swap.*"', 1,
function(widget, stdout, stderr, exitreason, exitcode)
total, used, free, shared, buff_cache, available = stdout:match('(%d+)%s*(%d+)%s*(%d+)%s*(%d+)%s*(%d+)%s*(%d+)')
total, used, free, shared, buff_cache, available, total_swap, used_swap, free_swap = stdout:match('(%d+)%s*(%d+)%s*(%d+)%s*(%d+)%s*(%d+)%s*(%d+)%s*Swap:%s*(%d+)%s*(%d+)%s*(%d+)')
widget.data = { used, total-used }
if w.visible then
w.pie.data_list = {
{'used ' .. getPercentage(used), used},
{'free ' .. getPercentage(free), free},
{'used ' .. getPercentage(used+used_swap), used+used_swap},
{'free ' .. getPercentage(free+free_swap), free+free_swap},
{'buff_cache ' .. getPercentage(buff_cache), buff_cache}
}
end
@ -64,8 +64,8 @@ ramgraph_widget:buttons(
awful.button({}, 1, function()
awful.placement.top_right(w, { margins = {top = 25, right = 10}})
w.pie.data_list = {
{'used ' .. getPercentage(used), used},
{'free ' .. getPercentage(free), free},
{'used ' .. getPercentage(used+used_swap), used+used_swap},
{'free ' .. getPercentage(free+free_swap), free+free_swap},
{'buff_cache ' .. getPercentage(buff_cache), buff_cache}
}
w.pie.display_labels = true