From 6aed85765e11c39ecbeca35815490bed7a151fce Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 5 Jan 2025 22:03:26 +0800 Subject: [PATCH] :art: Clean code --- kernel/filesys/tree.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/kernel/filesys/tree.go b/kernel/filesys/tree.go index fa8015e58..c07615632 100644 --- a/kernel/filesys/tree.go +++ b/kernel/filesys/tree.go @@ -72,18 +72,6 @@ func LoadTrees(ids []string) (ret map[string]*parse.Tree) { return } -func LoadTree(boxID, p string, luteEngine *lute.Lute) (ret *parse.Tree, err error) { - filePath := filepath.Join(util.DataDir, boxID, p) - data, err := filelock.ReadFile(filePath) - if err != nil { - logging.LogErrorf("load tree [%s] failed: %s", p, err) - return - } - - ret, err = LoadTreeByData(data, boxID, p, luteEngine) - return -} - func batchLoadTrees(boxIDs, paths []string, luteEngine *lute.Lute) (ret []*parse.Tree, errs []error) { waitGroup := sync.WaitGroup{} lock := sync.Mutex{} @@ -119,6 +107,18 @@ func batchLoadTrees(boxIDs, paths []string, luteEngine *lute.Lute) (ret []*parse return } +func LoadTree(boxID, p string, luteEngine *lute.Lute) (ret *parse.Tree, err error) { + filePath := filepath.Join(util.DataDir, boxID, p) + data, err := filelock.ReadFile(filePath) + if err != nil { + logging.LogErrorf("load tree [%s] failed: %s", p, err) + return + } + + ret, err = LoadTreeByData(data, boxID, p, luteEngine) + return +} + func LoadTreeByData(data []byte, boxID, p string, luteEngine *lute.Lute) (ret *parse.Tree, err error) { ret = parseJSON2Tree(boxID, p, data, luteEngine) if nil == ret {