Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 15:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Generate file history before converting doc to heading/moving blocks https://github.com/siyuan-note/siyuan/issues/14359

Browse source
This commit is contained in:
Daniel 2025-03-15 17:28:28 +08:00
parent b3dbcec3cc
commit 79bf9a7b61
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
kernel/model/history.go
View file

@ -239,7 +239,7 @@ func RollbackDocHistory(boxID, historyPath string) (err error) {
var destPath, parentHPath string var destPath, parentHPath string
rootID := util.GetTreeID(historyPath) rootID := util.GetTreeID(historyPath)
workingDoc := treenode.GetBlockTree(rootID) workingDoc := treenode.GetBlockTree(rootID)
if nil != workingDoc { if nil != workingDoc && "d" == workingDoc.Type {
if err = filelock.Remove(filepath.Join(util.DataDir, boxID, workingDoc.Path)); err != nil { if err = filelock.Remove(filepath.Join(util.DataDir, boxID, workingDoc.Path)); err != nil {
return return
} }
@ -304,7 +304,12 @@ func RollbackDocHistory(boxID, historyPath string) (err error) {
} }
} }
for _, nodeID := range duplicatedIDs { for _, nodeID := range duplicatedIDs {
treenode.ResetNodeID(nodes[nodeID]) node := nodes[nodeID]
treenode.ResetNodeID(node)
if ast.NodeDocument == node.Type {
tree.ID = node.ID
tree.Path = tree.Path[:strings.LastIndex(tree.Path, "/")] + "/" + node.ID + ".sy"
}
} }
// 仅重新索引该文档，不进行全量索引 // 仅重新索引该文档，不进行全量索引