From 2f57e57b920dee2f0b278fba9abb2832d171ad53 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 30 Jul 2025 11:10:26 +0800 Subject: [PATCH] :art: Improve status bar index creation information prompt https://github.com/siyuan-note/siyuan/issues/15390 --- kernel/model/box.go | 7 +++++++ kernel/model/index.go | 6 ++++++ kernel/model/repository.go | 9 +-------- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/kernel/model/box.go b/kernel/model/box.go index b38b1a6b7..2261f5378 100644 --- a/kernel/model/box.go +++ b/kernel/model/box.go @@ -676,7 +676,14 @@ func FullReindex() { task.AppendTask(task.ReloadUI, util.ReloadUI) } +var fullReindexing bool + func fullReindex() { + fullReindexing = true + defer func() { + fullReindexing = false + }() + util.PushEndlessProgress(Conf.language(35)) defer util.PushClearProgress() diff --git a/kernel/model/index.go b/kernel/model/index.go index c9721623b..fba733b61 100644 --- a/kernel/model/index.go +++ b/kernel/model/index.go @@ -368,6 +368,12 @@ func subscribeSQLEvents() { // util.ContextPushMsg(context, msg) //}) eventbus.Subscribe(eventbus.EvtSQLInsertBlocksFTS, func(context map[string]interface{}, blockCount int, hash string) { + if !fullReindexing { + // 如果不是全量重建索引,则不显示进度信息 + // Improve status bar index creation information prompt https://github.com/siyuan-note/siyuan/issues/15390 + return + } + current := context["current"].(int) total := context["total"] msg := fmt.Sprintf(Conf.Language(90), current, total, blockCount, hash) diff --git a/kernel/model/repository.go b/kernel/model/repository.go index d0c01eb79..b84b468f5 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -54,7 +54,6 @@ import ( "github.com/siyuan-note/logging" "github.com/siyuan-note/siyuan/kernel/conf" "github.com/siyuan-note/siyuan/kernel/filesys" - "github.com/siyuan-note/siyuan/kernel/sql" "github.com/siyuan-note/siyuan/kernel/task" "github.com/siyuan-note/siyuan/kernel/treenode" "github.com/siyuan-note/siyuan/kernel/util" @@ -772,13 +771,7 @@ func checkoutRepo(id string) { return } - task.AppendTask(task.DatabaseIndexFull, fullReindex) - task.AppendTask(task.DatabaseIndexRef, IndexRefs) - go func() { - sql.FlushQueue() - ResetVirtualBlockRefCache() - }() - task.AppendTask(task.ReloadUI, util.ReloadUIResetScroll) + FullReindex() if syncEnabled { task.AppendAsyncTaskWithDelay(task.PushMsg, 7*time.Second, util.PushMsg, Conf.Language(134), 0)