From 3044f97f42bc3c3083f1cefee54492ef740b02bd Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 15 Jul 2022 11:36:41 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E8=B5=84=E6=BA=90=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E9=87=8D=E5=91=BD=E5=90=8D=20https://github.com/siyua?= =?UTF-8?q?n-note/siyuan/issues/3454?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/assets.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/kernel/model/assets.go b/kernel/model/assets.go index 6cc0978ab..7c1bab71b 100644 --- a/kernel/model/assets.go +++ b/kernel/model/assets.go @@ -448,11 +448,6 @@ func RenameAsset(oldPath, newName string) (err error) { util.PushEndlessProgress(Conf.Language(110)) defer util.PushClearProgress() - notebooks, err := ListNotebooks() - if nil != err { - return - } - newName = strings.TrimSpace(newName) newName = gulu.Str.RemoveInvisible(newName) if path.Base(oldPath) == newName { @@ -467,13 +462,17 @@ func RenameAsset(oldPath, newName string) (err error) { 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 { util.LogErrorf("copy asset [%s] failed: %s", oldPath, err) return } luteEngine := NewLute() + notebooks, err := ListNotebooks() + if nil != err { + return + } for _, notebook := range notebooks { pages := pagedPaths(filepath.Join(util.DataDir, notebook.ID), 32) for _, paths := range pages {