From 67ffbc995afc28e5e38a27a44210608d7f567799 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Mon, 4 Jul 2022 22:23:30 +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/model/sync.go | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/kernel/model/sync.go b/kernel/model/sync.go index 59cf142b9..79197f7f3 100644 --- a/kernel/model/sync.go +++ b/kernel/model/sync.go @@ -436,6 +436,9 @@ func clearEmptyDirs(dir string) { // incReindex 增量重建索引。 func incReindex(upserts, removes []string) { + needPushUpsertProgress := 32 < len(upserts) + needPushRemoveProgress := 32 < len(removes) + for _, upsertFile := range upserts { if !strings.HasSuffix(upsertFile, ".sy") { continue @@ -453,7 +456,11 @@ func incReindex(upserts, removes []string) { } treenode.ReindexBlockTree(tree) sql.UpsertTreeQueue(tree) - //util.LogInfof("sync index tree [%s]", tree.ID) + msg := fmt.Sprintf("Sync reindex tree [%s]", tree.ID) + util.PushStatusBar(msg) + if needPushUpsertProgress { + util.PushEndlessProgress(msg) + } } for _, removeFile := range removes { if !strings.HasSuffix(removeFile, ".sy") { @@ -465,9 +472,17 @@ func incReindex(upserts, removes []string) { if nil != block { treenode.RemoveBlockTreesByRootID(block.RootID) sql.RemoveTreeQueue(block.BoxID, block.RootID) - //util.LogInfof("sync remove tree [%s]", block.RootID) + msg := fmt.Sprintf("Sync remove tree [%s]", block.RootID) + util.PushStatusBar(msg) + if needPushRemoveProgress { + util.PushEndlessProgress(msg) + } } } + + if needPushRemoveProgress || needPushUpsertProgress { + util.PushClearProgress() + } } func SetCloudSyncDir(name string) {