From 40bbc6cc98b1c5ec295e188b47b774ca689434d2 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 30 Dec 2022 01:07:07 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E9=81=BF=E5=85=8D=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E6=97=B6=E9=87=8D=E5=A4=8D=E5=85=A8=E9=87=8F=E9=87=8D=E5=BB=BA?= =?UTF-8?q?=E7=B4=A2=E5=BC=95=20Fix=20https://github.com/siyuan-note/siyua?= =?UTF-8?q?n/issues/6950?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/box.go | 2 +- kernel/model/conf.go | 4 ++-- kernel/model/mount.go | 2 +- kernel/treenode/blocktree.go | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel/model/box.go b/kernel/model/box.go index f8a495525..a3347080d 100644 --- a/kernel/model/box.go +++ b/kernel/model/box.go @@ -562,7 +562,7 @@ func FullReindex() { openedBox.Index(true) } IndexRefs() - treenode.SaveBlockTree() + treenode.SaveBlockTree(true) InitFlashcards() util.PushEndlessProgress(Conf.Language(58)) diff --git a/kernel/model/conf.go b/kernel/model/conf.go index f96109f80..59e156322 100644 --- a/kernel/model/conf.go +++ b/kernel/model/conf.go @@ -424,7 +424,7 @@ func Close(force bool, execInstallPkg int) (exitCode int) { Conf.Close() sql.CloseDatabase() - treenode.SaveBlockTree() + treenode.SaveBlockTree(false) clearWorkspaceTemp() clearPortJSON() util.UnlockWorkspace() @@ -601,7 +601,7 @@ func InitBoxes() { } if !initialized { - treenode.SaveBlockTree() + treenode.SaveBlockTree(true) } var dbSize string diff --git a/kernel/model/mount.go b/kernel/model/mount.go index ad35cebda..a3c72b5e0 100644 --- a/kernel/model/mount.go +++ b/kernel/model/mount.go @@ -199,7 +199,7 @@ func Mount(boxID string) (alreadyMount bool, err error) { IndexRefs() // 缓存根一级的文档树展开 ListDocTree(box.ID, "/", Conf.FileTree.Sort) - treenode.SaveBlockTree() + treenode.SaveBlockTree(false) util.ClearPushProgress(100) if reMountGuide { return true, nil diff --git a/kernel/treenode/blocktree.go b/kernel/treenode/blocktree.go index bae71b186..de5bc4ef8 100644 --- a/kernel/treenode/blocktree.go +++ b/kernel/treenode/blocktree.go @@ -259,7 +259,7 @@ func IndexBlockTree(tree *parse.Tree) { func AutoFlushBlockTree() { for { - SaveBlockTree() + SaveBlockTree(false) time.Sleep(7 * time.Second) } } @@ -307,8 +307,8 @@ func InitBlockTree(force bool) { return } -func SaveBlockTree() { - if !blockTreesChanged { +func SaveBlockTree(force bool) { + if !force && !blockTreesChanged { return }