From 943e15520356e2fc94cdc925637672d9c40fec74 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Tue, 4 Jul 2023 19:16:35 +0800 Subject: [PATCH 1/2] :art: Improve cloud sync error report text https://github.com/siyuan-note/siyuan/issues/8675 --- app/appearance/langs/en_US.json | 4 +++- app/appearance/langs/es_ES.json | 4 +++- app/appearance/langs/fr_FR.json | 4 +++- app/appearance/langs/zh_CHT.json | 4 +++- app/appearance/langs/zh_CN.json | 4 +++- kernel/go.mod | 2 +- kernel/go.sum | 4 ++-- kernel/model/sync.go | 4 ++++ 8 files changed, 22 insertions(+), 8 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 808ac2a51..e5176c053 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1186,6 +1186,8 @@ "208": "Uploading index list...", "209": "Uploading check index...", "210": "Verifying cloud data %v/%v", - "211": "Cloud data verification complete" + "211": "Cloud data verification complete", + "212": "There are some defects in the current version of cloud data sync, please upgrade to the latest version. Sorry for the inconvenience", + "213": "Cloud verification failed, please try to upgrade to the latest version and log in again before syncing" } } diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index ff8bd3011..299875dea 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1186,6 +1186,8 @@ "208": "Cargando lista de índice...", "209": "Cargando índice de verificación...", "210": "Verificando datos en la nube %v/%v", - "211": "Verificaci\u00f3n de datos en la nube completada" + "211": "Verificaci\u00f3n de datos en la nube completada", + "212": "Hay algunos defectos en la versi\u00f3n actual de sincronizaci\u00f3n de datos en la nube, actualice a la versi\u00f3n m\u00e1s reciente. Disculpe las molestias", + "213": "La verificaci\u00f3n en la nube fall\u00f3, intente actualizar a la versi\u00f3n m\u00e1s reciente e inicie sesi\u00f3n de nuevo antes de sincronizar" } } diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 98f686c33..8998603c3 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1186,6 +1186,8 @@ "208": "Téléchargement de la liste d'index...", "209": "Téléchargement de l'index de vérification...", "210": "Vérification des données cloud %v/%v", - "211": "Vérification des données cloud terminée" + "211": "Vérification des données cloud terminée", + "212": "Il y a quelques défauts dans la version actuelle de la synchronisation des données cloud, veuillez mettre à niveau vers la dernière version. Désolé pour le désagrément", + "213": "Échec de la vérification cloud, veuillez essayer de mettre à niveau vers la dernière version et de vous reconnecter avant de synchroniser" } } diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 2de4bf41b..eacea5f80 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1186,6 +1186,8 @@ "208": "正在上傳索引列表...", "209": "正在上傳校驗索引...", "210": "正在校驗雲端數據 %v/%v", - "211": "校驗雲端數據完畢" + "211": "校驗雲端數據完畢", + "212": "當前版本雲端數據同步存在一些缺陷，請升級到最新版，帶來不便，敬請諒解", + "213": "雲端校驗失敗，請嘗試升級到最新版並重新登錄後再進行同步" } } diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index afa6bde05..21c5d3585 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1186,6 +1186,8 @@ "208": "正在上传索引列表...", "209": "正在上传校验索引...", "210": "正在校验云端数据 %v/%v", - "211": "校验云端数据完毕" + "211": "校验云端数据完毕", + "212": "当前版本云端数据同步存在一些缺陷，请升级到最新版，带来不便，敬请谅解", + "213": "云端校验失败，请尝试升级到最新版并重新登录后再进行同步" } } diff --git a/kernel/go.mod b/kernel/go.mod index c4c7cc7f1..025644475 100644 --- a/kernel/go.mod +++ b/kernel/go.mod @@ -45,7 +45,7 @@ require ( github.com/radovskyb/watcher v1.0.7 github.com/sashabaranov/go-openai v1.12.0 github.com/shirou/gopsutil/v3 v3.23.5 - github.com/siyuan-note/dejavu v0.0.0-20230703042337-1a642a48e663 + github.com/siyuan-note/dejavu v0.0.0-20230704110643-d6a4b98d2d6c github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75 github.com/siyuan-note/eventbus v0.0.0-20230702081350-6dde667e7112 github.com/siyuan-note/filelock v0.0.0-20230615140405-d05a21d49524 diff --git a/kernel/go.sum b/kernel/go.sum index 64fdbd8d8..1fa7f71e5 100644 --- a/kernel/go.sum +++ b/kernel/go.sum @@ -287,8 +287,8 @@ github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5g github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d h1:lvCTyBbr36+tqMccdGMwuEU+hjux/zL6xSmf5S9ITaA= github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw= -github.com/siyuan-note/dejavu v0.0.0-20230703042337-1a642a48e663 h1:dKz6pHllXsmKXRf06wznJDT0F602wDK7GIffiPCyRoc= -github.com/siyuan-note/dejavu v0.0.0-20230703042337-1a642a48e663/go.mod h1:SRJIJt0yhMD2Yfs49bFEgcWUZ80okiA/oTFRT7/PL28= +github.com/siyuan-note/dejavu v0.0.0-20230704110643-d6a4b98d2d6c h1:SuJTliwQGq2mlw+SNQJsunSrQBChlSjyvWv0ntK9PFQ= +github.com/siyuan-note/dejavu v0.0.0-20230704110643-d6a4b98d2d6c/go.mod h1:SRJIJt0yhMD2Yfs49bFEgcWUZ80okiA/oTFRT7/PL28= github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75 h1:Bi7/7f29LW+Fm0cHc0J1NO1cZqyJwljSWVmfOqVZgaE= github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75/go.mod h1:H8fyqqAbp9XreANjeSbc72zEdFfKTXYN34tc1TjZwtw= github.com/siyuan-note/eventbus v0.0.0-20230702081350-6dde667e7112 h1:lb+8C+XEEEn/lcBtoXlrf5mZEoe0y0KlqiIGG93Gozc= diff --git a/kernel/model/sync.go b/kernel/model/sync.go index 695dcb651..b82f363e8 100644 --- a/kernel/model/sync.go +++ b/kernel/model/sync.go @@ -513,6 +513,10 @@ func formatRepoErrorMsg(err error) string { msg = Conf.Language(23) } else if errors.Is(err, cloud.ErrSystemTimeIncorrect) { msg = Conf.Language(195) + } else if errors.Is(err, cloud.ErrDeprecatedVersion) { + msg = Conf.Language(212) + } else if errors.Is(err, cloud.ErrCloudCheckFailed) { + msg = Conf.Language(213) } else { msgLowerCase := strings.ToLower(msg) if strings.Contains(msgLowerCase, "permission denied") || strings.Contains(msg, "access is denied") { From 164c679d89e0f9a77269aee5a49b6c0d39ff7910 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Tue, 4 Jul 2023 20:19:26 +0800 Subject: [PATCH 2/2] :bug: Unable to export Data if workspace folder contains non-ASCII characters Fix https://github.com/siyuan-note/siyuan/issues/8678 --- kernel/model/export.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kernel/model/export.go b/kernel/model/export.go index a3ae25981..676f37e74 100644 --- a/kernel/model/export.go +++ b/kernel/model/export.go @@ -255,6 +255,12 @@ func ExportDataInFolder(exportFolder string) (name string, err error) { return } name = filepath.Base(zipPath) + name, err = url.PathUnescape(name) + if nil != err { + logging.LogErrorf("url unescape [%s] failed: %s", name, err) + return + } + targetZipPath := filepath.Join(exportFolder, name) zipAbsPath := filepath.Join(util.TempDir, "export", name) err = filelock.Copy(zipAbsPath, targetZipPath)