Code formatting

This commit is contained in:
quadbyte 2025-08-10 13:26:46 -04:00
parent c62e199ea7
commit 1d13bbe0f7
11 changed files with 161 additions and 85 deletions

View file

@ -17,4 +17,3 @@ Rectangle {
border.width: Math.min(1, Style.borderThin * scaling)
clip: true
}

View file

@ -15,4 +15,3 @@ Rectangle {
border.color: Colors.backgroundTertiary
border.width: Math.min(1, Style.borderThin * scaling)
}

View file

@ -6,7 +6,7 @@ Rectangle {
id: root
readonly property real scaling: Scaling.scale(screen)
property real value: 0 // 0..100 (or any range visually mapped)
property real value: 0 // 0..100 (or any range visually mapped)
property string icon: ""
property string suffix: "%"
@ -109,4 +109,3 @@ Rectangle {
}
}
}

View file

@ -21,39 +21,29 @@ Item {
Process {
id: reader
running: true
command: [
"sh", "-c",
// Outputs: {"cpu":<int>,"memper":<int>,"cputemp":<int>}
"interval=" + intervalSeconds + "; " +
"while true; do " +
// First /proc/stat snapshot
"read _ u1 n1 s1 id1 iw1 ir1 si1 st1 gs1 < /proc/stat; " +
"t1=$((u1+n1+s1+id1+iw1+ir1+si1+st1)); i1=$((id1+iw1)); " +
"sleep $interval; " +
// Second /proc/stat snapshot
"read _ u2 n2 s2 id2 iw2 ir2 si2 st2 gs2 < /proc/stat; " +
"t2=$((u2+n2+s2+id2+iw2+ir2+si2+st2)); i2=$((id2+iw2)); " +
"dt=$((t2 - t1)); di=$((i2 - i1)); " +
"cpu=$(( (100*(dt - di)) / (dt>0?dt:1) )); " +
// Memory percent via /proc/meminfo (kB)
"mt=$(awk '/MemTotal/ {print $2}' /proc/meminfo); " +
"ma=$(awk '/MemAvailable/ {print $2}' /proc/meminfo); " +
"mm=$((mt - ma)); mp=$(( (100*mm) / (mt>0?mt:1) )); " +
// Temperature: scan hwmon and thermal zones, choose max; convert m°C °C
"ct=0; " +
"for f in /sys/class/hwmon/hwmon*/temp*_input /sys/class/thermal/thermal_zone*/temp; do " +
"[ -r \"$f\" ] || continue; v=$(cat \"$f\" 2>/dev/null); " +
"[ -z \"$v\" ] && continue; " +
"if [ \"$v\" -gt 1000 ] 2>/dev/null; then v=$((v/1000)); fi; " +
"[ \"$v\" -gt \"$ct\" ] 2>/dev/null && ct=$v; " +
"done; " +
// Disk usage percent for root filesystem
"dp=$(df -P / 2>/dev/null | awk 'NR==2{gsub(/%/,\"\",$5); print $5}'); " +
"[ -z \"$dp\" ] && dp=0; " +
// Emit JSON line
"echo \"{\\\"cpu\\\":$cpu,\\\"memper\\\":$mp,\\\"cputemp\\\":$ct,\\\"diskper\\\":$dp}\"; " +
"done"
]
command: ["sh", "-c", // Outputs: {"cpu":<int>,"memper":<int>,"cputemp":<int>}
"interval=" + intervalSeconds + "; " + "while true; do " + // First /proc/stat snapshot
"read _ u1 n1 s1 id1 iw1 ir1 si1 st1 gs1 < /proc/stat; "
+ "t1=$((u1+n1+s1+id1+iw1+ir1+si1+st1)); i1=$((id1+iw1)); "
+ "sleep $interval; " + // Second /proc/stat snapshot
"read _ u2 n2 s2 id2 iw2 ir2 si2 st2 gs2 < /proc/stat; "
+ "t2=$((u2+n2+s2+id2+iw2+ir2+si2+st2)); i2=$((id2+iw2)); "
+ "dt=$((t2 - t1)); di=$((i2 - i1)); " + "cpu=$(( (100*(dt - di)) / (dt>0?dt:1) )); "
+ // Memory percent via /proc/meminfo (kB)
"mt=$(awk '/MemTotal/ {print $2}' /proc/meminfo); "
+ "ma=$(awk '/MemAvailable/ {print $2}' /proc/meminfo); "
+ "mm=$((mt - ma)); mp=$(( (100*mm) / (mt>0?mt:1) )); "
+ // Temperature: scan hwmon and thermal zones, choose max; convert m°C °C
"ct=0; "
+ "for f in /sys/class/hwmon/hwmon*/temp*_input /sys/class/thermal/thermal_zone*/temp; do "
+ "[ -r \"$f\" ] || continue; v=$(cat \"$f\" 2>/dev/null); " + "[ -z \"$v\" ] && continue; "
+ "if [ \"$v\" -gt 1000 ] 2>/dev/null; then v=$((v/1000)); fi; "
+ "[ \"$v\" -gt \"$ct\" ] 2>/dev/null && ct=$v; " + "done; "
+ // Disk usage percent for root filesystem
"dp=$(df -P / 2>/dev/null | awk 'NR==2{gsub(/%/,\"\",$5); print $5}'); "
+ "[ -z \"$dp\" ] && dp=0; " + // Emit JSON line
"echo \"{\\\"cpu\\\":$cpu,\\\"memper\\\":$mp,\\\"cputemp\\\":$ct,\\\"diskper\\\":$dp}\"; "
+ "done"]
stdout: SplitParser {
onRead: function (line) {
@ -64,10 +54,10 @@ Item {
root.memoryUsagePer = +data.memper
root.diskUsage = +data.diskper
} catch (e) {
// ignore malformed lines
}
}
}
}
}