build: switch win x64 build to windows-latest

.github/workflows/release.yml

@@ -69,7 +69,7 @@ jobs:
             target: "aarch64-unknown-linux-gnu"
             pkg_target: "latest-linux-arm64"
             nodecar_script: "build:linux-arm64"
-          - platform: "windows-11"
+          - platform: "windows-latest"
             args: "--target x86_64-pc-windows-msvc"
             arch: "x86_64"
             target: "x86_64-pc-windows-msvc"

.github/workflows/rolling-release.yml

@@ -68,7 +68,7 @@ jobs:
             target: "aarch64-unknown-linux-gnu"
             pkg_target: "latest-linux-arm64"
             nodecar_script: "build:linux-arm64"
-          - platform: "windows-11"
+          - platform: "windows-latest"
             args: "--target x86_64-pc-windows-msvc"
             arch: "x86_64"
             target: "x86_64-pc-windows-msvc"
@@ -138,7 +138,11 @@ jobs:
 
       - name: Get commit hash
         id: commit
-        run: echo "hash=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+        shell: bash
+        run: |
+          COMMIT_HASH=$(echo "${GITHUB_SHA}" | cut -c1-7)
+          echo "hash=${COMMIT_HASH}" >> $GITHUB_OUTPUT
+          echo "Generated commit hash: ${COMMIT_HASH}"
 
       - name: Build Tauri app
         uses: tauri-apps/tauri-action@v0

src-tauri/src/browser_runner.rs

