Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-19 05:28:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🐛 An issue that caused cloud data corruption https://github.com/siyuan-note/siyuan/issues/9846

Browse source
This commit is contained in:
Daniel 2023-12-09 10:41:32 +08:00
parent 150336dcf5
commit 94077b908b
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
5 changed files with 14 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

11
kernel/model/blockial.go
View file

@ -122,15 +122,8 @@ func setNodeAttrs(node *ast.Node, tree *parse.Tree, nameValues map[string]string
return
}
if 1 == len(nameValues) && "" != nameValues["scroll"] {
// 文档滚动状态不产生同步冲突 https://github.com/siyuan-note/siyuan/issues/6076
if err = indexWriteJSONQueueWithoutChangeTime(tree); nil != err {
return
}
} else {
if err = indexWriteJSONQueue(tree); nil != err {
return
}
if err = indexWriteJSONQueue(tree); nil != err {
return
}
IncSync()

13
kernel/model/file.go
View file

@ -967,24 +967,11 @@ func writeJSONQueue(tree *parse.Tree) (err error) {
return
}
func writeJSONQueueWithoutChangeTime(tree *parse.Tree) (err error) {
if err = filesys.WriteTreeWithoutChangeTime(tree); nil != err {
return
}
sql.UpsertTreeQueue(tree)
return
}
func indexWriteJSONQueue(tree *parse.Tree) (err error) {
treenode.IndexBlockTree(tree)
return writeJSONQueue(tree)
}
func indexWriteJSONQueueWithoutChangeTime(tree *parse.Tree) (err error) {
treenode.IndexBlockTree(tree)
return writeJSONQueueWithoutChangeTime(tree)
}
func renameWriteJSONQueue(tree *parse.Tree) (err error) {
if err = filesys.WriteTree(tree); nil != err {
return