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

🎨 The data history of a database view should follow the doc history and data snapshot https://github.com/siyuan-note/siyuan/issues/9567

Browse source
This commit is contained in:
Daniel 2023-11-23 11:22:35 +08:00
parent 4ca62ef701
commit bf6ff5bc32
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
5 changed files with 119 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
kernel/model/history.go
View file

@ -464,6 +464,7 @@ func (box *Box) generateDocHistory0() {
return
}
luteEngine := util.NewLute()
for _, file := range files {
historyPath := filepath.Join(historyDir, box.ID, strings.TrimPrefix(file, filepath.Join(util.DataDir, box.ID)))
if err = os.MkdirAll(filepath.Dir(historyPath), 0755); nil != err {
@ -481,6 +482,23 @@ func (box *Box) generateDocHistory0() {
logging.LogErrorf("generate history failed: %s", err)
return
}
if strings.HasSuffix(file, ".sy") {
tree, loadErr := loadTree(file, luteEngine)
if nil != loadErr {
logging.LogErrorf("load tree [%s] failed: %s", file, loadErr)
} else {
// 关联的属性视图也要复制到历史中 https://github.com/siyuan-note/siyuan/issues/9567
avNodes := tree.Root.ChildrenByType(ast.NodeAttributeView)
for _, avNode := range avNodes {
srcAvPath := filepath.Join(util.DataDir, "storage", "av", avNode.AttributeViewID+".json")
destAvPath := filepath.Join(historyDir, "storage", "av", avNode.AttributeViewID+".json")
if copyErr := filelock.Copy(srcAvPath, destAvPath); nil != copyErr {
logging.LogErrorf("copy av [%s] failed: %s", srcAvPath, copyErr)
}
}
}
}
}
indexHistoryDir(filepath.Base(historyDir), util.NewLute())
@ -544,7 +562,7 @@ func (box *Box) recentModifiedDocs() (ret []string) {
}
if info.ModTime().After(latestHistoryTime) {
ret = append(ret, filepath.Join(path))
ret = append(ret, path)
}
return nil
})