uz801: cargo fmt run

daemon/src/main.rs

@@ -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);
 

daemon/src/stats.rs

@@ -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(),
+                partition: parts
-                total_size: parts.next().ok_or("error parsing df output: missing size")?.to_string(),
+                    .next()
-                used_size: parts.next().ok_or("error parsing df output: missing used")?.to_string(),
+                    .ok_or("error parsing df output: missing filesystem")?
-                available_size: parts.next().ok_or("error parsing df output: missing free")?.to_string(),
+                    .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
             })

installer/src/main.rs

@@ -6,8 +6,8 @@ mod orbic;
 mod pinephone;
 mod tmobile;
 mod tplink;
-mod uz801;
 mod util;
+mod uz801;
 mod wingtech;
 
 pub static CONFIG_TOML: &str = include_str!("../../dist/config.toml.in");

installer/src/uz801.rs

@@ -7,10 +7,10 @@
 /// 4. Modify startup script to launch rayhunter on boot
 use std::time::Duration;
 
-use anyhow::Result;
-use tokio::time::sleep;
 use adb_client::{ADBDeviceExt, ADBUSBDevice, RustADBError};
+use anyhow::Result;
 use std::io::ErrorKind;
+use tokio::time::sleep;
 
 use crate::Uz801Args as Args;
 use crate::util::echo;
@@ -77,7 +77,8 @@ async fn wait_for_adb() -> Result<ADBUSBDevice> {
             anyhow::bail!("Timeout waiting for ADB connection after USB debug activation");
         }
 
-        match ADBUSBDevice::new(0x05c6, 0x9025) { // Common Qualcomm ADB VID/PID
+        match ADBUSBDevice::new(0x05c6, 0x9025) {
+            // Common Qualcomm ADB VID/PID
             Ok(mut device) => {
                 // Test ADB connection
                 if test_adb_connection(&mut device).await.is_ok() {
@@ -119,14 +120,16 @@ async fn install_rayhunter_files(adb_device: &mut ADBUSBDevice) -> Result<()> {
     adb_device.push(&mut daemon_data, &"/data/rayhunter/rayhunter-daemon")?;
 
     // Install config file
-    let config_content = crate::CONFIG_TOML
+    let config_content = crate::CONFIG_TOML.replace("#device = \"orbic\"", "device = \"uz801\"");
-        .replace("#device = \"orbic\"", "device = \"uz801\"");
     let mut config_data = config_content.as_bytes();
     adb_device.push(&mut config_data, &"/data/rayhunter/config.toml")?;
 
     // Make daemon executable
     let mut buf = Vec::<u8>::new();
-    adb_device.shell_command(&["chmod", "755", "/data/rayhunter/rayhunter-daemon"], &mut buf)?;
+    adb_device.shell_command(
+        &["chmod", "755", "/data/rayhunter/rayhunter-daemon"],
+        &mut buf,
+    )?;
 
     Ok(())
 }
@@ -151,18 +154,24 @@ async fn modify_startup_script(adb_device: &mut ADBUSBDevice) -> Result<()> {
 
     // Make sure it's executable
     let mut buf = Vec::<u8>::new();
-    adb_device.shell_command(&["chmod", "755", "/system/bin/initmifiservice.sh"], &mut buf)?;
+    adb_device.shell_command(
+        &["chmod", "755", "/system/bin/initmifiservice.sh"],
+        &mut buf,
+    )?;
 
     Ok(())
 }
 
 async fn start_rayhunter(adb_device: &mut ADBUSBDevice) -> Result<()> {
     let mut buf = Vec::<u8>::new();
-    adb_device.shell_command(&[
+    adb_device.shell_command(
-        "/data/rayhunter/rayhunter-daemon", 
+        &[
-        "/data/rayhunter/config.toml", 
+            "/data/rayhunter/rayhunter-daemon",
-        "&"
+            "/data/rayhunter/config.toml",
-    ], &mut buf)?;
+            "&",
+        ],
+        &mut buf,
+    )?;
 
     // Give it a moment to start
     sleep(Duration::from_secs(3)).await;

lib/src/lib.rs

@@ -25,5 +25,5 @@ pub enum Device {
     Tmobile,
     Wingtech,
     Pinephone,
-    Uz801
+    Uz801,
 }