Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-01 06:18:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🧑‍💻 siyuan-note#12718 (#12723)

Browse source
This commit is contained in:
Misuzu2027 2024-10-07 18:42:01 +08:00 • committed by GitHub
parent f965d6b91b
commit 7afea33d36
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 157 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

67
kernel/filesys/tree.go
View file

@ -21,10 +21,6 @@ import (
"encoding/json"
"errors"
"fmt"
"os"
"path/filepath"
"strings"
"github.com/88250/lute"
"github.com/88250/lute/parse"
"github.com/88250/lute/render"
@ -34,23 +30,39 @@ import (
"github.com/siyuan-note/siyuan/kernel/cache"
"github.com/siyuan-note/siyuan/kernel/treenode"
"github.com/siyuan-note/siyuan/kernel/util"
"os"
"path/filepath"
"strings"
"sync"
)
func LoadTrees(ids []string) (ret map[string]*parse.Tree) {
ret, tmpCache := map[string]*parse.Tree{}, map[string]*parse.Tree{}
ret = map[string]*parse.Tree{}
bts := treenode.GetBlockTrees(ids)
luteEngine := util.NewLute()
for id, bt := range bts {
tree := tmpCache[bt.RootID]
if nil == tree {
tree, _ = LoadTree(bt.BoxID, bt.Path, luteEngine)
if nil == tree {
logging.LogWarnf("load tree [%s] failed: %s", id, bt.Path)
continue
}
tmpCache[bt.RootID] = tree
var boxIDs []string
var paths []string
seen := make(map[string]bool)
for _, bt := range bts {
key := bt.BoxID + bt.Path
if !seen[key] {
seen[key] = true
boxIDs = append(boxIDs, bt.BoxID)
paths = append(paths, bt.Path)
}
ret[id] = tree
}
trees, errs := BatchLoadTrees(boxIDs, paths, luteEngine)
for i := range trees {
tree := trees[i]
err := errs[i]
if err != nil || tree == nil {
logging.LogErrorf("load tree failed: %s", err)
continue
}
ret[tree.ID] = tree
}
return
}
@ -67,6 +79,31 @@ func LoadTree(boxID, p string, luteEngine *lute.Lute) (ret *parse.Tree, err erro
return
}
func BatchLoadTrees(boxIDs, paths []string, luteEngine *lute.Lute) ([]*parse.Tree, []error) {
var wg sync.WaitGroup
results := make([]*parse.Tree, len(paths))
errors := make([]error, len(paths))
for i := range paths {
wg.Add(1)
go func(i int) {
defer wg.Done()
boxID := boxIDs[i]
path := paths[i]
tree, err := LoadTree(boxID, path, luteEngine)
results[i] = tree
errors[i] = err
}(i)
}
wg.Wait()
return results, errors
}
func LoadTreeByData(data []byte, boxID, p string, luteEngine *lute.Lute) (ret *parse.Tree, err error) {
ret = parseJSON2Tree(boxID, p, data, luteEngine)
if nil == ret {