github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-19 02:21:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vanessa 2022-07-15 12:02:13 +08:00
commit ebb813d50d
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/model/assets.go
View File

@ -448,11 +448,6 @@ func RenameAsset(oldPath, newName string) (err error) {
util.PushEndlessProgress(Conf.Language(110)) util.PushEndlessProgress(Conf.Language(110))
defer util.PushClearProgress() defer util.PushClearProgress()
notebooks, err := ListNotebooks()
if nil != err {
return
}
newName = strings.TrimSpace(newName) newName = strings.TrimSpace(newName)
newName = gulu.Str.RemoveInvisible(newName) newName = gulu.Str.RemoveInvisible(newName)
if path.Base(oldPath) == newName { if path.Base(oldPath) == newName {
@ -467,13 +462,17 @@ func RenameAsset(oldPath, newName string) (err error) {
return return
} }
newPath := util.AssetName(newName) newPath := util.AssetName(newName) + filepath.Ext(oldPath)
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
} }
luteEngine := NewLute() luteEngine := NewLute()
notebooks, err := ListNotebooks()
if nil != err {
return
}
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)
for _, paths := range pages { for _, paths := range pages {