Mirror/rayhunter
1
0
Fork 0
mirror of https://github.com/EFForg/rayhunter.git synced 2026-06-10 14:53:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

uz801: Use busybox coreutils (they were hiding all along)

Browse Source
This commit is contained in:
Andrej
2025-08-03 10:41:33 -04:00
parent 38a408757a
commit f57fc611c2
1 changed files with 34 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/src/stats.rs
+34 -89
View File
@@ -40,58 +40,30 @@ pub struct DiskStats {
impl DiskStats {
// runs "df -h <qmdl_path>" to get storage statistics for the partition containing
// the QMDL file. The Uz801 device doesn't support the -h flag, so we skip it for that device.
// the QMDL file.
pub async fn new(qmdl_path: &str, device: &Device) -> Result<Self, String> {
let mut df_cmd = Command::new("df");
// Only add -h flag for devices other than Uz801, as Uz801's df doesn't support it
if !matches!(device, Device::Uz801) {
df_cmd.arg("-h");
// Uz801 needs to be told to use the busybox df specifically
let mut df_cmd: Command;
if matches!(device, Device::Uz801) {
df_cmd = Command::new("busybox");
df_cmd.arg("df");
} else {
df_cmd = Command::new("df");
}
df_cmd.arg("-h");
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
// /data/rayhunter/ 774.9M 68.0M 706.9M 4096
let lines: Vec<&str> = stdout.lines().collect();
if lines.len() < 2 {
return Err("error parsing df output: insufficient lines".to_string());
}
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(),
used_percent: "N/A".to_string(), // Uz801 df doesn't provide percentage
mounted_on: qmdl_path.to_string(), // Use the path we queried
})
} else {
// Handle standard df -h format
let mut parts = stdout.split_whitespace().skip(7);
Ok(Self {
partition: parts.next().ok_or("error parsing df output")?.to_string(),
total_size: parts.next().ok_or("error parsing df output")?.to_string(),
used_size: parts.next().ok_or("error parsing df output")?.to_string(),
available_size: parts.next().ok_or("error parsing df output")?.to_string(),
used_percent: parts.next().ok_or("error parsing df output")?.to_string(),
mounted_on: parts.next().ok_or("error parsing df output")?.to_string(),
})
}
// Handle standard df -h format
let mut parts = stdout.split_whitespace().skip(7);
Ok(Self {
partition: parts.next().ok_or("error parsing df output")?.to_string(),
total_size: parts.next().ok_or("error parsing df output")?.to_string(),
used_size: parts.next().ok_or("error parsing df output")?.to_string(),
available_size: parts.next().ok_or("error parsing df output")?.to_string(),
used_percent: parts.next().ok_or("error parsing df output")?.to_string(),
mounted_on: parts.next().ok_or("error parsing df output")?.to_string(),
})
}
}
@@ -121,52 +93,25 @@ async fn get_cmd_output(mut cmd: Command) -> Result<String, String> {
impl MemoryStats {
// runs "free -k" and parses the output to retrieve memory stats for most devices,
// or reads /proc/meminfo for Uz801 which doesn't have the free command
pub async fn new(device: &Device) -> Result<Self, String> {
// Use busybox for Uz801
let mut free_cmd: Command;
if matches!(device, Device::Uz801) {
// Read /proc/meminfo for Uz801
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") {
mem_total_kb = kb_str.trim().parse::<usize>().ok();
}
} else if let Some(value_str) = line.strip_prefix("MemFree:") {
if let Some(kb_str) = value_str.trim().strip_suffix(" kB") {
mem_free_kb = kb_str.trim().parse::<usize>().ok();
}
}
}
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),
free: humanize_kb(free),
})
free_cmd = Command::new("busybox");
free_cmd.arg("free");
} else {
// Use free command for other devices
let mut free_cmd = Command::new("free");
free_cmd.arg("-k");
let stdout = get_cmd_output(free_cmd).await?;
let mut numbers = stdout
.split_whitespace()
.flat_map(|part| part.parse::<usize>());
Ok(Self {
total: humanize_kb(numbers.next().ok_or("error parsing free output")?),
used: humanize_kb(numbers.next().ok_or("error parsing free output")?),
free: humanize_kb(numbers.next().ok_or("error parsing free output")?),
})
free_cmd = Command::new("free");
}
free_cmd.arg("-k");
let stdout = get_cmd_output(free_cmd).await?;
let mut numbers = stdout
.split_whitespace()
.flat_map(|part| part.parse::<usize>());
Ok(Self {
total: humanize_kb(numbers.next().ok_or("error parsing free output")?),
used: humanize_kb(numbers.next().ok_or("error parsing free output")?),
free: humanize_kb(numbers.next().ok_or("error parsing free output")?),
})
}
}