Refactor shell command handling to support v2

Author: wxitcode

adb_client/src/models/adb_server_command.rs

@@ -26,8 +26,7 @@ pub(crate) enum AdbServerCommand {
     Install(u64),
     WaitForDevice(WaitForDeviceState, WaitForDeviceTransport),
     // Local commands
-    ShellCommand(String),
-    Shellv2Command(String),
+    ShellCommand(Vec<String>, String),
     Shell,
     FrameBuffer,
     Sync,
@@ -52,14 +51,14 @@ impl Display for AdbServerCommand {
             AdbServerCommand::TrackDevices => write!(f, "host:track-devices"),
             AdbServerCommand::TransportAny => write!(f, "host:transport-any"),
             AdbServerCommand::TransportSerial(serial) => write!(f, "host:transport:{serial}"),
-            AdbServerCommand::ShellCommand(command) => match std::env::var("TERM") {
-                Ok(term) => write!(f, "shell,TERM={term},raw:{command}"),
-                Err(_) => write!(f, "shell,raw:{command}"),
-            },
-            AdbServerCommand::Shellv2Command(command) => match std::env::var("TERM") {
-                Ok(term) => write!(f, "shell,v2,TERM={term},raw:{command}"),
-                Err(_) => write!(f, "shell,raw:{command}"),
-            },
+            AdbServerCommand::ShellCommand(args, command) => {
+                let args_s = args.join(",");
+                write!(
+                    f,
+                    "shell{}{args_s},raw:{command}",
+                    if args.is_empty() { "" } else { "," }
+                )
+            }
             AdbServerCommand::Shell => match std::env::var("TERM") {
                 Ok(term) => write!(f, "shell,TERM={term},raw:"),
                 Err(_) => write!(f, "shell,raw:"),

adb_client/src/server_device/adb_server_device_commands.rs

@@ -22,14 +22,23 @@ impl ADBDeviceExt for ADBServerDevice {
 
         self.set_serial_transport()?;
 
-        let cmd = command.join(" ");
-        let server_command = if supported_features.contains(&HostFeatures::ShellV2) {
-            AdbServerCommand::Shellv2Command(cmd)
-        } else {
-            AdbServerCommand::ShellCommand(cmd)
-        };
-
-        self.transport.send_adb_request(server_command)?;
+        // Prepare shell command arguments
+        let mut args = Vec::new();
+        let command_string = command.join(" ");
+
+        // Add v2 mode if supported
+        if supported_features.contains(&HostFeatures::ShellV2) {
+            args.push("v2".to_string());
+        }
+
+        // Include terminal information if available
+        if let Ok(term) = std::env::var("TERM") {
+            args.push(format!("TERM={term}"));
+        }
+
+        // Send the request
+        self.transport
+            .send_adb_request(AdbServerCommand::ShellCommand(args, command_string))?;
 
         loop {
             let mut buffer = [0; BUFFER_SIZE];