0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2022-07-15 12:06:51 +08:00
commit e9fae295bf
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/cache/asset.go vendored
View file

@ -60,6 +60,6 @@ func LoadAssets() {
}) })
elapsed := time.Since(start) elapsed := time.Since(start)
if 2000 < elapsed.Milliseconds() { if 2000 < elapsed.Milliseconds() {
util.LogInfof("loaded assets [%s]", elapsed) util.LogInfof("loaded assets [%.2fs]", elapsed.Seconds())
} }
} }

15
kernel/model/assets.go
View file

@ -34,7 +34,6 @@ import (
"github.com/88250/gulu" "github.com/88250/gulu"
"github.com/88250/lute/ast" "github.com/88250/lute/ast"
"github.com/88250/lute/parse" "github.com/88250/lute/parse"
"github.com/88250/protyle"
"github.com/gabriel-vasile/mimetype" "github.com/gabriel-vasile/mimetype"
"github.com/siyuan-note/filelock" "github.com/siyuan-note/filelock"
"github.com/siyuan-note/httpclient" "github.com/siyuan-note/httpclient"
@ -462,13 +461,14 @@ func RenameAsset(oldPath, newName string) (err error) {
return return
} }
newPath := util.AssetName(newName) + filepath.Ext(oldPath) newName = util.AssetName(newName) + filepath.Ext(oldPath)
newPath := "assets/" + newName
if err = gulu.File.Copy(filepath.Join(util.DataDir, oldPath), filepath.Join(util.DataDir, newPath)); nil != err { if err = gulu.File.Copy(filepath.Join(util.DataDir, oldPath), filepath.Join(util.DataDir, newPath)); nil != err {
util.LogErrorf("copy asset [%s] failed: %s", oldPath, err) util.LogErrorf("copy asset [%s] failed: %s", oldPath, err)
return return
} }
oldName := path.Base(oldPath)
luteEngine := NewLute()
notebooks, err := ListNotebooks() notebooks, err := ListNotebooks()
if nil != err { if nil != err {
return return
@ -484,18 +484,19 @@ func RenameAsset(oldPath, newName string) (err error) {
return return
} }
if !bytes.Contains(data, []byte(oldPath)) { if !bytes.Contains(data, []byte(oldName)) {
return continue
} }
data = bytes.Replace(data, []byte(oldPath), []byte(newPath), -1) data = bytes.Replace(data, []byte(oldName), []byte(newName), -1)
if writeErr := filelock.NoLockFileWrite(treeAbsPath, data); nil != writeErr { if writeErr := filelock.NoLockFileWrite(treeAbsPath, data); nil != writeErr {
util.LogErrorf("write data [path=%s] failed: %s", treeAbsPath, writeErr) util.LogErrorf("write data [path=%s] failed: %s", treeAbsPath, writeErr)
err = writeErr err = writeErr
return return
} }
tree, parseErr := protyle.ParseJSONWithoutFix(luteEngine, data) p := filepath.ToSlash(strings.TrimPrefix(treeAbsPath, filepath.Join(util.DataDir, notebook.ID)))
tree, parseErr := LoadTree(notebook.ID, p)
if nil != parseErr { if nil != parseErr {
util.LogErrorf("parse json to tree [%s] failed: %s", treeAbsPath, parseErr) util.LogErrorf("parse json to tree [%s] failed: %s", treeAbsPath, parseErr)
err = parseErr err = parseErr