mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-06-13 23:36:45 +03:00
7y-9
d569dd686f
* fix(shell): move files into existing destination directories Problem: fs.mv /src/file /dst/dir treats an existing destination directory as a destination file path, so it renames the source to /dst/dir instead of moving it into /dst/dir/file. Root cause: commandFsMv builds the destination LookupDirectoryEntryRequest with Directory and Name swapped, so the destination directory lookup misses. Fix: Populate LookupDirectoryEntryRequest with Directory=destinationDir and Name=destinationName before deciding whether the destination is a directory. Reproduction: env GOCACHE=/private/tmp/seaweedfs-go-cache go test ./weed/shell -run TestFsMvMovesIntoExistingDestinationDirectory -count=1 Validation: gofmt -w weed/shell/command_fs_mv.go weed/shell/command_fs_mv_test.go; git diff --check; git diff --cached --check; env GOCACHE=/private/tmp/seaweedfs-go-cache go test ./weed/shell -run TestFsMvMovesIntoExistingDestinationDirectory -count=1; env GOCACHE=/private/tmp/seaweedfs-go-cache go test ./weed/shell -count=1 * Update weed/shell/command_fs_mv_test.go Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
103 lines
2.2 KiB
Go
103 lines
2.2 KiB
Go
package shell
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/util"
|
|
)
|
|
|
|
func init() {
|
|
Commands = append(Commands, &commandFsMv{})
|
|
}
|
|
|
|
type commandFsMv struct {
|
|
}
|
|
|
|
func (c *commandFsMv) Name() string {
|
|
return "fs.mv"
|
|
}
|
|
|
|
func (c *commandFsMv) Help() string {
|
|
return `move or rename a file or a folder
|
|
|
|
fs.mv <source entry> <destination entry>
|
|
|
|
fs.mv /dir/file_name /dir2/filename2
|
|
fs.mv /dir/file_name /dir2
|
|
|
|
fs.mv /dir/dir2 /dir3/dir4/
|
|
fs.mv /dir/dir2 /dir3/new_dir
|
|
|
|
`
|
|
}
|
|
|
|
func (c *commandFsMv) HasTag(CommandTag) bool {
|
|
return false
|
|
}
|
|
|
|
func (c *commandFsMv) Do(args []string, commandEnv *CommandEnv, writer io.Writer) (err error) {
|
|
|
|
if handleHelpRequest(c, args, writer) {
|
|
return nil
|
|
}
|
|
|
|
if len(args) != 2 {
|
|
return fmt.Errorf("need to have 2 arguments")
|
|
}
|
|
|
|
sourcePath, err := commandEnv.parseUrl(args[0])
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
destinationPath, err := commandEnv.parseUrl(args[1])
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
sourceDir, sourceName := util.FullPath(sourcePath).DirAndName()
|
|
|
|
destinationDir, destinationName := util.FullPath(destinationPath).DirAndName()
|
|
|
|
return commandEnv.WithFilerClient(false, func(client filer_pb.SeaweedFilerClient) error {
|
|
|
|
// collect destination entry info
|
|
destinationRequest := &filer_pb.LookupDirectoryEntryRequest{
|
|
Directory: destinationDir,
|
|
Name: destinationName,
|
|
}
|
|
respDestinationLookupEntry, err := filer_pb.LookupEntry(context.Background(), client, destinationRequest)
|
|
|
|
var targetDir, targetName string
|
|
|
|
// moving a file or folder
|
|
if err == nil && respDestinationLookupEntry.Entry.IsDirectory {
|
|
// to a directory
|
|
targetDir = util.Join(destinationDir, destinationName)
|
|
targetName = sourceName
|
|
} else {
|
|
// to a file or folder
|
|
targetDir = destinationDir
|
|
targetName = destinationName
|
|
}
|
|
|
|
request := &filer_pb.AtomicRenameEntryRequest{
|
|
OldDirectory: sourceDir,
|
|
OldName: sourceName,
|
|
NewDirectory: targetDir,
|
|
NewName: targetName,
|
|
}
|
|
|
|
_, err = client.AtomicRenameEntry(context.Background(), request)
|
|
|
|
fmt.Fprintf(writer, "move: %s => %s\n", sourcePath, util.NewFullPath(targetDir, targetName))
|
|
|
|
return err
|
|
|
|
})
|
|
|
|
}
|