Merge branch 'master' of https://github.com/LiRenTech/project-graph

Author: Littlefean

.vscode/settings.json

@@ -4,5 +4,6 @@
   "eslint.options": {
     "overrideConfigFile": "./eslint.config.js"
   },
-  "vue.server.includeLanguages": ["vue"]
+  "vue.server.includeLanguages": ["vue"],
+  "rust-analyzer.linkedProjects": ["app/src-tauri/Cargo.toml"]
 }

app/src-tauri/src/lib.rs

@@ -5,6 +5,9 @@ use base64::engine::general_purpose;
 use base64::Engine;
 
 use tauri::Manager;
+use tauri::Runtime;
+use tauri::Url;
+use tauri_plugin_updater::UpdaterExt;
 
 /// 判断文件是否存在
 #[tauri::command]
@@ -66,6 +69,25 @@ fn exit(code: i32) {
     std::process::exit(code);
 }
 
+#[tauri::command]
+async fn set_update_channel<R: Runtime>(
+    app: tauri::AppHandle<R>,
+    channel: String,
+) -> Result<(), tauri_plugin_updater::Error> {
+    println!("Setting update channel to {}", channel);
+    app.updater_builder()
+        .endpoints(vec![Url::parse(
+            format!(
+            "https://github.com/LiRenTech/project-graph/releases/{channel}/download/latest.json"
+        )
+            .as_str(),
+        )?])?
+        .build()?
+        .check()
+        .await?;
+    Ok(())
+}
+
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     // 在 Linux 上禁用 DMA-BUF 渲染器
@@ -105,7 +127,8 @@ pub fn run() {
             write_file_base64,
             write_stdout,
             write_stderr,
-            exit
+            exit,
+            set_update_channel
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");

app/src/core/service/Settings.tsx

@@ -13,6 +13,7 @@ export namespace Settings {
   // 注意：下拉菜单框必须要在语言包里面配置才能生效，否则菜单项是 Error: Option Not Found
   export type Settings = {
     language: "zh_CN" | "zh_TW" | "en";
+    updateChannel: "latest" | "nightly";
     // 视觉相关
     lineStyle: "straight" | "bezier" | "vertical";
     theme: "black" | "white" | "macaron" | "morandi";
@@ -79,6 +80,7 @@ export namespace Settings {
   };
   export const defaultSettings: Settings = {
     language: "zh_CN",
+    updateChannel: "latest",
     // 视觉相关
     lineStyle: "straight",
     theme: "black",

app/src/locales/zh_CN.yml

@@ -86,6 +86,11 @@ settings:
       en: English
       zh_CN: 简体中文
       zh_TW: 繁體中文
+  updateChannel:
+    title: 更新频道
+    options:
+      latest: 稳定版
+      nightly: 开发版
   theme:
     title: 舞台主题颜色
     options:

app/src/pages/settings/about.tsx

@@ -1,3 +1,4 @@
+import { invoke } from "@tauri-apps/api/core";
 import { check, Update } from "@tauri-apps/plugin-updater";
 import { BookOpen, Download, MessageCircleCode } from "lucide-react";
 import React from "react";
@@ -8,14 +9,19 @@ import icon from "../../assets/icon.png";
 import QQ from "../../assets/qq.svg?react";
 import versions from "../../assets/versions.json";
 import Button from "../../components/Button";
+import { Settings } from "../../core/service/Settings";
 import { getAppVersion } from "../../utils/otherApi";
+import { SettingField } from "./_field";
 
 export default function About() {
   const [version, setVersion] = React.useState("");
   const [versionName, setVersionName] = React.useState("");
   const [versionNameEn, setVersionNameEn] = React.useState("");
   const [update, setUpdate] = React.useState<Update | null>(null);
   const [updating, setUpdating] = React.useState(false);
+  const [newVersionFileSize, setNewVersionFileSize] = React.useState(0);
+  const [newVersionDownloadedSize, setNewVersionDownloadedSize] = React.useState(0);
+  const [updateChannel] = Settings.use("updateChannel");
   const { t, i18n } = useTranslation("about");
 
   React.useEffect(() => {
@@ -34,9 +40,14 @@ export default function About() {
         setVersionNameEn("Unknown Version");
       }
     });
-    check().then(setUpdate);
   }, []);
 
+  React.useEffect(() => {
+    invoke("set_update_channel", { channel: updateChannel })
+      .then(() => check())
+      .then(setUpdate);
+  }, [updateChannel]);
+
   return (
     <div className="flex h-full">
       <div className="flex w-64 flex-col items-center justify-center gap-4">
@@ -52,13 +63,25 @@ export default function About() {
           <Button
             onClick={() => {
               setUpdating(true);
-              update?.downloadAndInstall().then(() => {
-                setUpdating(false);
+              update?.downloadAndInstall((event) => {
+                switch (event.event) {
+                  case "Started":
+                    setNewVersionFileSize(event.data.contentLength ?? 0);
+                    break;
+                  case "Progress":
+                    setNewVersionDownloadedSize((prev) => prev + (event.data.chunkLength ?? 0));
+                    break;
+                  case "Finished":
+                    setUpdating(false);
+                    break;
+                }
               });
             }}
           >
             <Download />
-            {updating ? t("updater.downloading") : `${t("updater.available")}: ${update.version}`}
+            {updating
+              ? `${t("updater.downloading")}: ${((newVersionDownloadedSize / newVersionFileSize) * 100).toFixed()}%`
+              : `${t("updater.available")}: ${update.version}`}
           </Button>
         )}
         <div className="flex flex-wrap justify-center gap-2">
@@ -91,6 +114,7 @@ export default function About() {
         </div>
       </div>
       <div className="text-panel-text flex flex-1 flex-col gap-4 overflow-auto">
+        <SettingField icon={<Download />} settingKey="updateChannel" type="select" />
         <Paragraph i18nKey="intro" />
         <Paragraph i18nKey="ideaSources" />
         <Paragraph i18nKey="team" />