Przeglądaj źródła

:art: Improve asset renaming https://github.com/siyuan-note/siyuan/issues/11889

Daniel 1 rok temu
rodzic
commit
427293f3e6
2 zmienionych plików z 6 dodań i 4 usunięć
  1. 4 1
      kernel/api/asset.go
  2. 2 3
      kernel/model/assets.go

+ 4 - 1
kernel/api/asset.go

@@ -159,13 +159,16 @@ func renameAsset(c *gin.Context) {
 
 	oldPath := arg["oldPath"].(string)
 	newName := arg["newName"].(string)
-	err := model.RenameAsset(oldPath, newName)
+	newPath, err := model.RenameAsset(oldPath, newName)
 	if nil != err {
 		ret.Code = -1
 		ret.Msg = err.Error()
 		ret.Data = map[string]interface{}{"closeTimeout": 5000}
 		return
 	}
+	ret.Data = map[string]interface{}{
+		"newPath": newPath,
+	}
 }
 
 func getDocImageAssets(c *gin.Context) {

+ 2 - 3
kernel/model/assets.go

@@ -762,7 +762,7 @@ func RemoveUnusedAsset(p string) (ret string) {
 	return
 }
 
-func RenameAsset(oldPath, newName string) (err error) {
+func RenameAsset(oldPath, newName string) (newPath string, err error) {
 	util.PushEndlessProgress(Conf.Language(110))
 	defer util.PushClearProgress()
 
@@ -781,7 +781,7 @@ func RenameAsset(oldPath, newName string) (err error) {
 	}
 
 	newName = util.AssetName(newName + filepath.Ext(oldPath))
-	newPath := "assets/" + newName
+	newPath = "assets/" + newName
 	if err = filelock.Copy(filepath.Join(util.DataDir, oldPath), filepath.Join(util.DataDir, newPath)); nil != err {
 		logging.LogErrorf("copy asset [%s] failed: %s", oldPath, err)
 		return
@@ -842,7 +842,6 @@ func RenameAsset(oldPath, newName string) (err error) {
 	}
 
 	IncSync()
-	util.ReloadUI()
 	return
 }