@@ -642,12 +642,12 @@ mod windows {
   ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     // On Windows, TOR and Mullvad browsers can sometimes accept URLs via command line
     // even with -no-remote, by launching a new instance that hands off to existing one
-    let browser = create_browser(browser_type);
+    let browser = create_browser(browser_type.clone());
     let executable_path = browser
       .get_executable_path(browser_dir)
       .map_err(|e| format!("Failed to get executable path: {}", e))?;
 
-    let mut cmd = Command::new(executable_path);
+    let mut cmd = Command::new(&executable_path);
     cmd.args(["-profile", &profile.profile_path, url]);
 
     // Set working directory
@@ -685,7 +685,7 @@ mod windows {
       .get_executable_path(browser_dir)
       .map_err(|e| format!("Failed to get executable path: {}", e))?;
 
-    let mut cmd = Command::new(executable_path);
+    let mut cmd = Command::new(&executable_path);
     cmd.args([
       &format!("--user-data-dir={}", profile.profile_path),
       "--new-window",
@@ -704,7 +704,7 @@ mod windows {
 
     if !output.status.success() {
       // Try fallback without --new-window
-      let mut fallback_cmd = Command::new(executable_path);
+      let mut fallback_cmd = Command::new(&executable_path);
       fallback_cmd.args([&format!("--user-data-dir={}", profile.profile_path), url]);
 
       if let Some(parent_dir) = browser_dir

src-tauri/src/default_browser.rs

@@ -70,7 +70,6 @@ mod windows {
   use winreg::RegKey;
 
   const APP_NAME: &str = "DonutBrowser";
-  const APP_EXECUTABLE: &str = "DonutBrowser.exe";
   const PROG_ID: &str = "DonutBrowser.HTML";
 
   pub fn is_default_browser() -> Result<bool, String> {
@@ -279,7 +278,7 @@ mod windows {
     Ok(())
   }
 
-  fn register_html_file_association(exe_path: &str) -> Result<(), String> {
+  fn register_html_file_association(_exe_path: &str) -> Result<(), String> {
     let hkcu = RegKey::predef(HKEY_CURRENT_USER);
 
     // Register .html and .htm file associations

src-tauri/src/extraction.rs

@@ -1018,78 +1018,86 @@ impl Extractor {
   }
 
   #[cfg(target_os = "windows")]
-  async fn find_windows_executable_recursive(
-    &self,
-    dir: &Path,
+  fn find_windows_executable_recursive<'a>(
+    &'a self,
+    dir: &'a Path,
     depth: usize,
     max_depth: usize,
-  ) -> Result<PathBuf, Box<dyn std::error::Error + Send + Sync>> {
-    if depth > max_depth {
-      return Err("Maximum search depth reached".into());
-    }
-
-    if let Ok(entries) = fs::read_dir(dir) {
-      let mut dirs_to_search = Vec::new();
-
-      // First pass: look for .exe files in current directory
-      for entry in entries.flatten() {
-        let path = entry.path();
-
-        if path.is_file()
-          && path
-            .extension()
-            .is_some_and(|ext| ext.to_string_lossy().to_lowercase() == "exe")
-        {
-          let file_name = path
-            .file_name()
-            .and_then(|n| n.to_str())
-            .unwrap_or("")
-            .to_lowercase();
-
-          // Check if it's a browser executable
-          if file_name.contains("firefox")
-            || file_name.contains("chrome")
-            || file_name.contains("chromium")
-            || file_name.contains("zen")
-            || file_name.contains("brave")
-            || file_name.contains("tor")
-            || file_name.contains("mullvad")
-            || file_name.contains("browser")
-          {
-            return Ok(path);
-          }
-        } else if path.is_dir() {
-          // Collect directories for later search
-          dirs_to_search.push(path);
-        }
+  ) -> std::pin::Pin<
+    Box<
+      dyn std::future::Future<Output = Result<PathBuf, Box<dyn std::error::Error + Send + Sync>>>
+        + Send
+        + 'a,
+    >,
+  > {
+    Box::pin(async move {
+      if depth > max_depth {
+        return Err("Maximum search depth reached".into());
       }
 
-      // Second pass: search subdirectories
-      for subdir in dirs_to_search {
-        if let Ok(result) = self
-          .find_windows_executable_recursive(&subdir, depth + 1, max_depth)
-          .await
-        {
-          return Ok(result);
-        }
-      }
-
-      // Third pass: if no browser-specific executable found, return any .exe
       if let Ok(entries) = fs::read_dir(dir) {
+        let mut dirs_to_search = Vec::new();
+
+        // First pass: look for .exe files in current directory
         for entry in entries.flatten() {
           let path = entry.path();
+
           if path.is_file()
             && path
               .extension()
               .is_some_and(|ext| ext.to_string_lossy().to_lowercase() == "exe")
           {
-            return Ok(path);
+            let file_name = path
+              .file_name()
+              .and_then(|n| n.to_str())
+              .unwrap_or("")
+              .to_lowercase();
+
+            // Check if it's a browser executable
+            if file_name.contains("firefox")
+              || file_name.contains("chrome")
+              || file_name.contains("chromium")
+              || file_name.contains("zen")
+              || file_name.contains("brave")
+              || file_name.contains("tor")
+              || file_name.contains("mullvad")
+              || file_name.contains("browser")
+            {
+              return Ok(path);
+            }
+          } else if path.is_dir() {
+            // Collect directories for later search
+            dirs_to_search.push(path);
+          }
+        }
+
+        // Second pass: search subdirectories
+        for subdir in dirs_to_search {
+          if let Ok(result) = self
+            .find_windows_executable_recursive(&subdir, depth + 1, max_depth)
+            .await
+          {
+            return Ok(result);
+          }
+        }
+
+        // Third pass: if no browser-specific executable found, return any .exe
+        if let Ok(entries) = fs::read_dir(dir) {
+          for entry in entries.flatten() {
+            let path = entry.path();
+            if path.is_file()
+              && path
+                .extension()
+                .is_some_and(|ext| ext.to_string_lossy().to_lowercase() == "exe")
+            {
+              return Ok(path);
+            }
           }
         }
       }
-    }
 
-    Err("No executable found".into())
+      Err("No executable found".into())
+    })
   }
 
   #[cfg(target_os = "linux")]

src-tauri/src/profile_importer.rs

@@ -84,17 +84,15 @@ impl ProfileImporter {
     #[cfg(target_os = "windows")]
     {
       // Primary location in AppData\Roaming
-      if let Some(app_data) = self.base_dirs.data_dir() {
-        let firefox_dir = app_data.join("Mozilla/Firefox/Profiles");
-        profiles.extend(self.scan_firefox_profiles_dir(&firefox_dir, "firefox")?);
-      }
+      let app_data = self.base_dirs.data_dir();
+      let firefox_dir = app_data.join("Mozilla/Firefox/Profiles");
+      profiles.extend(self.scan_firefox_profiles_dir(&firefox_dir, "firefox")?);
 
       // Also check AppData\Local for portable installations
-      if let Some(local_app_data) = self.base_dirs.data_local_dir() {
-        let firefox_local_dir = local_app_data.join("Mozilla/Firefox/Profiles");
-        if firefox_local_dir.exists() {
-          profiles.extend(self.scan_firefox_profiles_dir(&firefox_local_dir, "firefox")?);
-        }
+      let local_app_data = self.base_dirs.data_local_dir();
+      let firefox_local_dir = local_app_data.join("Mozilla/Firefox/Profiles");
+      if firefox_local_dir.exists() {
+        profiles.extend(self.scan_firefox_profiles_dir(&firefox_local_dir, "firefox")?);
       }
     }
 
@@ -129,12 +127,11 @@ impl ProfileImporter {
 
     #[cfg(target_os = "windows")]
     {
-      if let Some(app_data) = self.base_dirs.data_dir() {
-        // Firefox Developer Edition on Windows typically uses separate directories
-        let firefox_dev_dir = app_data.join("Mozilla/Firefox Developer Edition/Profiles");
-        if firefox_dev_dir.exists() {
-          profiles.extend(self.scan_firefox_profiles_dir(&firefox_dev_dir, "firefox-developer")?);
-        }
+      let app_data = self.base_dirs.data_dir();
+      // Firefox Developer Edition on Windows typically uses separate directories
+      let firefox_dev_dir = app_data.join("Mozilla/Firefox Developer Edition/Profiles");
+      if firefox_dev_dir.exists() {
+        profiles.extend(self.scan_firefox_profiles_dir(&firefox_dev_dir, "firefox-developer")?);
       }
     }
 
@@ -168,10 +165,9 @@ impl ProfileImporter {
 
     #[cfg(target_os = "windows")]
     {
-      if let Some(local_app_data) = self.base_dirs.data_local_dir() {
-        let chrome_dir = local_app_data.join("Google/Chrome/User Data");
-        profiles.extend(self.scan_chrome_profiles_dir(&chrome_dir, "chromium")?);
-      }
+      let local_app_data = self.base_dirs.data_local_dir();
+      let chrome_dir = local_app_data.join("Google/Chrome/User Data");
+      profiles.extend(self.scan_chrome_profiles_dir(&chrome_dir, "chromium")?);
     }
 
     #[cfg(target_os = "linux")]
@@ -198,10 +194,9 @@ impl ProfileImporter {
 
     #[cfg(target_os = "windows")]
     {
-      if let Some(local_app_data) = self.base_dirs.data_local_dir() {
-        let chromium_dir = local_app_data.join("Chromium/User Data");
-        profiles.extend(self.scan_chrome_profiles_dir(&chromium_dir, "chromium")?);
-      }
+      let local_app_data = self.base_dirs.data_local_dir();
+      let chromium_dir = local_app_data.join("Chromium/User Data");
+      profiles.extend(self.scan_chrome_profiles_dir(&chromium_dir, "chromium")?);
     }
 
     #[cfg(target_os = "linux")]
@@ -228,10 +223,9 @@ impl ProfileImporter {
 
     #[cfg(target_os = "windows")]
     {
-      if let Some(local_app_data) = self.base_dirs.data_local_dir() {
-        let brave_dir = local_app_data.join("BraveSoftware/Brave-Browser/User Data");
-        profiles.extend(self.scan_chrome_profiles_dir(&brave_dir, "brave")?);
-      }
+      let local_app_data = self.base_dirs.data_local_dir();
+      let brave_dir = local_app_data.join("BraveSoftware/Brave-Browser/User Data");
+      profiles.extend(self.scan_chrome_profiles_dir(&brave_dir, "brave")?);
     }
 
     #[cfg(target_os = "linux")]
@@ -264,17 +258,15 @@ impl ProfileImporter {
     #[cfg(target_os = "windows")]
     {
       // Primary location in AppData\Roaming
-      if let Some(app_data) = self.base_dirs.data_dir() {
-        let mullvad_dir = app_data.join("MullvadBrowser/Profiles");
-        profiles.extend(self.scan_firefox_profiles_dir(&mullvad_dir, "mullvad-browser")?);
-      }
+      let app_data = self.base_dirs.data_dir();
+      let mullvad_dir = app_data.join("MullvadBrowser/Profiles");
+      profiles.extend(self.scan_firefox_profiles_dir(&mullvad_dir, "mullvad-browser")?);
 
       // Also check common installation locations
-      if let Some(local_app_data) = self.base_dirs.data_local_dir() {
-        let mullvad_local_dir = local_app_data.join("MullvadBrowser/Profiles");
-        if mullvad_local_dir.exists() {
-          profiles.extend(self.scan_firefox_profiles_dir(&mullvad_local_dir, "mullvad-browser")?);
-        }
+      let local_app_data = self.base_dirs.data_local_dir();
+      let mullvad_local_dir = local_app_data.join("MullvadBrowser/Profiles");
+      if mullvad_local_dir.exists() {
+        profiles.extend(self.scan_firefox_profiles_dir(&mullvad_local_dir, "mullvad-browser")?);
       }
     }
 
@@ -304,10 +296,9 @@ impl ProfileImporter {
 
     #[cfg(target_os = "windows")]
     {
-      if let Some(app_data) = self.base_dirs.data_dir() {
-        let zen_dir = app_data.join("Zen/Profiles");
-        profiles.extend(self.scan_firefox_profiles_dir(&zen_dir, "zen")?);
-      }
+      let app_data = self.base_dirs.data_dir();
+      let zen_dir = app_data.join("Zen/Profiles");
+      profiles.extend(self.scan_firefox_profiles_dir(&zen_dir, "zen")?);
     }
 
     #[cfg(target_os = "linux")]
@@ -378,17 +369,16 @@ impl ProfileImporter {
       }
 
       // Also check AppData directories if available
-      if let Some(app_data) = self.base_dirs.data_dir() {
-        let tor_app_data =
-          app_data.join("TorBrowser/Browser/TorBrowser/Data/Browser/profile.default");
-        if tor_app_data.exists() {
-          profiles.push(DetectedProfile {
-            browser: "tor-browser".to_string(),
-            name: "TOR Browser - AppData Profile".to_string(),
-            path: tor_app_data.to_string_lossy().to_string(),
-            description: "TOR Browser profile from AppData".to_string(),
-          });
-        }
+      let app_data = self.base_dirs.data_dir();
+      let tor_app_data =
+        app_data.join("TorBrowser/Browser/TorBrowser/Data/Browser/profile.default");
+      if tor_app_data.exists() {
+        profiles.push(DetectedProfile {
+          browser: "tor-browser".to_string(),
+          name: "TOR Browser - AppData Profile".to_string(),
+          path: tor_app_data.to_string_lossy().to_string(),
+          description: "TOR Browser profile from AppData".to_string(),
+        });
       }
     }