Update mv.go to support renaming and add tests

dropbox · Oct 21, 2018 · e2a9c27 · e2a9c27
1 parent 81b212f
commit e2a9c27
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/cmd/mv.go b/cmd/mv.go
@@ -42,13 +42,26 @@ func mv(cmd *cobra.Command, args []string) error {
 
 	re := regexp.MustCompile("[^/]+$")
 	for _, argument := range argsToMove {
+
 		argumentFile := re.FindString(argument)
- 		arg, err := makeRelocationArg(argument, destination+"/"+argumentFile)
-		if err != nil {
-			relocationError := fmt.Errorf("Error validating move for %s to %s: %v", argument, destination, err)
-			mvErrors = append(mvErrors, relocationError)
+		lastCharDest := destination[len(destination)-1:]
+
+		if lastCharDest == "/" {
+			arg, err := makeRelocationArg(argument, destination + argumentFile)
+			if err != nil {
+				relocationError := fmt.Errorf("Error validating move for %s to %s: %v", argument, destination, err)
+				mvErrors = append(mvErrors, relocationError)
+			} else {
+				relocationArgs = append(relocationArgs, arg)
+			}
 		} else {
-			relocationArgs = append(relocationArgs, arg)
+			arg, err := makeRelocationArg(argument, destination)
+			if err != nil {
+				relocationError := fmt.Errorf("Error validating move for %s to %s: %v", argument, destination, err)
+				mvErrors = append(mvErrors, relocationError)
+			} else {
+				relocationArgs = append(relocationArgs, arg)
+			}
 		}
 	}
 

diff --git a/contrib/test.sh b/contrib/test.sh
@@ -35,8 +35,8 @@ ${dbxcli} cp ${d}/dbxcli ${d}/dbxcli-new
 echo "Testing revs"
 rev=$(${dbxcli} revs ${d}/dbxcli)
 
-echo "Testing mv"
-${dbxcli} mv ${d}/dbxcli ${d}/dbxcli-old
+echo "Testing updated mv"
+${dbxcli} mv ${d}/dbxcli ${d}/dbxcli-old/
 
 echo "Testing restore"
 ${dbxcli} restore ${d}/dbxcli ${rev}