Merge pull request #16 from 7a6163/fix/portable-windows-updater

Disable auto-updates and notify users on Windows portable builds

Author: 7a6163

.github/workflows/release.yml

@@ -97,7 +97,11 @@ jobs:
             Write-Host "Packaging: $($exe.FullName)"
             $version = "${{ github.ref_name }}"
             $zipName = "Fanhuaji-${version}-windows-portable.zip"
-            Compress-Archive -Path $exe.FullName -DestinationPath $zipName
+            # Marker file so the app detects the portable build at runtime and
+            # switches the updater to notify-only (no in-place self-update on Windows).
+            $marker = Join-Path $relDir "portable"
+            Set-Content -Path $marker -Value "This file marks the Fanhuaji portable build. Do not remove it." -NoNewline
+            Compress-Archive -Path $exe.FullName, $marker -DestinationPath $zipName
             gh release upload ${{ github.ref_name }} $zipName --clobber
             Write-Host "Uploaded: $zipName"
           } else {

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 本檔案記錄繁化姬 Tauri 版的所有重要變更。格式基於 [Keep a Changelog](https://keepachangelog.com/)。
 
+## [2.4.2] - 2026-07-07
+
+### Fixed
+
+- Windows 攜帶版（portable）建置不再嘗試自動更新（Tauri 更新器會下載 MSI 安裝程式而非就地更新），改為顯示通知訊息引導使用者手動下載
+- 檔案佇列計數文字改用 i18n 系統，切換語言時正確顯示對應語言
+- 工具列輸出命名 pill 標籤在切換語言後同步更新
+
 ## [2.4.1] - 2026-07-06
 
 ### Fixed

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "fanhuaji-tauri",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "private": true,
   "scripts": {
     "dev": "vite",

package.json

@@ -1,6 +1,6 @@
 [package]
 name = "fanhuaji-tauri"
-version = "2.4.1"
+version = "2.4.2"
 edition = "2024"
 
 [lib]

src-tauri/Cargo.lock

@@ -379,6 +379,18 @@ pub async fn convert_epub(
     })
 }
 
+/// Returns `true` when this build is the Windows portable distribution, which
+/// is detected by a `portable` marker file shipped next to the executable.
+/// Portable builds cannot self-update in place (the Tauri Windows updater only
+/// runs an installer), so the frontend uses this to switch to a notify-only flow.
+#[tauri::command]
+pub fn is_portable() -> bool {
+    std::env::current_exe()
+        .ok()
+        .and_then(|exe| exe.parent().map(|dir| dir.join("portable").exists()))
+        .unwrap_or(false)
+}
+
 pub fn run() {
     tauri::Builder::default()
         .manage(HttpClient(
@@ -403,6 +415,7 @@ pub fn run() {
             convert_file,
             convert_epub,
             preview_convert,
+            is_portable,
         ])
         .run(tauri::generate_context!())
         .expect("啟動應用程式時發生錯誤");

src-tauri/Cargo.toml

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "Fanhuaji",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "identifier": "org.zhconvert.fanhuaji",
   "build": {
     "frontendDist": "../dist",

src-tauri/src/commands.rs

@@ -9,14 +9,22 @@ vi.mock("@tauri-apps/plugin-process", () => ({
   relaunch: vi.fn(),
 }));
 
+vi.mock("@tauri-apps/api/core", () => ({
+  invoke: vi.fn(),
+}));
+
+import { invoke } from "@tauri-apps/api/core";
 import { check, type Update } from "@tauri-apps/plugin-updater";
 import { checkForUpdates, initUpdater } from "../updater";
 
 const mockCheck = vi.mocked(check);
+const mockInvoke = vi.mocked(invoke);
 
 describe("updater", () => {
   beforeEach(() => {
     vi.clearAllMocks();
+    // Default: not portable (installed build)
+    mockInvoke.mockResolvedValue(false);
     document.body.innerHTML = `
       <div id="update-status"></div>
       <button id="btn-check-update"></button>
@@ -128,6 +136,47 @@ describe("updater", () => {
       expect(status?.textContent).toContain("network error");
       consoleSpy.mockRestore();
     });
+
+    it("shows portableAvailable message when portable and update found", async () => {
+      const mockUpdate = {
+        version: "2.0.0",
+        downloadAndInstall: vi.fn(),
+      };
+      mockCheck.mockResolvedValue(mockUpdate as unknown as Update);
+      mockInvoke.mockResolvedValue(true); // is_portable = true
+      const confirmSpy = vi.spyOn(window, "confirm");
+
+      await checkForUpdates(false);
+      const status = document.getElementById("update-status");
+      expect(status?.textContent).toContain("攜帶版無法自動更新");
+      expect(mockUpdate.downloadAndInstall).not.toHaveBeenCalled();
+      expect(confirmSpy).not.toHaveBeenCalled();
+    });
+
+    it("does not download or install when portable", async () => {
+      const mockUpdate = {
+        version: "2.0.0",
+        downloadAndInstall: vi.fn(),
+      };
+      mockCheck.mockResolvedValue(mockUpdate as unknown as Update);
+      mockInvoke.mockResolvedValue(true);
+
+      await checkForUpdates(false);
+      expect(mockUpdate.downloadAndInstall).not.toHaveBeenCalled();
+    });
+
+    it("falls back to normal flow when invoke throws", async () => {
+      const mockUpdate = {
+        version: "2.0.0",
+        downloadAndInstall: vi.fn().mockResolvedValue(undefined),
+      };
+      mockCheck.mockResolvedValue(mockUpdate as unknown as Update);
+      mockInvoke.mockRejectedValue(new Error("command not found"));
+      vi.spyOn(window, "confirm").mockReturnValue(true);
+
+      await checkForUpdates(false);
+      expect(mockUpdate.downloadAndInstall).toHaveBeenCalled();
+    });
   });
 
   describe("initUpdater", () => {

src-tauri/tauri.conf.json

@@ -81,12 +81,14 @@
   "file.convertDoneWithWarnings": "Done ({warnings})",
   "file.converting": "Converting\u2026",
   "file.convertingChapter": "Converting\u2026 ({current}/{total} {name})",
+  "queue.count": "\u00b7 {count} files",
 
   "dom.missingElement": "Required element not found: {selector}",
 
   "update.checking": "Checking\u2026",
   "update.upToDate": "You are up to date.",
   "update.found": "New version {version} available",
+  "update.portableAvailable": "New version {version} available. Portable builds cannot auto-update; please download the latest portable ZIP from GitHub Releases.",
   "update.confirm": "New version {version} is available. Download and install?",
   "update.downloading": "Downloading update\u2026",
   "update.restarting": "Download complete, restarting\u2026",