release-app fix build

mediar-ai · Feb 20, 2025 · ed6b682 · ed6b682
1 parent f457fb1
commit ed6b682
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 38 deletions.
diff --git a/screenpipe-app-tauri/src-tauri/Cargo.toml b/screenpipe-app-tauri/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "screenpipe-app"
-version = "0.35.10"
+version = "0.35.11"
 description = ""
 authors = ["you"]
 license = ""

diff --git a/screenpipe-app-tauri/src-tauri/src/sidecar.rs b/screenpipe-app-tauri/src-tauri/src/sidecar.rs
@@ -93,43 +93,47 @@ pub async fn stop_screenpipe(
         }
     }
 
-    // Hard kill the sidecar
-    let kill_result = async {
-        #[cfg(not(target_os = "windows"))]
-        {
-            tokio::process::Command::new("pkill")
-                .arg("-f")
-                .arg("screenpipe")
-                .output()
-                .await
-        }
-        #[cfg(target_os = "windows")]
+    #[cfg(not(target_os = "windows"))]
+    {
+        match tokio::process::Command::new("pkill")
+            .arg("-f")
+            .arg("screenpipe")
+            .output()
+            .await
         {
-            const CREATE_NO_WINDOW: u32 = 0x08000000;
-            tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
-            let _ = tokio::process::Command::new("powershell")
-                .arg("-NoProfile")
-                .arg("-WindowStyle")
-                .arg("hidden")
-                .arg("-Command")
-                .arg(format!(
-                    r#"taskkill.exe /F /T /IM screenpipe.exe"#,
-                ))
-                .creation_flags(CREATE_NO_WINDOW)
-                .output()
-                .await;
+            Ok(_) => {
+                debug!("Successfully killed screenpipe processes");
+                Ok(())
+            }
+            Err(e) => {
+                error!("Failed to kill screenpipe processes: {}", e);
+                Err(format!("Failed to kill screenpipe processes: {}", e))
+            }
         }
     }
-    .await;
 
-    match kill_result {
-        Ok(_) => {
-            debug!("Successfully killed screenpipe processes");
-            Ok(())
-        }
-        Err(e) => {
-            error!("Failed to kill screenpipe processes: {}", e);
-            Err(format!("Failed to kill screenpipe processes: {}", e))
+    #[cfg(target_os = "windows")]
+    {
+        const CREATE_NO_WINDOW: u32 = 0x08000000;
+        tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
+        match tokio::process::Command::new("powershell")
+            .arg("-NoProfile")
+            .arg("-WindowStyle")
+            .arg("hidden")
+            .arg("-Command")
+            .arg(r#"taskkill.exe /F /T /IM screenpipe.exe"#)
+            .creation_flags(CREATE_NO_WINDOW)
+            .output()
+            .await
+        {
+            Ok(_) => {
+                debug!("Successfully killed screenpipe processes");
+                Ok(())
+            }
+            Err(e) => {
+                error!("Failed to kill screenpipe processes: {}", e);
+                Err(format!("Failed to kill screenpipe processes: {}", e))
+            }
         }
     }
 }
@@ -512,16 +516,13 @@ impl SidecarManager {
         }
     }
 
-
-
     pub async fn spawn(&mut self, app: &tauri::AppHandle) -> Result<(), String> {
         // Update settings from store
         self.update_settings(app).await?;
 
         // Spawn the sidecar
         let child = spawn_sidecar(app)?;
         self.child = Some(child);
-
 
         Ok(())
     }
@@ -540,5 +541,4 @@ impl SidecarManager {
 
         Ok(())
     }
-
 }