Skip to content

panel: include today's bytes in the ALL-TIME display #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
salmun-nister wants to merge 1 commit into
base: main
Choose a base branch
from
Open

panel: include today's bytes in the ALL-TIME display #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,17 @@ function fmtGB(v) {
return (n >= 100 ? n.toFixed(0) : n.toFixed(1)) + " GB"
}

// Lifetime usage for display. The daemon keeps `allTime` as completed days
// only (rolled at local midnight), so today's bytes are added here: otherwise
// ALL-TIME sits unchanged all day and can read below TODAY. Null-safe — a
// missing side counts as 0, both missing stays null.
function lifetimeGB(allTimeGB, todayGB) {
var a = num(allTimeGB)
var t = num(todayGB)
if (a === null && t === null) return null
return (a === null ? 0 : a) + (t === null ? 0 : t)
}

function fmtPct(v, decimals) {
var n = num(v)
return n === null ? "—" : n.toFixed(decimals === undefined ? 1 : decimals) + "%"
Expand Down
3 changes: 2 additions & 1 deletion Panel.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,8 @@ Panel {
Text {
width: (parent.width - 2 * parent.spacing) * 0.40
text: root.hasData && s.usage
? "ALL-TIME ↓ " + Model.fmtGB(s.usage.allTimeDownGB) + " ↑ " + Model.fmtGB(s.usage.allTimeUpGB)
? "ALL-TIME ↓ " + Model.fmtGB(Model.lifetimeGB(s.usage.allTimeDownGB, s.usage.downGB))
+ " ↑ " + Model.fmtGB(Model.lifetimeGB(s.usage.allTimeUpGB, s.usage.upGB))
: ""
textFormat: Text.PlainText
elide: Text.ElideRight
Expand Down