From 67797099c2c4cb348c50eb247f92e2fd5f1c0667 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 2 Jul 2023 20:41:54 +0800 Subject: [PATCH] :art: Automatically check cloud data integrity https://github.com/siyuan-note/siyuan/issues/8653 --- 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 +- kernel/go.mod | 2 +- kernel/go.sum | 4 ++-- kernel/model/repository.go | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index a49e629a8..8c14839b1 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1181,7 +1181,7 @@ "207": "Executing path replacement [%d/%d]", "208": "Uploading index list...", "209": "Uploading check index...", - "210": "Verifying cloud data...", + "210": "Verifying cloud data %v/%v", "211": "Cloud data verification complete" } } diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 9eadd1932..6cd9d0418 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1181,7 +1181,7 @@ "207": "Ejecutando reemplazo de ruta [%d/%d]", "208": "Cargando lista de índice...", "209": "Cargando índice de verificación...", - "210": "Verificando datos en la nube...", + "210": "Verificando datos en la nube %v/%v", "211": "Verificaci\u00f3n de datos en la nube completada" } } diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 0da7777de..54fd5a396 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1181,7 +1181,7 @@ "207": "Exécution du remplacement de chemin [%d/%d]", "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...", + "210": "Vérification des données cloud %v/%v", "211": "Vérification des données cloud terminée" } } diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 8deaf9169..ff5808f48 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1181,7 +1181,7 @@ "207": "正在執行路徑替換 [%d/%d]", "208": "正在上傳索引列表...", "209": "正在上傳校驗索引...", - "210": "正在校驗雲端數據...", + "210": "正在校驗雲端數據 %v/%v", "211": "校驗雲端數據完畢" } } diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index ebd347110..2b60bcf4c 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1181,7 +1181,7 @@ "207": "正在执行路径替换 [%d/%d]", "208": "正在上传索引列表...", "209": "正在上传校验索引...", - "210": "正在校验云端数据...", + "210": "正在校验云端数据 %v/%v", "211": "校验云端数据完毕" } } diff --git a/kernel/go.mod b/kernel/go.mod index 8fb9a2166..203b7985c 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-20230702101323-2a55476441bf + github.com/siyuan-note/dejavu v0.0.0-20230702122455-7036de48132f 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 4d92c8bb1..a2c70c9ef 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-20230702101323-2a55476441bf h1:sWIzjAQBkm59Vxzo3GFZZfsoU/BkvMrPx7sW+8Qj4zI= -github.com/siyuan-note/dejavu v0.0.0-20230702101323-2a55476441bf/go.mod h1:GxekubylJpkSt5Y29ecxNxjpKusPov+07mM1rsPtk+g= +github.com/siyuan-note/dejavu v0.0.0-20230702122455-7036de48132f h1:ez8MBa0kItf6jSemaorkOXIS2hBia5v2yRjVx1qUSUE= +github.com/siyuan-note/dejavu v0.0.0-20230702122455-7036de48132f/go.mod h1:GxekubylJpkSt5Y29ecxNxjpKusPov+07mM1rsPtk+g= 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/repository.go b/kernel/model/repository.go index b5cba0f38..4c9e3f54b 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -1657,8 +1657,8 @@ func subscribeRepoEvents() { util.SetBootDetails(msg) util.ContextPushMsg(context, msg) }) - eventbus.Subscribe(eventbus.EvtCloudBeforeFixObjects, func(context map[string]interface{}) { - msg := fmt.Sprintf(Conf.Language(210)) + eventbus.Subscribe(eventbus.EvtCloudBeforeFixObjects, func(context map[string]interface{}, count, total int) { + msg := fmt.Sprintf(Conf.Language(210), count, total) util.SetBootDetails(msg) util.ContextPushMsg(context, msg) })