From 81b61600a80ada47139a13d036238321f4c8d09e Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 15 Jun 2023 22:54:12 +0800 Subject: [PATCH] :art: Display data sync progress in the status bar https://github.com/siyuan-note/siyuan/issues/8552 --- app/appearance/langs/en_US.json | 8 +++---- app/appearance/langs/es_ES.json | 8 +++---- app/appearance/langs/fr_FR.json | 8 +++---- app/appearance/langs/zh_CHT.json | 8 +++---- app/appearance/langs/zh_CN.json | 8 +++---- kernel/model/repository.go | 36 ++++++++++++++++---------------- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 01737a3f4..ee4201e28 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1129,12 +1129,12 @@ "162": "Checking out data repo, inserting file %v", "163": "Checking out data repo, deleting file %v", "164": "Downloading data repo snapshot %s", - "165": "Downloading data repo file %v", - "166": "Downloading data repo chunk %v", + "165": "Downloading data repo file %v/%v", + "166": "Downloading data repo chunk %v/%v", "167": "Downloading data repo reference %s", "168": "Uploading data repo snapshot %s", - "169": "Uploading data repo file %v", - "170": "Uploading data repo chunk %v", + "169": "Uploading data repo file %v/%v", + "170": "Uploading data repo chunk %v/%v", "171": "Uploading data repo reference %s", "172": " If you forget the authorization code, you can search
for accessAuthCode in the workspace conf/conf.json", "173": "Please enter the access auth code", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 44a81662e..bbe1e504a 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1129,12 +1129,12 @@ "162": "Revisando el repositorio de datos, insertando el archivo %v", "163": "Revisando el repositorio de datos, eliminando el archivo %v", "164": "Descargando instantánea de repositorio de datos %s", - "165": "Descargando archivo de repositorio de datos %v", - "166": "Descargando parte de repositorio de datos %v", + "165": "Descargando archivo de repositorio de datos %v/%v", + "166": "Descargando parte de repositorio de datos %v/%v", "167": "Descargando referencia de repositorio de datos %s", "168": "Cargando instantánea de repositorio de datos %s", - "169": "Cargando archivo de repositorio de datos %v", - "170": "Cargando fragmento de repositorio de datos %v", + "169": "Cargando archivo de repositorio de datos %v/%v", + "170": "Cargando fragmento de repositorio de datos %v/%v", "171": "Cargando referencia de repositorio de datos %s", "172": "Si olvida el código de autorización, puede buscar accessAuthCode en el archivo
conf/conf.json del espacio de trabajo", "173": "Por favor ingrese el codigo de autorizacion de acceso", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index ceeb952ef..cf40a7d6b 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1129,12 +1129,12 @@ "162": "Vérification du référentiel de données, insertion du fichier %v", "163": "Vérification du référentiel de données, suppression du fichier %v", "164": "Téléchargement du l'instantané du référentiel de données %s", - "165": "Téléchargement du fichier de référentiel de données %v", - "166": "Téléchargement du bloc de dépôt de données %v", + "165": "Téléchargement du fichier de référentiel de données %v/%v", + "166": "Téléchargement du bloc de dépôt de données %v/%v", "167": "Téléchargement de la référence de référentiel de données %s", "168": "Téléchargement de l'instantané du référentiel de données %s", - "169": "Téléchargement du fichier de référentiel de données %v", - "170": "Téléchargement du bloc de dépôt de données %v", + "169": "Téléchargement du fichier de référentiel de données %v/%v", + "170": "Téléchargement du bloc de dépôt de données %v/%v", "171": "Téléchargement de la référence de référentiel de données %s", "172": "Si vous oubliez le code d'autorisation, vous pouvez rechercher accessAuthCode dans le fichier
conf/conf.json de l'espace de travail", "173": "Veuillez entrer le code d'autorisation d'accès", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index f61244406..d580fc8c8 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1129,12 +1129,12 @@ "162": "正在遷出數據倉庫，插入文件 %v", "163": "正在遷出數據倉庫，刪除文件 %v", "164": "正在下載數據倉庫快照 %s", - "165": "正在下載數據倉庫文件 %v", - "166": "正在下載數據倉庫分塊 %v", + "165": "正在下載數據倉庫文件 %v/%v", + "166": "正在下載數據倉庫分塊 %v/%v", "167": "正在下載數據倉庫引用 %s", "168": "正在上傳數據倉庫快照 %s", - "169": "正在上傳數據倉庫文件 %v", - "170": "正在上傳數據倉庫分塊 %v", + "169": "正在上傳數據倉庫文件 %v/%v", + "170": "正在上傳數據倉庫分塊 %v/%v", "171": "正在上傳數據倉庫引用 %s", "172": "如果你忘記了授權碼，可在工作空間
conf/conf.json 中搜索 accessAuthCode", "173": "請輸入訪問授權碼", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 6ec3f8e18..496e929ef 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1131,12 +1131,12 @@ "162": "正在迁出数据仓库，插入文件 %v", "163": "正在迁出数据仓库，删除文件 %v", "164": "正在下载数据仓库快照 %s", - "165": "正在下载数据仓库文件 %v", - "166": "正在下载数据仓库分块 %v", + "165": "正在下载数据仓库文件 %v/%v", + "166": "正在下载数据仓库分块 %v/%v", "167": "正在下载数据仓库引用 %s", "168": "正在上传数据仓库快照 %s", - "169": "正在上传数据仓库文件 %v", - "170": "正在上传数据仓库分块 %v", + "169": "正在上传数据仓库文件 %v/%v", + "170": "正在上传数据仓库分块%v/%v", "171": "正在上传数据仓库引用 %s", "172": "如果你忘记了授权码，可在工作空间
conf/conf.json 中搜索 accessAuthCode", "173": "请输入访问授权码", diff --git a/kernel/model/repository.go b/kernel/model/repository.go index 703c34d38..424be0a9a 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -1573,30 +1573,30 @@ func subscribeRepoEvents() { util.ContextPushMsg(context, msg) }) - eventbus.Subscribe(eventbus.EvtCloudBeforeDownloadFiles, func(context map[string]interface{}, ids []string) { - msg := fmt.Sprintf(Conf.Language(165), len(ids)) + eventbus.Subscribe(eventbus.EvtCloudBeforeDownloadFiles, func(context map[string]interface{}, total int) { + msg := fmt.Sprintf(Conf.Language(165), 0, total) util.SetBootDetails(msg) - bootProgressPart = 10 / float64(len(ids)) + bootProgressPart = 10 / float64(total) util.ContextPushMsg(context, msg) }) downloadFileCount := 0 - eventbus.Subscribe(eventbus.EvtCloudBeforeDownloadFile, func(context map[string]interface{}, id string) { - msg := fmt.Sprintf(Conf.Language(165), id[:7]) + eventbus.Subscribe(eventbus.EvtCloudBeforeDownloadFile, func(context map[string]interface{}, count, total int) { + msg := fmt.Sprintf(Conf.Language(165), count, total) util.IncBootProgress(bootProgressPart, msg) if 0 == downloadFileCount%8 { util.ContextPushMsg(context, msg) } downloadFileCount++ }) - eventbus.Subscribe(eventbus.EvtCloudBeforeDownloadChunks, func(context map[string]interface{}, ids []string) { - msg := fmt.Sprintf(Conf.Language(166), len(ids)) + eventbus.Subscribe(eventbus.EvtCloudBeforeDownloadChunks, func(context map[string]interface{}, total int) { + msg := fmt.Sprintf(Conf.Language(166), 0, total) util.SetBootDetails(msg) - bootProgressPart = 10 / float64(len(ids)) + bootProgressPart = 10 / float64(total) util.ContextPushMsg(context, msg) }) downloadChunkCount := 0 - eventbus.Subscribe(eventbus.EvtCloudBeforeDownloadChunk, func(context map[string]interface{}, id string) { - msg := fmt.Sprintf(Conf.Language(166), id[:7]) + eventbus.Subscribe(eventbus.EvtCloudBeforeDownloadChunk, func(context map[string]interface{}, count, total int) { + msg := fmt.Sprintf(Conf.Language(166), count, total) util.IncBootProgress(bootProgressPart, msg) if 0 == downloadChunkCount%8 { util.ContextPushMsg(context, msg) @@ -1613,28 +1613,28 @@ func subscribeRepoEvents() { util.IncBootProgress(1, msg) util.ContextPushMsg(context, msg) }) - eventbus.Subscribe(eventbus.EvtCloudBeforeUploadFiles, func(context map[string]interface{}, files []*entity.File) { - msg := fmt.Sprintf(Conf.Language(169), len(files)) + eventbus.Subscribe(eventbus.EvtCloudBeforeUploadFiles, func(context map[string]interface{}, total int) { + msg := fmt.Sprintf(Conf.Language(169), 0, total) util.SetBootDetails(msg) util.ContextPushMsg(context, msg) }) uploadFileCount := 0 - eventbus.Subscribe(eventbus.EvtCloudBeforeUploadFile, func(context map[string]interface{}, id string) { - msg := fmt.Sprintf(Conf.Language(169), id[:7]) + eventbus.Subscribe(eventbus.EvtCloudBeforeUploadFile, func(context map[string]interface{}, count, total int) { + msg := fmt.Sprintf(Conf.Language(169), count, total) if 0 == uploadFileCount%8 { util.SetBootDetails(msg) util.ContextPushMsg(context, msg) } uploadFileCount++ }) - eventbus.Subscribe(eventbus.EvtCloudBeforeUploadChunks, func(context map[string]interface{}, ids []string) { - msg := fmt.Sprintf(Conf.Language(170), len(ids)) + eventbus.Subscribe(eventbus.EvtCloudBeforeUploadChunks, func(context map[string]interface{}, total int) { + msg := fmt.Sprintf(Conf.Language(170), 0, total) util.SetBootDetails(msg) util.ContextPushMsg(context, msg) }) uploadChunkCount := 0 - eventbus.Subscribe(eventbus.EvtCloudBeforeUploadChunk, func(context map[string]interface{}, id string) { - msg := fmt.Sprintf(Conf.Language(170), id[:7]) + eventbus.Subscribe(eventbus.EvtCloudBeforeUploadChunk, func(context map[string]interface{}, count, total int) { + msg := fmt.Sprintf(Conf.Language(170), count, total) if 0 == uploadChunkCount%8 { util.SetBootDetails(msg) util.ContextPushMsg(context, msg)