From 14c023477c075a564ad6086b2195d64c2598e937 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Fri, 15 Jul 2022 11:15:02 +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/api/asset.go    |  8 +++++++-
 kernel/model/assets.go | 12 +++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/kernel/api/asset.go b/kernel/api/asset.go
index 2482fc39c..4d3a80d04 100644
--- a/kernel/api/asset.go
+++ b/kernel/api/asset.go
@@ -39,7 +39,13 @@ func renameAsset(c *gin.Context) {
 
 	oldPath := arg["oldPath"].(string)
 	newName := arg["newName"].(string)
-	model.RenameAsset(oldPath, newName)
+	err := model.RenameAsset(oldPath, newName)
+	if nil != err {
+		ret.Code = -1
+		ret.Msg = err.Error()
+		ret.Data = map[string]interface{}{"closeTimeout": 5000}
+		return
+	}
 }
 
 func getDocImageAssets(c *gin.Context) {
diff --git a/kernel/model/assets.go b/kernel/model/assets.go
index 2973e0320..04e0ba25a 100644
--- a/kernel/model/assets.go
+++ b/kernel/model/assets.go
@@ -444,7 +444,7 @@ func RemoveUnusedAsset(p string) (ret string) {
 	return
 }
 
-func RenameAsset(oldPath, newName string) {
+func RenameAsset(oldPath, newName string) (err error) {
 	util.PushEndlessProgress(Conf.Language(110))
 	defer util.PushClearProgress()
 
@@ -462,6 +462,11 @@ func RenameAsset(oldPath, newName string) {
 		return
 	}
 
+	if !gulu.File.IsValidFilename(newName) {
+		err = errors.New(Conf.Language(151))
+		return
+	}
+
 	newPath := util.AssetName(newName)
 	luteEngine := NewLute()
 	for _, notebook := range notebooks {
@@ -471,6 +476,7 @@ func RenameAsset(oldPath, newName string) {
 				data, readErr := filelock.NoLockFileRead(treeAbsPath)
 				if nil != readErr {
 					util.LogErrorf("get data [path=%s] failed: %s", treeAbsPath, readErr)
+					err = readErr
 					return
 				}
 
@@ -481,12 +487,14 @@ func RenameAsset(oldPath, newName string) {
 				data = bytes.Replace(data, []byte(oldPath), []byte(newPath), -1)
 				if writeErr := filelock.NoLockFileWrite(treeAbsPath, data); nil != writeErr {
 					util.LogErrorf("write data [path=%s] failed: %s", treeAbsPath, writeErr)
+					err = writeErr
 					return
 				}
 
 				tree, parseErr := protyle.ParseJSONWithoutFix(luteEngine, data)
 				if nil != parseErr {
 					util.LogErrorf("parse json to tree [%s] failed: %s", treeAbsPath, parseErr)
+					err = parseErr
 					return
 				}
 
@@ -500,6 +508,7 @@ func RenameAsset(oldPath, newName string) {
 
 	if err = os.Rename(filepath.Join(util.DataDir, oldPath), filepath.Join(util.DataDir, newPath)); nil != err {
 		util.LogErrorf("rename asset [%s] failed: %s", oldPath, err)
+		return
 	}
 
 	IncSync()
@@ -507,6 +516,7 @@ func RenameAsset(oldPath, newName string) {
 	util.PushEndlessProgress(Conf.Language(113))
 	sql.WaitForWritingDatabase()
 	util.ReloadUI()
+	return
 }
 
 func UnusedAssets() (ret []string) {