0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2024-08-29 11:52:38 +08:00
commit 604f13b34a
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
kernel/model/history.go
View file

@ -228,7 +228,7 @@ func RollbackDocHistory(boxID, historyPath string) (err error) {
WaitForWritingFiles()
srcPath := historyPath
var destPath string
var destPath, parentHPath string
baseName := filepath.Base(historyPath)
id := strings.TrimSuffix(baseName, ".sy")
@ -239,7 +239,7 @@ func RollbackDocHistory(boxID, historyPath string) (err error) {
}
}
destPath, err = getRollbackDockPath(boxID, historyPath)
destPath, parentHPath, err = getRollbackDockPath(boxID, historyPath)
if nil != err {
return
}
@ -269,7 +269,19 @@ func RollbackDocHistory(boxID, historyPath string) (err error) {
}
}
FullReindex()
tree.Box = boxID
tree.Path = filepath.ToSlash(strings.TrimPrefix(destPath, util.DataDir+string(os.PathSeparator)+boxID))
tree.HPath = parentHPath + "/" + tree.Root.IALAttr("title")
// 仅重新索引该文档，不进行全量索引
// Reindex only the current document after rolling back the document https://github.com/siyuan-note/siyuan/issues/12320
treenode.RemoveBlockTree(id)
treenode.IndexBlockTree(tree)
sql.RemoveTreeQueue(id)
sql.IndexTreeQueue(tree)
util.PushReloadFiletree()
util.PushMsg(Conf.Language(102), 3000)
IncSync()
go func() {
sql.WaitForWritingDatabase()
@ -297,7 +309,7 @@ func RollbackDocHistory(boxID, historyPath string) (err error) {
return nil
}
func getRollbackDockPath(boxID, historyPath string) (destPath string, err error) {
func getRollbackDockPath(boxID, historyPath string) (destPath, parentHPath string, err error) {
baseName := filepath.Base(historyPath)
parentID := strings.TrimSuffix(filepath.Base(filepath.Dir(historyPath)), ".sy")
parentWorkingDoc := treenode.GetBlockTree(parentID)
@ -309,6 +321,7 @@ func getRollbackDockPath(boxID, historyPath string) (destPath string, err error)
return
}
destPath = filepath.Join(parentDir, baseName)
parentHPath = parentWorkingDoc.HPath
} else {
// 父路径如果不是文档，则恢复到笔记本根路径下
destPath = filepath.Join(util.DataDir, boxID, baseName)