From 5779bc14f6d5ec5244fc54ac25f258d9869e1b13 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Mon, 1 May 2023 15:28:12 +0800 Subject: [PATCH] :art: The interface is no longer reloaded after data synchronization https://github.com/siyuan-note/siyuan/issues/8098 --- kernel/model/repository.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/kernel/model/repository.go b/kernel/model/repository.go index 4d1e182b7..46284fe01 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -1193,7 +1193,7 @@ func processSyncMergeResult(exit, byHand bool, start time.Time, mergeResult *dej // 有数据变更,需要重建索引 var upserts, removes []string var upsertTrees int - var needReloadFlashcard, needReloadOcrTexts bool + var needReloadFlashcard, needReloadOcrTexts, needReloadFiletree bool for _, file := range mergeResult.Upserts { upserts = append(upserts, file.Path) if strings.HasPrefix(file.Path, "/storage/riff/") { @@ -1204,6 +1204,10 @@ func processSyncMergeResult(exit, byHand bool, start time.Time, mergeResult *dej needReloadOcrTexts = true } + if strings.HasSuffix(file.Path, "/.siyuan/conf.json") { + needReloadFiletree = true + } + if strings.HasSuffix(file.Path, ".sy") { upsertTrees++ } @@ -1217,6 +1221,10 @@ func processSyncMergeResult(exit, byHand bool, start time.Time, mergeResult *dej if strings.HasPrefix(file.Path, "/data/assets/ocr-texts.json") { needReloadOcrTexts = true } + + if strings.HasSuffix(file.Path, "/.siyuan/conf.json") { + needReloadFiletree = true + } } if needReloadFlashcard { @@ -1236,6 +1244,10 @@ func processSyncMergeResult(exit, byHand bool, start time.Time, mergeResult *dej return } + if needReloadFiletree { + util.BroadcastByType("filetree", "reloadFiletree", 0, "", nil) + } + if exit { // 退出时同步不用推送事件 return }