remove recursive opt from wsh copy and move

Author: esimkowitz

cmd/wsh/cmd/wshcmd-file.go

@@ -418,10 +418,6 @@ func fileCpRun(cmd *cobra.Command, args []string) error {
 
 func fileMvRun(cmd *cobra.Command, args []string) error {
 	src, dst := args[0], args[1]
-	recursive, err := cmd.Flags().GetBool("recursive")
-	if err != nil {
-		return err
-	}
 	force, err := cmd.Flags().GetBool("force")
 	if err != nil {
 		return err
@@ -435,9 +431,9 @@ func fileMvRun(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return fmt.Errorf("unable to parse dest path: %w", err)
 	}
-	log.Printf("Moving %s to %s; recursive: %v, force: %v", srcPath, destPath, recursive, force)
+	log.Printf("Moving %s to %s; force: %v", srcPath, destPath, force)
 	rpcOpts := &wshrpc.RpcOpts{Timeout: TimeoutYear}
-	err = wshclient.FileMoveCommand(RpcClient, wshrpc.CommandFileCopyData{SrcUri: srcPath, DestUri: destPath, Opts: &wshrpc.FileCopyOpts{Overwrite: force, Timeout: TimeoutYear, Recursive: recursive}}, rpcOpts)
+	err = wshclient.FileMoveCommand(RpcClient, wshrpc.CommandFileCopyData{SrcUri: srcPath, DestUri: destPath, Opts: &wshrpc.FileCopyOpts{Overwrite: force, Timeout: TimeoutYear}}, rpcOpts)
 	if err != nil {
 		return fmt.Errorf("moving file: %w", err)
 	}

frontend/types/gotypes.d.ts

@@ -387,7 +387,6 @@ declare global {
     // wshrpc.FileCopyOpts
     type FileCopyOpts = {
         overwrite?: boolean;
-        recursive?: boolean;
         merge?: boolean;
         timeout?: number;
     };

pkg/wshrpc/wshremote/wshremote.go

@@ -707,7 +707,6 @@ func (impl *ServerImpl) RemoteFileMoveCommand(ctx context.Context, data wshrpc.C
 	destUri := data.DestUri
 	srcUri := data.SrcUri
 	overwrite := opts != nil && opts.Overwrite
-	recursive := opts != nil && opts.Recursive
 
 	destConn, err := connparse.ParseURIAndReplaceCurrentHost(ctx, destUri)
 	if err != nil {
@@ -735,13 +734,6 @@ func (impl *ServerImpl) RemoteFileMoveCommand(ctx context.Context, data wshrpc.C
 	}
 	if srcConn.Host == destConn.Host {
 		srcPathCleaned := filepath.Clean(wavebase.ExpandHomeDirSafe(srcConn.Path))
-		finfo, err := os.Stat(srcPathCleaned)
-		if err != nil {
-			return fmt.Errorf("cannot stat file %q: %w", srcPathCleaned, err)
-		}
-		if finfo.IsDir() && !recursive {
-			return fmt.Errorf("cannot move directory %q, recursive option not specified", srcUri)
-		}
 		err = os.Rename(srcPathCleaned, destPathCleaned)
 		if err != nil {
 			return fmt.Errorf("cannot move file %q to %q: %w", srcPathCleaned, destPathCleaned, err)

pkg/wshrpc/wshrpctypes.go

@@ -546,8 +546,7 @@ type CommandRemoteStreamTarData struct {
 
 type FileCopyOpts struct {
 	Overwrite bool  `json:"overwrite,omitempty"`
-	Recursive bool  `json:"recursive,omitempty"` // only used for move, always true for copy
-	Merge     bool  `json:"merge,omitempty"`     // only used for copy, always false for move
+	Merge     bool  `json:"merge,omitempty"` // only used for copy, always false for move
 	Timeout   int64 `json:"timeout,omitempty"`
 }