Merge-fix: updater

Author: jsonmaki

.gitignore

@@ -189,6 +189,7 @@ src/
 !GUI/src/preview_format/
 !GUI/src/material_ct.py
 !GUI/src/__init__.py
+!deploy/installer/src/
 temp
 *-in.txt
 untitled*

GUI/manager/__init__.py

@@ -1,6 +1,4 @@
 import os
-import json
-from pathlib import Path
 import subprocess
 import typing as t
 
@@ -12,7 +10,7 @@
 from assets import res
 from variables import PYPI_SOURCE
 from deploy.update import Proj
-from utils import conf, ori_path, env, uv_exc, exc_p, TaskObj, TasksObj
+from utils import conf, env, uv_exc, exc_p, TaskObj, TasksObj
 from utils.processed_class import PreviewHtml
 from utils.sql import SqlRecorder
 from GUI.uic.qfluent.components import (
@@ -176,24 +174,103 @@ def rerun(self):
         QTimer.singleShot(1000, self.gui.close)
 
     def to_update(self, ver):
-        # self.gui.open_url_by_browser(self.changelog_url)
-        uv_env = {key: os.environ[key] for key in ('UV_TOOL_DIR', 'UV_TOOL_BIN_DIR') if key in os.environ}
-        tool_dir = Path(uv_env['UV_TOOL_DIR'])
-        if os.name == "nt":
-            python_exc = tool_dir / "comicguispider" / "Scripts" / "python.exe"
-        else:
-            python_exc = tool_dir / "comicguispider" / "bin" / "python"
-        with ori_path.joinpath("assets/update.txt").open("r", encoding="utf-8") as f:
-            template = f.read()
-        updater_script = template.replace(r"{uv_env_dict}", json.dumps(uv_env, ensure_ascii=False))
-        script_path = tool_dir.joinpath("cgs_update.py")
-        with open(script_path, "w", encoding="utf-8") as f:
-            f.write(updater_script)
-        args = [str(python_exc), str(script_path),
-            '--uv-exc', uv_exc, '--version', ver,
-            '--index-url', PYPI_SOURCE[conf.pypi_source]]
-        if os.name == "nt":
-            subprocess.Popen(args, creationflags=subprocess.CREATE_NEW_CONSOLE, env=env)
-        else:
-            subprocess.Popen(args, start_new_session=True, env=env)
+        _UpdateLauncher(ver).run()
         self.gui.close()
+
+
+class _UpdateLauncher:
+    def __init__(self, ver: str):
+        self.ver = ver
+        self.install_spec = f"ComicGUISpider=={ver}"
+        self.index_url = PYPI_SOURCE[conf.pypi_source]
+        self.log_path = exc_p / "cgs_update.log"
+        self.installer_exe = exc_p / "runtime" / "installer.exe"
+
+    def run(self):
+        if os.name == "nt" and self.installer_exe.exists():
+            self._run_installer()
+            return
+        if os.name == "nt":
+            self._run_windows_fallback()
+            return
+        self._run_posix_fallback()
+
+    def _run_installer(self):
+        args = [
+            str(self.installer_exe),
+            "--version", self.ver,
+            "--uv-exc", uv_exc,
+            "--index-url", self.index_url,
+            "--parent-pid", str(os.getpid()),
+        ]
+        for key in ("UV_TOOL_DIR", "UV_TOOL_BIN_DIR"):
+            value = os.environ.get(key)
+            if value:
+                args.extend([f"--{key.lower().replace('_', '-')}", value])
+        subprocess.Popen(args, creationflags=subprocess.CREATE_NEW_CONSOLE, env=env)
+
+    def _run_windows_fallback(self):
+        ps1_path = exc_p / "updater.ps1"
+        script = r"""param(
+    [Parameter(Mandatory = $true)][string]$UvExe,
+    [Parameter(Mandatory = $true)][string]$InstallSpec,
+    [Parameter(Mandatory = $true)][string]$IndexUrl,
+    [Parameter(Mandatory = $true)][string]$LogPath,
+    [string]$UvToolDir = "",
+    [string]$UvToolBinDir = ""
+)
+
+if ($UvToolDir) { $env:UV_TOOL_DIR = $UvToolDir }
+if ($UvToolBinDir) { $env:UV_TOOL_BIN_DIR = $UvToolBinDir }
+
+& $UvExe tool install $InstallSpec --force --index-url $IndexUrl 2>&1 |
+    Tee-Object -FilePath $LogPath
+
+if ($LASTEXITCODE -ne 0) {
+    Write-Host "`nUpdate failed (exit code: $LASTEXITCODE)" -ForegroundColor Red
+}
+
+Read-Host "Press Enter to close"
+"""
+        self._write(ps1_path, script)
+        subprocess.Popen(
+            [
+                "powershell", "-NoProfile", "-ExecutionPolicy", "Bypass", "-NoExit",
+                "-File", str(ps1_path),
+                "-UvExe", uv_exc,
+                "-InstallSpec", self.install_spec,
+                "-IndexUrl", self.index_url,
+                "-LogPath", str(self.log_path),
+                "-UvToolDir", os.environ.get("UV_TOOL_DIR", ""),
+                "-UvToolBinDir", os.environ.get("UV_TOOL_BIN_DIR", ""),
+            ],
+            creationflags=subprocess.CREATE_NEW_CONSOLE,
+            env=env,
+        )
+
+    def _run_posix_fallback(self):
+        sh_path = exc_p / "updater.sh"
+        script = """#!/bin/sh
+uv_exe="$1"
+install_spec="$2"
+index_url="$3"
+log_path="$4"
+
+"$uv_exe" tool install "$install_spec" --force --index-url "$index_url" 2>&1 | tee -a "$log_path"
+echo "done"
+printf "Press any key to close..."
+stty -icanon -echo
+dd bs=1 count=1 >/dev/null 2>&1
+stty icanon echo
+"""
+        self._write(sh_path, script)
+        os.chmod(sh_path, 0o755)
+        subprocess.Popen(
+            ["setsid", "sh", str(sh_path), uv_exc, self.install_spec, self.index_url, str(self.log_path)],
+            start_new_session=True,
+            env=env,
+        )
+
+    @staticmethod
+    def _write(path, content: str):
+        path.write_text(content, encoding="utf-8")

README.md

@@ -53,7 +53,7 @@
 | [ExHentai](https://exhentai.org/)     | 🌏 |     🔞/代理     | ![status_ehentai](https://img.shields.io/endpoint?url=https://cgs-status-badges.pages.dev/status_ehentai.json)  |
 | [Hitomi](https://hitomi.la/)     | 🌏 |     🔞     | ![status_hitomi](https://img.shields.io/endpoint?url=https://cgs-status-badges.pages.dev/status_hitomi.json) |
 | [Kemono](https://kemono.cr)     | 🌏 |     🔞     |  |
-| [HComic](https://kemono.cr)     | 🌏 |     🔞/代理/`2.8.6-beta`~     | ![status_hitomi](https://img.shields.io/endpoint?url=https://cgs-status-badges.pages.dev/status_h_comic.json) |
+| [HComic](https://kemono.cr)     | 🌏 |     🔞/代理/`2.8.6-beta.2`~     | ![status_hitomi](https://img.shields.io/endpoint?url=https://cgs-status-badges.pages.dev/status_h_comic.json) |
 
 使用请适度，以免加重对方服务器负担，也减少被封ip风险
 

assets/_pystand_static.int

@@ -56,7 +56,7 @@ if __name__ == '__main__':
             pkg_spec = pkg_spec.replace("ComicGUISpider", "ComicGUISpider[script]")
         install_cmd = [str(uv_exec), "tool", "install", pkg_spec, "--force"]
         if args.conf:
-            install_cmd.extend(["--config-file", portable_env.joinpath(args.conf)])
+            install_cmd = [str(uv_exec), "--config-file", portable_env.joinpath(args.conf), "tool", "install", pkg_spec, "--force"]
         else:
             install_cmd.extend(["--index-url", index_value])
         print(install_cmd)

deploy/installer/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "cgs-installer"
+version = "2.8.6"
+edition = "2024"
+
+[[bin]]
+name = "installer"
+path = "src/main.rs"
+
+[dependencies]
+eframe = "0.33"
+clap = { version = "4.5", features = ["derive"] }
+pep440_rs = "0.7"
+regex = "1.12"
+
+[target.'cfg(windows)'.dependencies]
+windows = { version = "0.62", features = [
+    "Win32_System_Threading",
+    "Win32_Foundation",
+] }
+
+[profile.release]
+opt-level = "z"
+lto = true
+strip = true
+codegen-units = 1

deploy/installer/build.rs

@@ -0,0 +1,39 @@
+use std::env;
+use std::fs;
+use std::path::PathBuf;
+
+fn main() {
+    #[cfg(windows)]
+    {
+        let target_env = env::var("CARGO_CFG_TARGET_ENV").unwrap_or_default();
+        if target_env == "msvc" {
+            let out_dir = PathBuf::from(env::var("OUT_DIR").expect("OUT_DIR not set"));
+            let manifest_path = out_dir.join("installer.manifest");
+            let manifest = r#"<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity type="win32" name="ComicGUISpider.Installer" version="1.0.0.0"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </windowsSettings>
+  </application>
+</assembly>
+"#;
+            fs::write(&manifest_path, manifest).expect("failed to write manifest");
+            println!("cargo:rustc-link-arg-bins=/MANIFEST:EMBED");
+            println!(
+                "cargo:rustc-link-arg-bins=/MANIFESTINPUT:{}",
+                manifest_path.display()
+            );
+        }
+    }
+    println!("cargo:rerun-if-changed=build.rs");
+}

deploy/installer/src/args.rs

@@ -0,0 +1,26 @@
+use clap::Parser;
+
+#[derive(Debug, Clone, Parser)]
+#[command(name = "installer", version, about = "ComicGUISpider native updater")]
+pub struct CliArgs {
+    #[arg(long = "uv-exc")]
+    pub uv_exc: String,
+
+    #[arg(long)]
+    pub version: String,
+
+    #[arg(long = "index-url", default_value_t)]
+    pub index_url: String,
+
+    #[arg(long = "parent-pid", default_value_t = 0)]
+    pub parent_pid: u32,
+
+    #[arg(long = "uv-tool-dir", default_value_t)]
+    pub uv_tool_dir: String,
+
+    #[arg(long = "uv-tool-bin-dir", default_value_t)]
+    pub uv_tool_bin_dir: String,
+
+    #[arg(long = "no-gui")]
+    pub no_gui: bool,
+}