From e481348ef3e83eec2b6634d5c74b018c4029c60e Mon Sep 17 00:00:00 2001 From: Soltus Date: Tue, 26 Mar 2024 13:34:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E5=86=85=E6=A0=B8=E7=A8=B3?= =?UTF-8?q?=E5=AE=9A=E6=80=A7=20#597?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dockerimage.yml | 4 ++-- app/appearance/langs/en_US.json | 2 +- app/appearance/langs/es_ES.json | 2 +- app/appearance/langs/fr_FR.json | 2 +- app/appearance/langs/zh_CHT.json | 2 +- app/appearance/langs/zh_CN.json | 2 +- app/src/mobile/settings/about.ts | 2 +- app/src/types/index.d.ts | 1 + app/stage/auth.html | 3 ++- kernel/mobile/kernel.go | 7 ------- kernel/model/repository.go | 7 +++++++ kernel/model/updater.go | 2 +- kernel/util/session.go | 1 - 13 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 6c01ad67c0..e3e9ef1c84 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -45,7 +45,7 @@ jobs: uses: docker/setup-qemu-action@v2 - name: Setup Docker buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Log in to Docker Hub uses: docker/login-action@v2 @@ -65,4 +65,4 @@ jobs: repository: soltus/sillot # 这是 docker hub 的不是 github 的 readme-filepath: ./.github/README.md short-description: ${{ github.event.repository.description }} - enable-url-completion: true + enable-url-completion: false diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 2479b18313..5b261e942e 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1223,7 +1223,7 @@ "7": "Remove notebook [%s] path [%s] failed: %s", "8": "Check update failed", "9": "\uD83D\uDE80 A new version is available, please browse the release announcement %s", - "10": "Is the latest version", + "10": "Is the latest version %s", "11": "\uD83D\uDCE2 系統公告：%s", "12": "Query asset failed [%s]", "13": "Cannot create a file starting with .", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 410d08aab7..f73e1bad63 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1223,7 +1223,7 @@ "7": "Eliminar libreta [%s] ruta [%s] falló: %s", "8": "Comprobar la actualización falló", "9": "\uD83D\uDE80 Una nueva versión está disponible, por favor, busque el anuncio de lanzamiento %s", - "10": "Es la última versión", + "10": "Es la última versión %s", "11": "\uD83D\uDCE2 Anuncio del sistema: %s", "12": "Fallo en la consulta de activos [%s]", "13": "No se puede crear un archivo que empiece por .", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index cd5ca14cde..ede2ce0686 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1223,7 +1223,7 @@ "7": "La suppression du carnet de notes [%s] path [%s] a échoué : %s", "8": "La vérification de la mise à jour a échoué", "9": "\uD83D\uDE80 Une nouvelle version est disponible, veuillez consulter l'annonce de la version %s", - "10": "C'est la dernière version", + "10": "C'est la dernière version %s", "11": "\uD83D\uDCE2 Annonce système : %s", "12": "Échec de la requête asset [%s]", "13": "Impossible de créer un fichier commençant par .", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index aa09690577..6710057d30 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1223,7 +1223,7 @@ "7": "在筆記本 [%s] 下刪除 [%s] 失敗：%s", "8": "檢查更新失敗", "9": "\uD83D\uDE80 有新版本可用，請瀏覽發佈公告 %s", - "10": "已是最新版", + "10": "已是最新版 %s", "11": "\uD83D\uDCE2 系統公告：%s", "12": "查詢資料檔失敗 [%s]", "13": "無法建立 . 開頭的文件", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 473f35b2f8..572f3ea684 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1225,7 +1225,7 @@ "7": "在笔记本 [%s] 下删除 [%s] 失败：%s", "8": "检查更新失败", "9": "\uD83D\uDE80 有新版本可用，请浏览发布公告 %s", - "10": "已是最新版", + "10": "已是最新版 %s", "11": "\uD83D\uDCE2 系统公告：%s", "12": "查询资源文件失败 [%s]", "13": "无法创建 . 开头的文件", diff --git a/app/src/mobile/settings/about.ts b/app/src/mobile/settings/about.ts index feeaf3d62f..59be3faaaf 100644 --- a/app/src/mobile/settings/about.ts +++ b/app/src/mobile/settings/about.ts @@ -368,7 +368,7 @@ export const initAbout = () => { if(networkServeElement.checked){ window.JSAndroid?.requestPermissionActivity("Battery","注意：后台稳定伺服会消耗额外电量"); } - exitSiYuan(); + window.JSAndroid?.restartSillotAndroid(); }); }); const tokenElement = modelMainElement.querySelector("#token") as HTMLInputElement; diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts index d365472081..2c4eb98bdc 100644 --- a/app/src/types/index.d.ts +++ b/app/src/types/index.d.ts @@ -167,6 +167,7 @@ interface Window { requestPermissionActivity(id: string, Msg: string): void requestPermission(id: string, Msg: string): boolean exitSillotAndroid(): void + restartSillotAndroid(): void savePictureByURL(uri: string): void // sillot extend end returnDesktop(): void diff --git a/app/stage/auth.html b/app/stage/auth.html index 566646e48b..a7fc33f733 100644 --- a/app/stage/auth.html +++ b/app/stage/auth.html @@ -429,6 +429,7 @@

{ - exitSiYuan() + window.JSAndroid ? exitSillotAndroid() : exitSiYuan() }) await ipcRenderer.invoke("siyuan-init", { languages: {{.trayMenuLangs}}, diff --git a/kernel/mobile/kernel.go b/kernel/mobile/kernel.go index 17254db821..8ecd3d9f70 100644 --- a/kernel/mobile/kernel.go +++ b/kernel/mobile/kernel.go @@ -115,10 +115,3 @@ func SetTimezone(container, appDir, timezoneID string) { } time.Local = z } - -// Sillot extend -func SetBiometricPass(code string) { - util.BiometricPass = code -} - -// Sillot extend end diff --git a/kernel/model/repository.go b/kernel/model/repository.go index d6bad8efbd..341aecc933 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -521,6 +521,13 @@ func PurgeRepo() (err error) { return } + if stat == nil { + stat = &entity.PurgeStat{} // 避免 stat.Indexes 空指针导致崩溃 + logging.LogErrorf("stat is nil after repo.Purge") + // return err + // return errors.New("stat is nil after repo.Purge") + } + deletedIndexes := stat.Indexes deletedObjects := stat.Objects deletedSize := humanize.Bytes(uint64(stat.Size)) diff --git a/kernel/model/updater.go b/kernel/model/updater.go index 8af6f7a351..4fba092cda 100644 --- a/kernel/model/updater.go +++ b/kernel/model/updater.go @@ -268,7 +268,7 @@ func CheckUpdate(showMsg bool) { _ver := strings.ReplaceAll(ver, "-sillot", "") _ver = strings.ReplaceAll(_ver, "v", "") - release := "https://yy-ac.github.io/Hi-Windom/Sillot/release/v" + _ver + release := "/~https://github.com/Hi-Windom/Sillot/releases/tag/" + ver var msg string var timeout int if isVersionUpToDate(_ver) { diff --git a/kernel/util/session.go b/kernel/util/session.go index 5d725e804f..2d6865adc0 100644 --- a/kernel/util/session.go +++ b/kernel/util/session.go @@ -23,7 +23,6 @@ import ( ) var WrongAuthCount int -var BiometricPass string func NeedCaptcha() bool { return 3 < WrongAuthCount