Mirror/rayhunter
1
0
Fork 0
mirror of https://github.com/EFForg/rayhunter.git synced 2026-04-26 23:49:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

uz801: cargo fmt run

Browse Source
This commit is contained in:
Andrej
2025-08-02 21:03:28 -04:00
parent 6473c05e3e
commit 7a053a4f89
5 changed files with 67 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/src/main.rs
View File

@@ -243,7 +243,7 @@ async fn run_with_config(
Device::Tmobile => display::tmobile::update_ui,
Device::Wingtech => display::wingtech::update_ui,
Device::Pinephone => display::headless::update_ui,
Device::Uz801 => display::uz801::update_ui
Device::Uz801 => display::uz801::update_ui,
};
update_ui(&task_tracker, &config, ui_shutdown_rx, ui_update_rx);

30
daemon/src/stats.rs
View File

@@ -49,7 +49,7 @@ impl DiskStats {
}
df_cmd.arg(qmdl_path);
let stdout = get_cmd_output(df_cmd).await?;
if matches!(device, Device::Uz801) {
// Handle Uz801 format:
// Filesystem Size Used Free Blksize
@@ -61,10 +61,22 @@ impl DiskStats {
let data_line = lines[1];
let mut parts = data_line.split_whitespace();
Ok(Self {
partition: parts.next().ok_or("error parsing df output: missing filesystem")?.to_string(),
total_size: parts.next().ok_or("error parsing df output: missing size")?.to_string(),
used_size: parts.next().ok_or("error parsing df output: missing used")?.to_string(),
available_size: parts.next().ok_or("error parsing df output: missing free")?.to_string(),
partition: parts
.next()
.ok_or("error parsing df output: missing filesystem")?
.to_string(),
total_size: parts
.next()
.ok_or("error parsing df output: missing size")?
.to_string(),
used_size: parts
.next()
.ok_or("error parsing df output: missing used")?
.to_string(),
available_size: parts
.next()
.ok_or("error parsing df output: missing free")?
.to_string(),
used_percent: "N/A".to_string(), // Uz801 df doesn't provide percentage
mounted_on: qmdl_path.to_string(), // Use the path we queried
})
@@ -116,10 +128,10 @@ impl MemoryStats {
let meminfo_content = tokio::fs::read_to_string("/proc/meminfo")
.await
.map_err(|e| format!("error reading /proc/meminfo: {}", e))?;
let mut mem_total_kb = None;
let mut mem_free_kb = None;
for line in meminfo_content.lines() {
if let Some(value_str) = line.strip_prefix("MemTotal:") {
if let Some(kb_str) = value_str.trim().strip_suffix(" kB") {
@@ -131,11 +143,11 @@ impl MemoryStats {
}
}
}
let total = mem_total_kb.ok_or("error parsing MemTotal from /proc/meminfo")?;
let free = mem_free_kb.ok_or("error parsing MemFree from /proc/meminfo")?;
let used = total - free;
Ok(Self {
total: humanize_kb(total),
used: humanize_kb(used),