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

🐛 Improve performance of exporting .sy.zip for notebook https://github.com/siyuan-note/siyuan/issues/12653

Browse source
This commit is contained in:
Daniel 2024-10-17 23:02:27 +08:00
parent d1851255af
commit e70a0506cf
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
kernel/model/export.go
View file

@ -1540,6 +1540,7 @@ func exportSYZip(boxID, rootDirPath, baseFolderName string, docPaths []string) (
trees := map[string]*parse.Tree{} trees := map[string]*parse.Tree{}
refTrees := map[string]*parse.Tree{} refTrees := map[string]*parse.Tree{}
treeCache := map[string]*parse.Tree{}
for i, p := range docPaths { for i, p := range docPaths {
docIAL := box.docIAL(p) docIAL := box.docIAL(p)
if nil == docIAL { if nil == docIAL {
@ -1556,7 +1557,8 @@ func exportSYZip(boxID, rootDirPath, baseFolderName string, docPaths []string) (
} }
trees[tree.ID] = tree trees[tree.ID] = tree
refs := exportRefTrees(tree, trees) refs := map[string]*parse.Tree{}
exportRefTrees(tree, &refs, &treeCache)
for refTreeID, refTree := range refs { for refTreeID, refTree := range refs {
if nil == trees[refTreeID] { if nil == trees[refTreeID] {
refTrees[refTreeID] = refTree refTrees[refTreeID] = refTree
@ -2733,13 +2735,7 @@ type refAsFootnotes struct {
refAnchorText string refAnchorText string
} }
func exportRefTrees(tree *parse.Tree, treeCache map[string]*parse.Tree) (ret map[string]*parse.Tree) { func exportRefTrees(tree *parse.Tree, retTrees *map[string]*parse.Tree, treeCache *map[string]*parse.Tree) {
ret = map[string]*parse.Tree{}
exportRefTrees0(tree, &ret, treeCache)
return
}
func exportRefTrees0(tree *parse.Tree, retTrees *map[string]*parse.Tree, treeCache map[string]*parse.Tree) {
if nil != (*retTrees)[tree.ID] { if nil != (*retTrees)[tree.ID] {
return return
} }
@ -2762,17 +2758,17 @@ func exportRefTrees0(tree *parse.Tree, retTrees *map[string]*parse.Tree, treeCac
var defTree *parse.Tree var defTree *parse.Tree
var err error var err error
if treeCache[defBlock.RootID] != nil { if (*treeCache)[defBlock.RootID] != nil {
defTree = treeCache[defBlock.RootID] defTree = (*treeCache)[defBlock.RootID]
} else { } else {
defTree, err = LoadTreeByBlockID(defBlock.RootID) defTree, err = LoadTreeByBlockID(defBlock.RootID)
if err != nil { if err != nil {
return ast.WalkSkipChildren return ast.WalkSkipChildren
} }
treeCache[defBlock.RootID] = defTree (*treeCache)[defBlock.RootID] = defTree
} }
exportRefTrees0(defTree, retTrees, treeCache) exportRefTrees(defTree, retTrees, treeCache)
} else if ast.NodeAttributeView == n.Type { } else if ast.NodeAttributeView == n.Type {
// 导出数据库所在文档时一并导出绑定块所在文档 // 导出数据库所在文档时一并导出绑定块所在文档
// Export the binding block docs when exporting the doc where the database is located https://github.com/siyuan-note/siyuan/issues/11486 // Export the binding block docs when exporting the doc where the database is located https://github.com/siyuan-note/siyuan/issues/11486
@ -2800,17 +2796,17 @@ func exportRefTrees0(tree *parse.Tree, retTrees *map[string]*parse.Tree, treeCac
var defTree *parse.Tree var defTree *parse.Tree
var err error var err error
if treeCache[defBlock.RootID] != nil { if (*treeCache)[defBlock.RootID] != nil {
defTree = treeCache[defBlock.RootID] defTree = (*treeCache)[defBlock.RootID]
} else { } else {
defTree, err = LoadTreeByBlockID(defBlock.RootID) defTree, err = LoadTreeByBlockID(defBlock.RootID)
if err != nil { if err != nil {
continue continue
} }
treeCache[defBlock.RootID] = defTree (*treeCache)[defBlock.RootID] = defTree
} }
exportRefTrees0(defTree, retTrees, treeCache) exportRefTrees(defTree, retTrees, treeCache)
} }
} }
return ast.WalkContinue return ast.WalkContinue