mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-02-28 05:32:52 +00:00
🎨 Prevent syncMergeResult push nil
This commit is contained in:
@@ -279,6 +279,13 @@ func incReindex(upserts, removes []string) (upsertRootIDs, removeRootIDs []strin
|
||||
util.IncBootProgress(3, "Sync reindexing...")
|
||||
removeRootIDs = removeIndexes(removes) // 先执行 remove,否则移动文档时 upsert 会被忽略,导致未被索引
|
||||
upsertRootIDs = upsertIndexes(upserts)
|
||||
|
||||
if 1 > len(removeRootIDs) {
|
||||
removeRootIDs = []string{}
|
||||
}
|
||||
if 1 > len(upsertRootIDs) {
|
||||
upsertRootIDs = []string{}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
@@ -301,6 +308,10 @@ func removeIndexes(removeFilePaths []string) (removeRootIDs []string) {
|
||||
sql.RemoveTreeQueue(block.BoxID, block.RootID)
|
||||
}
|
||||
}
|
||||
|
||||
if 1 > len(removeRootIDs) {
|
||||
removeRootIDs = []string{}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
@@ -336,6 +347,10 @@ func upsertIndexes(upsertFilePaths []string) (upsertRootIDs []string) {
|
||||
sql.UpsertTreeQueue(tree)
|
||||
upsertRootIDs = append(upsertRootIDs, tree.Root.ID)
|
||||
}
|
||||
|
||||
if 1 > len(upsertRootIDs) {
|
||||
upsertRootIDs = []string{}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user