From 2b678ed04d4ed38501c7c5c1db092c307b1a9624 Mon Sep 17 00:00:00 2001
From: zhom <2717306+zhom@users.noreply.github.com>
Date: Sat, 7 Jun 2025 06:00:55 +0400
Subject: [PATCH] fix: hide brave releases without zip files for linux

---
 src-tauri/src/api_client.rs              | 19 ++++++---------
 src-tauri/src/browser_version_service.rs |  2 +-
 src-tauri/src/download.rs                | 27 +--------------------
 src/components/custom-toast.tsx          | 30 ++++++++++++------------
 4 files changed, 24 insertions(+), 54 deletions(-)

diff --git a/src-tauri/src/api_client.rs b/src-tauri/src/api_client.rs
index cbccd6d..17d9e66 100644
--- a/src-tauri/src/api_client.rs
+++ b/src-tauri/src/api_client.rs
@@ -805,22 +805,17 @@ impl ApiClient {
         }) || assets.iter().any(|asset| asset.name.ends_with(".dmg"))
       }
       "linux" => {
-        // For Linux, check for architecture-specific packages (prefer ZIP for stable releases)
+        // For Linux, be strict about architecture matching - only allow assets that explicitly match the current architecture
         let arch_pattern = if arch == "arm64" { "arm64" } else { "amd64" };
 
-        assets.iter().any(|asset| {
+        if assets.iter().any(|asset| {
           let name = asset.name.to_lowercase();
           name.contains("linux") && name.contains(arch_pattern) && name.ends_with(".zip")
-        }) || assets.iter().any(|asset| {
-          let name = asset.name.to_lowercase();
-          name.contains(arch_pattern) && (name.ends_with(".deb") || name.ends_with(".rpm"))
-        }) || assets.iter().any(|asset| {
-          let name = asset.name.to_lowercase();
-          name.contains("linux") && name.ends_with(".zip")
-        }) || assets.iter().any(|asset| {
-          let name = asset.name.to_lowercase();
-          name.ends_with(".deb") || name.ends_with(".rpm")
-        })
+        }) {
+          return true;
+        }
+
+        false
       }
       _ => false,
     }
diff --git a/src-tauri/src/browser_version_service.rs b/src-tauri/src/browser_version_service.rs
index 2368d81..1a91c3d 100644
--- a/src-tauri/src/browser_version_service.rs
+++ b/src-tauri/src/browser_version_service.rs
@@ -1519,7 +1519,7 @@ mod tests {
     assert!(chromium_info.url.contains("chrome-mac.zip"));
     assert!(chromium_info.is_archive);
 
-    // Test Brave
+    // Test Brave - Note: Brave uses dynamic URL resolution, so get_download_info provides a template URL
     let brave_info = service.get_download_info("brave", "v1.81.9").unwrap();
     assert_eq!(brave_info.filename, "Brave-Browser-universal.dmg");
     assert_eq!(brave_info.url, "https://github.com/brave/brave-browser/releases/download/v1.81.9/Brave-Browser-universal.dmg");
diff --git a/src-tauri/src/download.rs b/src-tauri/src/download.rs
index b8c0dd5..b4f4ca0 100644
--- a/src-tauri/src/download.rs
+++ b/src-tauri/src/download.rs
@@ -195,7 +195,7 @@ impl Downloader {
           })
       }
       "linux" => {
-        // For Linux, prefer ZIP files matching architecture (new format for stable releases)
+        // For Linux, be strict about architecture matching - same logic as has_compatible_brave_asset
         let arch_pattern = if arch == "arm64" { "arm64" } else { "amd64" };
 
         assets
@@ -204,31 +204,6 @@ impl Downloader {
             let name = asset.name.to_lowercase();
             name.contains("linux") && name.contains(arch_pattern) && name.ends_with(".zip")
           })
-          .or_else(|| {
-            // Fallback to DEB packages
-            assets.iter().find(|asset| {
-              let name = asset.name.to_lowercase();
-              name.contains(arch_pattern) && name.ends_with(".deb")
-            })
-          })
-          .or_else(|| {
-            // Fallback to any ZIP
-            assets.iter().find(|asset| {
-              let name = asset.name.to_lowercase();
-              name.contains("linux") && name.ends_with(".zip")
-            })
-          })
-          .or_else(|| {
-            // Fallback to any DEB
-            assets.iter().find(|asset| asset.name.ends_with(".deb"))
-          })
-          .or_else(|| {
-            // Last fallback to RPM if no ZIP or DEB found
-            assets.iter().find(|asset| {
-              let name = asset.name.to_lowercase();
-              name.contains("x86_64") && name.ends_with(".rpm")
-            })
-          })
       }
       _ => None,
     };
