From 6e5278db668d14c10fb5bdede52b24156cba95be Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 6 Jul 2022 15:46:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?:art:=20=E5=85=AC=E6=B5=8B=E4=BA=91?= =?UTF-8?q?=E7=AB=AF=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E4=BB=93=E5=BA=93?= =?UTF-8?q?=20https://github.com/siyuan-note/siyuan/issues/5337?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/appearance/langs/en_US.json | 3 ++- app/appearance/langs/es_ES.json | 3 ++- app/appearance/langs/fr_FR.json | 3 ++- app/appearance/langs/zh_CHT.json | 3 ++- app/appearance/langs/zh_CN.json | 3 ++- kernel/model/repository.go | 4 ++++ 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 74348212c..695a7c49d 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -923,6 +923,7 @@ "150": "Uploaded/Downloaded files %d/%d\nUploaded/Downloaded chunks %d/%d\nSent/Received bytes %s/%s", "151": "Do not include symbols \\ / : * ? " ' < > |", "152": "Uploaded files %d, chunks %d, sent bytes %s", - "153": "Downloaded files %d, chunks %d, received bytes %s" + "153": "Downloaded files %d, chunks %d, received bytes %s", + "154": "The cloud can only support backup up to 12 snapshots" } } diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 027a6d0c2..285ceec46 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -923,6 +923,7 @@ "150": "Archivos cargados/descargados %d/%d\nFragmentos cargados/descargados %d/%d\nBytes enviados/recibidos %s/%s", "151": "No incluir símbolos \\ / : * ? " ' < > |", "152": "Archivos cargados %d, fragmentos %d, bytes enviados %s", - "153": "Archivos descargados %d, fragmentos %d, bytes recibidos %s" + "153": "Archivos descargados %d, fragmentos %d, bytes recibidos %s", + "154": "La nube solo admite copias de seguridad de hasta 12 instantáneas" } } diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index cc784f530..655463084 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -923,6 +923,7 @@ "150": "Fichiers chargés/téléchargés %d/%d\nMorceaux chargés/téléchargés %d/%d\nOctets envoyés/reçus %s/%s", "151": "Ne pas inclure les symboles \\ / : * ? " ' < > |", "152": "Fichiers téléchargés %d, morceaux %d, octets envoyés %s", - "153": "Fichiers chargés %d, morceaux %d, octets reçus %s" + "153": "Fichiers chargés %d, morceaux %d, octets reçus %s", + "154": "Le cloud ne peut prendre en charge que la sauvegarde jusqu'à 12 instantanés" } } diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 796732bc1..efd60c8ad 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -922,6 +922,7 @@ "150": "上傳/下載文件數 %d/%d\n上傳/下載分塊數 %d/%d\n發送/接收字節數 %s/%s", "151": "請勿包含符號 \\ / : * ? " ' < > |", "152": "上傳文件數 %d 上傳分塊數 %d 發送字節數 %s", - "153": "下載文件數 %d 下載分塊數 %d 接收字節數 %s" + "153": "下載文件數 %d 下載分塊數 %d 接收字節數 %s", + "154": "雲端最多只能支持備份 12 個快照" } } diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index c9ec169cf..43b886ed1 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -924,6 +924,7 @@ "150": "上传/下载文件数 %d/%d\n上传/下载分块数 %d/%d\n发送/接收字节数 %s/%s", "151": "请勿包含符号 \\ / : * ? " ' < > |", "152": "上传文件数 %d 上传分块数 %d 发送字节数 %s", - "153": "下载文件数 %d 下载分块数 %d 接收字节数 %s" + "153": "下载文件数 %d 下载分块数 %d 接收字节数 %s", + "154": "云端最多只能支持备份 12 个快照" } } diff --git a/kernel/model/repository.go b/kernel/model/repository.go index 5af4c8818..c88bcb653 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -238,6 +238,10 @@ func UploadCloudSnapshot(tag, id string) (err error) { defer util.PushClearProgress() uploadFileCount, uploadChunkCount, uploadBytes, err := repo.UploadTagIndex(tag, id, cloudInfo, map[string]interface{}{CtxPushMsg: CtxPushMsgToStatusBarAndProgress}) if nil != err { + if errors.Is(err, dejavu.ErrCloudBackupCountExceeded) { + + } + return } msg := fmt.Sprintf(Conf.Language(152), uploadFileCount, uploadChunkCount, byteCountSI(uploadBytes)) From f4b429bd278d79593ff34fd79e66cfa585f84476 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 6 Jul 2022 15:47:09 +0800 Subject: [PATCH 2/4] =?UTF-8?q?:art:=20=E5=85=AC=E6=B5=8B=E4=BA=91?= =?UTF-8?q?=E7=AB=AF=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E4=BB=93=E5=BA=93?= =?UTF-8?q?=20https://github.com/siyuan-note/siyuan/issues/5337?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/repository.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kernel/model/repository.go b/kernel/model/repository.go index c88bcb653..a823398ff 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -239,9 +239,8 @@ func UploadCloudSnapshot(tag, id string) (err error) { uploadFileCount, uploadChunkCount, uploadBytes, err := repo.UploadTagIndex(tag, id, cloudInfo, map[string]interface{}{CtxPushMsg: CtxPushMsgToStatusBarAndProgress}) if nil != err { if errors.Is(err, dejavu.ErrCloudBackupCountExceeded) { - + err = errors.New(Conf.Language(154)) } - return } msg := fmt.Sprintf(Conf.Language(152), uploadFileCount, uploadChunkCount, byteCountSI(uploadBytes)) From d2cd5b11f5ad16460a80c3099027aa25acd36f86 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 6 Jul 2022 15:52:41 +0800 Subject: [PATCH 3/4] :bookmark: Release v2.0.26-alpha1 --- app/package.json | 2 +- kernel/util/working.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/package.json b/app/package.json index 97bf36eac..e0e297516 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "SiYuan", - "version": "2.0.25", + "version": "2.0.26-alpha1", "description": "A local-first personal knowledge management system, supports fine-grained block-level reference, and Markdown WYSIWYG.", "homepage": "https://b3log.org/siyuan", "main": "./electron/main.js", diff --git a/kernel/util/working.go b/kernel/util/working.go index af9aa1c2b..025376567 100644 --- a/kernel/util/working.go +++ b/kernel/util/working.go @@ -40,8 +40,8 @@ import ( var Mode = "prod" const ( - Ver = "2.0.25" - IsInsider = false + Ver = "2.0.26-alpha1" + IsInsider = true ) var ( From 0c686de76450439ffe4126118e8ad62b97350ecb Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 6 Jul 2022 15:56:48 +0800 Subject: [PATCH 4/4] :bookmark: Release v2.0.26-alpha1 --- README.md | 1 + README_zh_CN.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 15781b771..9ab2ae35f 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,7 @@ Cloud services require a paid subscription. * VIP identity * End-to-end encrypted data synchronization +* End-to-end encrypted data backup * Cloud assets serving * WeChat notification * Cloud inbox diff --git a/README_zh_CN.md b/README_zh_CN.md index 75f783e5b..662ade084 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -74,6 +74,7 @@ * 尊贵身份标识 * 端到端加密数据同步 +* 端到端加密数据备份 * 云端图床服务 * 定时微信提醒 * 云端收集箱