feat: adb list fixes

Author: J05HM0N5TER

adb_client/src/adb_device_ext.rs

@@ -25,7 +25,7 @@ pub trait ADBDeviceExt {
     fn push(&mut self, stream: &mut dyn Read, path: &dyn AsRef<str>) -> Result<()>;
 
     /// List the items in a directory on the device
-    fn list(&mut self, path: &str) -> Result<Vec<ADBListItem>>;
+    fn list(&mut self, path: &dyn AsRef<str>) -> Result<Vec<ADBListItem>>;
 
     /// Reboot the device using given reboot type
     fn reboot(&mut self, reboot_type: RebootType) -> Result<()>;

adb_client/src/device/adb_message_device_commands.rs

@@ -43,7 +43,7 @@ impl<T: ADBMessageTransport> ADBDeviceExt for ADBMessageDevice<T> {
         self.framebuffer_inner()
     }
 
-    fn list(&mut self, path: &str) -> Result<Vec<crate::ADBListItem>> {
+    fn list(&mut self, path: &dyn AsRef<str>) -> Result<Vec<crate::ADBListItem>> {
         self.list(path)
     }
 }

adb_client/src/device/adb_tcp_device.rs

@@ -114,7 +114,7 @@ impl ADBDeviceExt for ADBTcpDevice {
         self.inner.framebuffer_inner()
     }
 
-    fn list(&mut self, path: &str) -> Result<Vec<crate::ADBListItem>> {
+    fn list(&mut self, path: &dyn AsRef<str>) -> Result<Vec<crate::ADBListItem>> {
         self.inner.list(path)
     }
 }

adb_client/src/device/adb_usb_device.rs

@@ -283,7 +283,7 @@ impl ADBDeviceExt for ADBUSBDevice {
         self.inner.framebuffer_inner()
     }
 
-    fn list(&mut self, path: &str) -> Result<Vec<crate::ADBListItem>> {
+    fn list(&mut self, path: &dyn AsRef<str>) -> Result<Vec<crate::ADBListItem>> {
         self.inner.list(path)
     }
 }

adb_client/src/device/commands/list.rs

@@ -12,7 +12,7 @@ use std::str;
 impl<T: ADBMessageTransport> ADBMessageDevice<T> {
     /// List the entries in the given directory on the device.
     /// note: path uses internal file paths, so Documents is at /storage/emulated/0/Documents
-    pub(crate) fn list(&mut self, path: &str) -> Result<Vec<ADBListItem>> {
+    pub(crate) fn list<A: AsRef<str>>(&mut self, path: A) -> Result<Vec<ADBListItem>> {
         self.begin_synchronization()?;
 
         let output = self.handle_list(path);
@@ -70,22 +70,22 @@ impl<T: ADBMessageTransport> ADBMessageDevice<T> {
         }
     }
 
-    fn handle_list(&mut self, path: &str) -> Result<Vec<ADBListItem>> {
+    fn handle_list<A: AsRef<str>>(&mut self, path: A) -> Result<Vec<ADBListItem>> {
         // TODO: use LIS2 to support files over 2.14 GB in size.
         // SEE: https://github.com/cstyan/adbDocumentation?tab=readme-ov-file#adb-list
         let local_id = self.get_local_id()?;
         let remote_id = self.get_remote_id()?;
         {
             let mut len_buf = Vec::from([0_u8; 4]);
-            LittleEndian::write_u32(&mut len_buf, path.len() as u32);
+            LittleEndian::write_u32(&mut len_buf, path.as_ref().len() as u32);
 
             let subcommand_data = MessageSubcommand::List; //.with_arg(path.len() as u32);
 
             let mut serialized_message =
                 bincode::serialize(&subcommand_data).map_err(|_e| RustADBError::ConversionError)?;
 
             serialized_message.append(&mut len_buf);
-            let mut path_bytes: Vec<u8> = Vec::from(path.as_bytes());
+            let mut path_bytes: Vec<u8> = Vec::from(path.as_ref().as_bytes());
             serialized_message.append(&mut path_bytes);
 
             let message = ADBTransportMessage::new(

adb_client/src/error.rs

@@ -121,7 +121,7 @@ pub enum RustADBError {
     #[error("unknown transport: {0}")]
     UnknownTransport(String),
     /// An unknown file mode was encountered in list
-    #[error("Unknown file type {0}")]
+    #[error("Unknown file mode {0}")]
     UnknownFileMode(u32),
 }
 

adb_client/src/server_device/adb_server_device_commands.rs

@@ -120,7 +120,7 @@ impl ADBDeviceExt for ADBServerDevice {
         self.framebuffer_inner()
     }
 
-    fn list(&mut self, path: &str) -> Result<Vec<crate::ADBListItem>> {
+    fn list(&mut self, path: &dyn AsRef<str>) -> Result<Vec<crate::ADBListItem>> {
         self.list(path)
     }
 }

adb_client/src/server_device/commands/list.rs

@@ -2,7 +2,7 @@ use crate::{
     ADBServerDevice, Result, RustADBError,
     models::{ADBListItem, ADBListItemType, AdbServerCommand, SyncCommand},
 };
-use byteorder::{ByteOrder, LittleEndian};
+use byteorder::{ByteOrder, LittleEndian, ReadBytesExt};
 use std::{
     io::{Read, Write},
     str,
@@ -23,7 +23,7 @@ impl ADBServerDevice {
         self.handle_list_command(path)
     }
 
-    fn handle_list_command<S: AsRef<str>>(&mut self, path: S) -> Result<Vec<ADBListItem>> {
+    fn handle_list_command<A: AsRef<str>>(&mut self, path: A) -> Result<Vec<ADBListItem>> {
         // TODO: use LIS2 to support files over 2.14 GB in size.
         // SEE: https://github.com/cstyan/adbDocumentation?tab=readme-ov-file#adb-list
         let mut len_buf = [0_u8; 4];
@@ -47,21 +47,12 @@ impl ADBServerDevice {
                 .read_exact(&mut response)?;
             match str::from_utf8(response.as_ref())? {
                 "DENT" => {
-                    let mut mode = [0_u8; 4];
-                    let mut size = [0_u8; 4];
-                    let mut time = [0_u8; 4];
-                    let mut name_len = [0_u8; 4];
-
                     let mut connection = self.transport.get_raw_connection()?;
-                    connection.read_exact(&mut mode)?;
-                    connection.read_exact(&mut size)?;
-                    connection.read_exact(&mut time)?;
-                    connection.read_exact(&mut name_len)?;
 
-                    let mode = LittleEndian::read_u32(&mode);
-                    let size = LittleEndian::read_u32(&size);
-                    let time = LittleEndian::read_u32(&time);
-                    let name_len = LittleEndian::read_u32(&name_len);
+                    let mode = connection.read_u32::<LittleEndian>()?;
+                    let size = connection.read_u32::<LittleEndian>()?;
+                    let time = connection.read_u32::<LittleEndian>()?;
+                    let name_len = connection.read_u32::<LittleEndian>()?;
                     let mut name_buf = vec![0_u8; name_len as usize];
                     connection.read_exact(&mut name_buf)?;
                     let name = String::from_utf8(name_buf)?;