diff --git a/src/components/custom-toast.tsx b/src/components/custom-toast.tsx
index b6332de..0fd7c69 100644
--- a/src/components/custom-toast.tsx
+++ b/src/components/custom-toast.tsx
@@ -116,31 +116,31 @@ type ToastProps =
 function getToastIcon(type: ToastProps["type"], stage?: string) {
   switch (type) {
     case "success":
-      return <LuCheckCheck className="h-4 w-4 text-green-500 flex-shrink-0" />;
+      return <LuCheckCheck className="flex-shrink-0 w-4 h-4 text-green-500" />;
     case "error":
-      return <LuTriangleAlert className="h-4 w-4 text-red-500 flex-shrink-0" />;
+      return <LuTriangleAlert className="flex-shrink-0 w-4 h-4 text-red-500" />;
     case "download":
       if (stage === "completed") {
         return (
-          <LuCheckCheck className="h-4 w-4 text-green-500 flex-shrink-0" />
+          <LuCheckCheck className="flex-shrink-0 w-4 h-4 text-green-500" />
         );
       }
-      return <LuDownload className="h-4 w-4 text-blue-500 flex-shrink-0" />;
+      return <LuDownload className="flex-shrink-0 w-4 h-4 text-blue-500" />;
     case "version-update":
       return (
-        <LuRefreshCw className="h-4 w-4 text-blue-500 animate-spin flex-shrink-0" />
+        <LuRefreshCw className="flex-shrink-0 w-4 h-4 text-blue-500 animate-spin" />
       );
     case "fetching":
       return (
-        <LuRefreshCw className="h-4 w-4 text-blue-500 animate-spin flex-shrink-0" />
+        <LuRefreshCw className="flex-shrink-0 w-4 h-4 text-blue-500 animate-spin" />
       );
     case "twilight-update":
       return (
-        <LuRefreshCw className="h-4 w-4 text-purple-500 animate-spin flex-shrink-0" />
+        <LuRefreshCw className="flex-shrink-0 w-4 h-4 text-purple-500 animate-spin" />
       );
     default:
       return (
-        <div className="animate-spin rounded-full h-4 w-4 border-2 border-blue-500 border-t-transparent flex-shrink-0" />
+        <div className="flex-shrink-0 w-4 h-4 rounded-full border-2 border-blue-500 animate-spin border-t-transparent" />
       );
   }
 }
@@ -151,10 +151,10 @@ export function UnifiedToast(props: ToastProps) {
   const progress = "progress" in props ? props.progress : undefined;
 
   return (
-    <div className="flex items-start w-full bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-lg p-3 shadow-lg">
+    <div className="flex items-start p-3 w-full bg-white rounded-lg border border-gray-200 shadow-lg dark:bg-gray-800 dark:border-gray-700">
       <div className="mr-3 mt-0.5">{getToastIcon(type, stage)}</div>
       <div className="flex-1 min-w-0">
-        <p className="text-sm font-medium text-gray-900 dark:text-white leading-tight">
+        <p className="text-sm font-medium leading-tight text-gray-900 dark:text-white">
           {title}
         </p>
 
@@ -165,7 +165,7 @@ export function UnifiedToast(props: ToastProps) {
           stage === "downloading" && (
             <div className="mt-2 space-y-1">
               <div className="flex justify-between items-center">
-                <p className="text-xs text-gray-600 dark:text-gray-300 min-w-0 flex-1">
+                <p className="flex-1 min-w-0 text-xs text-gray-600 dark:text-gray-300">
                   {progress.percentage.toFixed(1)}%
                   {progress.speed && ` • ${progress.speed} MB/s`}
                   {progress.eta && ` • ${progress.eta} remaining`}
@@ -195,7 +195,7 @@ export function UnifiedToast(props: ToastProps) {
                   }}
                 />
               </div>
-              <span className="text-xs text-gray-500 dark:text-gray-400 whitespace-nowrap shrink-0 w-8 text-right">
+              <span className="w-8 text-xs text-right text-gray-500 whitespace-nowrap dark:text-gray-400 shrink-0">
                 {progress.current}/{progress.total}
               </span>
             </div>
@@ -211,7 +211,7 @@ export function UnifiedToast(props: ToastProps) {
                 : "Checking for twilight updates..."}
             </p>
             {props.browserName && (
-              <p className="text-xs text-purple-600 dark:text-purple-400 mt-1">
+              <p className="mt-1 text-xs text-purple-600 dark:text-purple-400">
                 {props.browserName} • Rolling Release
               </p>
             )}
@@ -220,7 +220,7 @@ export function UnifiedToast(props: ToastProps) {
 
         {/* Description */}
         {description && (
-          <p className="mt-1 text-xs text-gray-600 dark:text-gray-300 leading-tight">
+          <p className="mt-1 text-xs leading-tight text-gray-600 dark:text-gray-300">
             {description}
           </p>
         )}
@@ -235,7 +235,7 @@ export function UnifiedToast(props: ToastProps) {
             )}
             {stage === "verifying" && (
               <p className="mt-1 text-xs text-gray-600 dark:text-gray-300">
-                Verifying installation...
+                Verifying browser files...
               </p>
             )}
             {stage === "downloading (twilight rolling release)" && (