From 76a4915408c30facbee47b00f3d3b69c229e8cb4 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Tue, 5 Jul 2022 23:49:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:sparkles:=20=E6=95=B0=E6=8D=AE=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E6=94=AF=E6=8C=81=E4=BA=91=E7=AB=AF=E5=A4=87=E4=BB=BD?= =?UTF-8?q?=20https://github.com/siyuan-note/siyuan/issues/5336?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/repository.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel/model/repository.go b/kernel/model/repository.go index 071cffd86..9cd1a6ce2 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -212,7 +212,9 @@ func DownloadCloudSnapshot(tag, id string) (err error) { return } util.PushClearProgress() - util.PushMsg(fmt.Sprintf(Conf.Language(153), downloadFileCount, downloadChunkCount, byteCountSI(downloadBytes)), 5000) + msg := fmt.Sprintf(Conf.Language(153), downloadFileCount, downloadChunkCount, byteCountSI(downloadBytes)) + util.PushMsg(msg, 5000) + util.PushStatusBar(msg) return } @@ -237,7 +239,9 @@ func UploadCloudSnapshot(tag, id string) (err error) { return } util.PushClearProgress() - util.PushMsg(fmt.Sprintf(Conf.Language(152), uploadFileCount, uploadChunkCount, byteCountSI(uploadBytes)), 5000) + msg := fmt.Sprintf(Conf.Language(152), uploadFileCount, uploadChunkCount, byteCountSI(uploadBytes)) + util.PushMsg(msg, 5000) + util.PushStatusBar(msg) return } From 65e72321801129a9dbd23c751f6d7a9163f18c91 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Tue, 5 Jul 2022 23:57:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:art:=20=E5=90=AF=E5=8A=A8=E6=97=B6?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BF=A1=E6=81=AF=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/api/sync.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/api/sync.go b/kernel/api/sync.go index 047720f5d..ecdbb542b 100644 --- a/kernel/api/sync.go +++ b/kernel/api/sync.go @@ -42,7 +42,7 @@ func getBootSync(c *gin.Context) { ret := gulu.Ret.NewResult() defer c.JSON(http.StatusOK, ret) - if 1 == model.BootSyncSucc { + if model.Conf.Sync.Enabled && 1 == model.BootSyncSucc { ret.Code = 1 ret.Msg = model.Conf.Language(17) return