Skip to content

Support for multi-arg rm and rmdir #517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sfc-gh-iyashchyshyn wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Support for multi-arg rm and rmdir #517

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8651016
Support for multiple args in rm and rmdir, -r flag for rmdir
sfc-gh-iyashchyshyn Dec 13, 2024
3a302c2
Added back-compatibility fix
sfc-gh-iyashchyshyn Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions services/localfile/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1249,13 +1249,13 @@ func (i *rmCmd) SetFlags(f *flag.FlagSet) {}

func (i *rmCmd) Execute(ctx context.Context, f *flag.FlagSet, args ...interface{}) subcommands.ExitStatus {
state := args[0].(*util.ExecuteState)
if f.NArg() != 1 {
fmt.Fprintln(os.Stderr, "please specify a filename to rm")
if f.NArg() < 1 {
fmt.Fprintln(os.Stderr, "please specify at least one filename to rm")
return subcommands.ExitUsageError
}

req := &pb.RmRequest{
Filename: f.Arg(0),
Filenames: f.Args(),
}
client := pb.NewLocalFileClientProxy(state.Conn)
respChan, err := client.RmOneMany(ctx, req)
Expand All @@ -1278,27 +1278,31 @@ func (i *rmCmd) Execute(ctx context.Context, f *flag.FlagSet, args ...interface{
}

type rmdirCmd struct {
recursive bool
}

func (*rmdirCmd) Name() string { return "rmdir" }
func (*rmdirCmd) Synopsis() string { return "Remove a directory." }
func (*rmdirCmd) Usage() string {
return `rm <directory>:
return `rmdir [-r] <directory>:
Remove the given directory.
`
}

func (i *rmdirCmd) SetFlags(f *flag.FlagSet) {}
func (i *rmdirCmd) SetFlags(f *flag.FlagSet) {
f.BoolVar(&i.recursive, "r", false, "recursively also remove all sub-directories and files")
}

func (i *rmdirCmd) Execute(ctx context.Context, f *flag.FlagSet, args ...interface{}) subcommands.ExitStatus {
state := args[0].(*util.ExecuteState)
if f.NArg() != 1 {
fmt.Fprintln(os.Stderr, "please specify a directory to rm")
if f.NArg() < 1 {
fmt.Fprintln(os.Stderr, "please specify at least one directory to rm")
return subcommands.ExitUsageError
}

req := &pb.RmdirRequest{
Directory: f.Arg(0),
Directories: f.Args(),
Recursive: i.recursive,
}
client := pb.NewLocalFileClientProxy(state.Conn)
respChan, err := client.RmdirOneMany(ctx, req)
Expand Down
2 changes: 1 addition & 1 deletion services/localfile/client/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ func WriteRemoteFile(ctx context.Context, conn *proxy.Conn, config *FileConfig,
func RemoveRemoteFile(ctx context.Context, conn *proxy.Conn, path string) error {
c := pb.NewLocalFileClientProxy(conn)
resp, err := c.RmOneMany(ctx, &pb.RmRequest{
Filename: path,
Filenames: []string{path},
})
if err != nil {
return fmt.Errorf("remove error - %v", err)
Expand Down
Loading