Factor RemoteSplit into fs

cmd/cmd.go

@@ -14,7 +14,6 @@ import (
 	"regexp"
 	"runtime"
 	"runtime/pprof"
-	"strings"
 	"time"
 
 	"github.com/spf13/cobra"
@@ -166,30 +165,6 @@ func NewFsSrcDst(args []string) (fs.Fs, fs.Fs) {
 	return fsrc, fdst
 }
 
-// RemoteSplit splits a remote into a parent and a leaf
-//
-// if it returns leaf as an empty string then remote is a directory
-//
-// if it returns parent as an empty string then that means the current directory
-//
-// The returned values have the property that parent + leaf == remote
-func RemoteSplit(remote string) (parent string, leaf string) {
-	// Split remote on :
-	i := strings.Index(remote, ":")
-	remoteName := ""
-	remotePath := remote
-	if i >= 0 {
-		remoteName = remote[:i+1]
-		remotePath = remote[i+1:]
-	} else if strings.HasSuffix(remotePath, "/") {
-		// if no : and ends with / must be directory
-		return remotePath, ""
-	}
-	// Construct new remote name without last segment
-	parent, leaf = path.Split(remotePath)
-	return remoteName + parent, leaf
-}
-
 // NewFsSrcDstFiles creates a new src and dst fs from the arguments
 // If src is a file then srcFileName and dstFileName will be non-empty
 func NewFsSrcDstFiles(args []string) (fsrc fs.Fs, srcFileName string, fdst fs.Fs, dstFileName string) {
@@ -197,7 +172,7 @@ func NewFsSrcDstFiles(args []string) (fsrc fs.Fs, srcFileName string, fdst fs.Fs
 	// If copying a file...
 	dstRemote := args[1]
 	if srcFileName != "" {
-		dstRemote, dstFileName = RemoteSplit(dstRemote)
+		dstRemote, dstFileName = fs.RemoteSplit(dstRemote)
 		if dstRemote == "" {
 			dstRemote = "."
 		}

cmd/cmd_test.go

@@ -1,35 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestRemoteSplit(t *testing.T) {
-
-	for _, test := range []struct {
-		remote, wantParent, wantLeaf string
-	}{
-		{"", "", ""},
-		{"remote:", "remote:", ""},
-		{"remote:potato", "remote:", "potato"},
-		{"remote:/", "remote:/", ""},
-		{"remote:/potato", "remote:/", "potato"},
-		{"remote:/potato/potato", "remote:/potato/", "potato"},
-		{"remote:potato/sausage", "remote:potato/", "sausage"},
-		{"/", "/", ""},
-		{"/root", "/", "root"},
-		{"/a/b", "/a/", "b"},
-		{"root", "", "root"},
-		{"a/b", "a/", "b"},
-		{"root/", "root/", ""},
-		{"a/b/", "a/b/", ""},
-	} {
-		gotParent, gotLeaf := RemoteSplit(test.remote)
-		assert.Equal(t, test.wantParent, gotParent, test.remote)
-		assert.Equal(t, test.wantLeaf, gotLeaf, test.remote)
-		assert.Equal(t, test.remote, gotParent+gotLeaf, fmt.Sprintf("%s: %q + %q != %q", test.remote, gotParent, gotLeaf, test.remote))
-	}
-}