Updated windows module

Author: smadgulkar

src/executor.rs

@@ -12,15 +12,41 @@ pub struct CommandOutput {
 pub async fn execute_command(command: &str) -> Result<CommandOutput> {
     let shell_type = ShellType::detect();
     let (shell, args) = shell_type.get_shell_command();
-    let formatted_command = shell_type.format_command(command);
+
+    let formatted_command = match shell_type {
+        ShellType::PowerShell => {
+            // Wrap PowerShell commands with proper formatting
+            format!(
+                "$OutputEncoding = [Console]::OutputEncoding = [Text.Encoding]::UTF8; \
+                 $FormatEnumerationLimit = -1; \
+                 $result = {}; \
+                 if ($result -is [System.Array]) {{ \
+                    $result | Format-Table -AutoSize -Wrap | Out-String -Width 120 \
+                 }} elseif ($null -ne $result) {{ \
+                    $result | Format-Table -AutoSize -Wrap | Out-String -Width 120 \
+                 }} else {{ \
+                    \"No output\" \
+                 }}",
+                command
+            )
+        },
+        _ => shell_type.format_command(command)
+    };
 
     let mut cmd = Command::new(shell);
     cmd.args(args).arg(&formatted_command);
 
     let output = cmd.output()?;
 
-    let stdout = String::from_utf8_lossy(&output.stdout).to_string();
-    let stderr = String::from_utf8_lossy(&output.stderr).to_string();
+    let stdout = String::from_utf8_lossy(&output.stdout).into_owned();
+    let stderr = String::from_utf8_lossy(&output.stderr).into_owned();
+
+    // Clean up the output by removing excessive newlines and whitespace
+    let stdout = stdout
+        .lines()
+        .filter(|line| !line.trim().is_empty())
+        .collect::<Vec<_>>()
+        .join("\n");
 
     // Note: PowerShell and CMD might write to stderr even on success
     let success = match shell_type {
@@ -29,8 +55,8 @@ pub async fn execute_command(command: &str) -> Result<CommandOutput> {
     };
 
     Ok(CommandOutput {
-        stdout,
-        stderr,
+        stdout: stdout.trim().to_string(),
+        stderr: stderr.trim().to_string(),
         success
     })
 }

src/shell.rs

@@ -28,7 +28,7 @@ impl ShellType {
     pub fn get_shell_command(&self) -> (&str, &[&str]) {
         match self {
             ShellType::Bash => ("sh", &["-c"]),
-            ShellType::PowerShell => ("powershell", &["-NoProfile", "-Command"]),
+            ShellType::PowerShell => ("powershell", &["-NoProfile", "-NonInteractive", "-Command"]),
             ShellType::Cmd => ("cmd", &["/C"]),
         }
     }
@@ -45,8 +45,8 @@ impl ShellType {
         match self {
             ShellType::Bash => command.to_string(),
             ShellType::PowerShell => {
-                // Escape single quotes and wrap in single quotes for PowerShell
-                format!("'{}'", command.replace('\'', "''"))
+                // PowerShell commands don't need single quote wrapping when using -Command
+                command.to_string()
             },
             ShellType::Cmd => {
                 // Escape special characters for CMD