mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2025-10-21 07:17:25 +08:00
refactoring
This commit is contained in:
@@ -4,7 +4,6 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
"io"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
|
||||
"github.com/chrislusf/seaweedfs/weed/util"
|
||||
@@ -65,7 +64,7 @@ func (c *commandFsMv) Do(args []string, commandEnv *CommandEnv, writer io.Writer
|
||||
// moving a file or folder
|
||||
if err == nil && respDestinationLookupEntry.Entry.IsDirectory {
|
||||
// to a directory
|
||||
targetDir = filepath.ToSlash(filepath.Join(destinationDir, destinationName))
|
||||
targetDir = util.Join(destinationDir, destinationName)
|
||||
targetName = sourceName
|
||||
} else {
|
||||
// to a file or folder
|
||||
|
@@ -4,7 +4,6 @@ import (
|
||||
"fmt"
|
||||
"io"
|
||||
"net/url"
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
@@ -55,7 +54,7 @@ func (ce *CommandEnv) parseUrl(input string) (path string, err error) {
|
||||
return
|
||||
}
|
||||
if !strings.HasPrefix(input, "/") {
|
||||
input = filepath.ToSlash(filepath.Join(ce.option.Directory, input))
|
||||
input = util.Join(ce.option.Directory, input)
|
||||
}
|
||||
return input, err
|
||||
}
|
||||
|
Reference in New Issue
Block a user