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

⚡ 改进重命名资源文件性能 Fix https://github.com/siyuan-note/siyuan/issues/7322

Browse source
This commit is contained in:
Liang Ding 2023-02-10 12:05:56 +08:00
parent 929a25a783
commit 6743b21193
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kernel/filesys/tree.go
View file

@ -42,6 +42,12 @@ func LoadTree(boxID, p string, luteEngine *lute.Lute) (ret *parse.Tree, err erro
if nil != err { if nil != err {
return 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) ret = parseJSON2Tree(boxID, p, data, luteEngine)
if nil == ret { if nil == ret {
return nil, errors.New("parse tree failed") return nil, errors.New("parse tree failed")
@ -88,7 +94,7 @@ func LoadTree(boxID, p string, luteEngine *lute.Lute) (ret *parse.Tree, err erro
ial := ReadDocIAL(parentData) ial := ReadDocIAL(parentData)
if 1 > len(ial) { if 1 > len(ial) {
logging.LogWarnf("tree [%s] is corrupted", filePath) logging.LogWarnf("tree [%s] is corrupted", filepath.Join(boxID, p))
} }
title := ial["title"] title := ial["title"]
if "" == title { if "" == title {

9
kernel/model/assets.go
View file

@ -40,6 +40,7 @@ import (
"github.com/siyuan-note/httpclient" "github.com/siyuan-note/httpclient"
"github.com/siyuan-note/logging" "github.com/siyuan-note/logging"
"github.com/siyuan-note/siyuan/kernel/cache" "github.com/siyuan-note/siyuan/kernel/cache"
"github.com/siyuan-note/siyuan/kernel/filesys"
"github.com/siyuan-note/siyuan/kernel/search" "github.com/siyuan-note/siyuan/kernel/search"
"github.com/siyuan-note/siyuan/kernel/sql" "github.com/siyuan-note/siyuan/kernel/sql"
"github.com/siyuan-note/siyuan/kernel/treenode" "github.com/siyuan-note/siyuan/kernel/treenode"
@ -503,6 +504,7 @@ func RenameAsset(oldPath, newName string) (err error) {
return return
} }
luteEngine := NewLute()
for _, notebook := range notebooks { for _, notebook := range notebooks {
pages := pagedPaths(filepath.Join(util.DataDir, notebook.ID), 32) pages := pagedPaths(filepath.Join(util.DataDir, notebook.ID), 32)
@ -528,11 +530,10 @@ func RenameAsset(oldPath, newName string) (err error) {
} }
p := filepath.ToSlash(strings.TrimPrefix(treeAbsPath, filepath.Join(util.DataDir, notebook.ID))) p := filepath.ToSlash(strings.TrimPrefix(treeAbsPath, filepath.Join(util.DataDir, notebook.ID)))
tree, parseErr := LoadTree(notebook.ID, p) tree, parseErr := filesys.LoadTreeByData(data, notebook.ID, p, luteEngine)
if nil != parseErr { if nil != parseErr {
logging.LogErrorf("parse json to tree [%s] failed: %s", treeAbsPath, parseErr) logging.LogWarnf("parse json to tree [%s] failed: %s", treeAbsPath, parseErr)
err = parseErr continue
return
} }
treenode.IndexBlockTree(tree) treenode.IndexBlockTree(tree)