From 500b0b852a01d7fbf3610f336a0d6e216f136d02 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 6 Jul 2022 15:42:42 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E5=85=AC=E6=B5=8B=E4=BA=91=E7=AB=AF?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E4=BB=93=E5=BA=93=20https:?= =?UTF-8?q?//github.com/siyuan-note/siyuan/issues/5337?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/go.mod | 2 +- kernel/go.sum | 2 ++ kernel/model/repository.go | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel/go.mod b/kernel/go.mod index 2f311fb67..035423f62 100644 --- a/kernel/go.mod +++ b/kernel/go.mod @@ -40,7 +40,7 @@ require ( github.com/qiniu/go-sdk/v7 v7.13.0 github.com/radovskyb/watcher v1.0.7 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 - github.com/siyuan-note/dejavu v0.0.0-20220706072418-8021418aa8fb + github.com/siyuan-note/dejavu v0.0.0-20220706073837-ba878f02864c github.com/siyuan-note/encryption v0.0.0-20220612074546-f1dd94fe8676 github.com/siyuan-note/eventbus v0.0.0-20220624162334-ca7c06dc771f github.com/siyuan-note/filelock v0.0.0-20220704090116-54dfb035283f diff --git a/kernel/go.sum b/kernel/go.sum index 1cfb90bce..a2feb9dd8 100644 --- a/kernel/go.sum +++ b/kernel/go.sum @@ -423,6 +423,8 @@ github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJV github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/siyuan-note/dejavu v0.0.0-20220706072418-8021418aa8fb h1:YgWLET2Wjtiu0idoxj0Sqk9HNwN/nCZo47YuR4C8zBA= github.com/siyuan-note/dejavu v0.0.0-20220706072418-8021418aa8fb/go.mod h1:ral+X0pNW6nSQVvIcxllUXSczCaY4UOCT2iGlO4YNg0= +github.com/siyuan-note/dejavu v0.0.0-20220706073837-ba878f02864c h1:Jo7LvzIJNM64e+w6js200O0YxnTI2eRK6ILkSiHYRmk= +github.com/siyuan-note/dejavu v0.0.0-20220706073837-ba878f02864c/go.mod h1:ral+X0pNW6nSQVvIcxllUXSczCaY4UOCT2iGlO4YNg0= github.com/siyuan-note/encryption v0.0.0-20220612074546-f1dd94fe8676 h1:QB9TjJQFhXhZ6dAtPpY02DlzHAQm1C+WqZq6OadG8mI= github.com/siyuan-note/encryption v0.0.0-20220612074546-f1dd94fe8676/go.mod h1:H8fyqqAbp9XreANjeSbc72zEdFfKTXYN34tc1TjZwtw= github.com/siyuan-note/eventbus v0.0.0-20220624162334-ca7c06dc771f h1:JMobMNZ7AqaKKyEK+WeWFhix/2TDQXgPZDajU00IybU= diff --git a/kernel/model/repository.go b/kernel/model/repository.go index 690debab5..5af4c8818 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -234,6 +234,7 @@ func UploadCloudSnapshot(tag, id string) (err error) { return } + util.PushEndlessProgress(Conf.Language(116)) defer util.PushClearProgress() uploadFileCount, uploadChunkCount, uploadBytes, err := repo.UploadTagIndex(tag, id, cloudInfo, map[string]interface{}{CtxPushMsg: CtxPushMsgToStatusBarAndProgress}) if nil != err { @@ -455,7 +456,7 @@ func syncRepo(boot, exit, byHand bool) { if nil != err { util.LogErrorf("sync data repo failed: %s", err) msg := fmt.Sprintf(Conf.Language(80), formatErrorMsg(err)) - if errors.Is(err, dejavu.ErrSyncCloudStorageSizeExceeded) { + if errors.Is(err, dejavu.ErrCloudStorageSizeExceeded) { msg = fmt.Sprintf(Conf.Language(43), byteCountSI(int64(Conf.User.UserSiYuanRepoSize))) } Conf.Sync.Stat = msg