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

🎨 Data sync supports the multi-kernel online perception https://github.com/siyuan-note/siyuan/issues/8518

Browse source
This commit is contained in:
Daniel 2023-06-12 18:48:39 +08:00
parent 2fcdab8d14
commit 18985de1e5
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kernel/model/repository.go
View file

@ -50,7 +50,6 @@ import (
"github.com/siyuan-note/siyuan/kernel/cache"
"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"
@ -1299,14 +1298,12 @@ func processSyncMergeResult(exit, byHand bool, start time.Time, mergeResult *dej
upsertRootIDs, removeRootIDs := incReindex(upserts, removes)
elapsed := time.Since(start)
go func() {
sql.WaitForWritingDatabase()
util.WaitForUILoaded()
if util.ContainerAndroid == util.Container || util.ContainerIOS == util.Container {
// 移动端不推送差异详情
upsertRootIDs = []string{}
}
util.WaitForUILoaded()
util.BroadcastByType("main", "syncMergeResult", 0, "",
map[string]interface{}{"upsertRootIDs": upsertRootIDs, "removeRootIDs": removeRootIDs})