Support moving a file into a directory

GGP1 · Jan 22, 2023 · 7b2bde5 · 7b2bde5
1 parent 31c6ea2
commit 7b2bde5
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 4 deletions.
diff --git a/commands/file/mv/mv.go b/commands/file/mv/mv.go
@@ -19,7 +19,10 @@ const example = `
 kure file mv oldFile newFile
 
 * Move a directory
-kure file mv oldDir/ newDir/`
+kure file mv oldDir/ newDir/
+
+* Move a file into a directory
+kure file mv oldDir/test.txt newDir/`
 
 // NewCmd returns a new command.
 func NewCmd(db *bolt.DB) *cobra.Command {
@@ -56,14 +59,21 @@ func runMv(db *bolt.DB) cmdutil.RunEFunc {
 
 		oldName = cmdutil.NormalizeName(oldName, true)
 		newName = cmdutil.NormalizeName(newName, true)
+		oldNameIsDir := strings.HasSuffix(oldName, "/")
+		newNameIsDir := strings.HasSuffix(newName, "/")
 
-		if strings.HasSuffix(oldName, "/") {
-			if !strings.HasSuffix(newName, "/") {
+		if oldNameIsDir {
+			if !newNameIsDir {
 				return errors.New("cannot move a directory into a file")
 			}
 			return mvDir(db, oldName, newName)
 		}
 
+		// Move file into directory
+		if !oldNameIsDir && newNameIsDir {
+			newName += filepath.Base(oldName)
+		}
+
 		if filepath.Ext(newName) == "" {
 			newName += filepath.Ext(oldName)
 		}
@@ -76,7 +86,7 @@ func runMv(db *bolt.DB) cmdutil.RunEFunc {
 			return err
 		}
 
-		fmt.Printf("\n%q renamed as %q\n", oldName, newName)
+		fmt.Printf("\n%q moved to %q\n", oldName, newName)
 		return nil
 	}
 }

diff --git a/commands/file/mv/mv_test.go b/commands/file/mv/mv_test.go
@@ -1,6 +1,7 @@
 package mv
 
 import (
+	"path/filepath"
 	"runtime"
 	"strconv"
 	"strings"
@@ -56,6 +57,42 @@ func TestMvDir(t *testing.T) {
 	}
 }
 
+func TestMvFileIntoDir(t *testing.T) {
+	db := cmdutil.SetContext(t, "../../../db/testdata/database")
+
+	cases := []struct {
+		desc     string
+		filename string
+		newDir   string
+	}{
+		{
+			desc:     "File with extension",
+			filename: "directory/test.csv",
+			newDir:   "folder/",
+		},
+		{
+			desc:     "File without extension",
+			filename: "directory/test",
+			newDir:   "folder/",
+		},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.desc, func(t *testing.T) {
+			createFile(t, db, tc.filename)
+
+			cmd := NewCmd(db)
+			cmd.SetArgs([]string{tc.filename, tc.newDir})
+
+			err := cmd.Execute()
+			assert.NoError(t, err)
+
+			_, err = file.GetCheap(db, tc.newDir+filepath.Base(tc.filename))
+			assert.NoError(t, err, "Failed getting the renamed file")
+		})
+	}
+}
+
 func TestMvErrors(t *testing.T) {
 	if runtime.GOOS != "windows" {
 		t.Skip("For some strange reason this test fails in unix systems because the database file throws \"bad file descriptor\"")

diff --git a/docs/commands/file/subcommands/mv.md b/docs/commands/file/subcommands/mv.md
@@ -22,4 +22,9 @@ kure file mv oldFile newFile
 Move a directory:
 ```
 kure file mv oldDir/ newDir/
+```
+
+Move a file into a directory:
+```
+kure file mv oldDir/test.txt newDir/
 ```