Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-08 01:38:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 The interface is no longer reloaded after data synchronization https://github.com/siyuan-note/siyuan/issues/8098

Browse source
This commit is contained in:
Liang Ding 2023-05-01 15:28:12 +08:00
parent 3d0b3c5ac9
commit 5779bc14f6
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
kernel/model/repository.go
View file

@ -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
}