Merge pull request #247 from dropbox/put-if-exists-flag

Add --if-exists flag to put command

Author: AndreyVMarkelov

README.md

@@ -256,8 +256,11 @@ The `--verbose` option will turn on verbose logging and is useful for debugging.
 $ dbxcli put file.txt /destination/file.txt        # upload a single file
 $ dbxcli put -r ./project /backup/project          # recursively upload a directory
 $ dbxcli put -r -w 8 ./large-folder /backup/large  # use 8 workers per large file
+$ dbxcli put --if-exists skip file.txt /dest.txt   # skip if the file already exists
 ```
 
+By default, `put` overwrites existing destination files. Use `--if-exists overwrite|skip|fail` to choose whether existing files are overwritten, skipped, or treated as an error.
+
 ### Downloading files and directories
 
 ```sh

cmd/ls.go

@@ -47,11 +47,6 @@ func printFolderMetadata(w io.Writer, e *files.FolderMetadata, longFormat bool)
 	_, _ = fmt.Fprint(w, formatFolderMetadata(e, longFormat))
 }
 
-// Invoked by search.go and revs.go
-func printFileMetadata(w io.Writer, e *files.FileMetadata, longFormat bool) {
-	_, _ = fmt.Fprint(w, formatFileMetadata(e, longFormat))
-}
-
 func formatFolderMetadata(e *files.FolderMetadata, longFormat bool) string {
 	text := fmt.Sprintf("%s\t", e.PathDisplay)
 	if longFormat {

cmd/pipe_test.go

@@ -19,6 +19,15 @@ func testPutCmdWithStdin(stdin io.Reader) *cobra.Command {
 	return cmd
 }
 
+type failReadReader struct {
+	t *testing.T
+}
+
+func (r failReadReader) Read(_ []byte) (int, error) {
+	r.t.Fatal("stdin should not be read")
+	return 0, io.EOF
+}
+
 func TestPutStdin_RequiresTarget(t *testing.T) {
 	cmd := testPutCmdWithStdin(strings.NewReader("data"))
 	err := put(cmd, []string{"-"})
@@ -103,6 +112,32 @@ func TestPutStdin_UploadsContent(t *testing.T) {
 	}
 }
 
+func TestPutStdinIfExistsSkipDoesNotReadStdin(t *testing.T) {
+	cmd := testPutCmdWithStdin(failReadReader{t: t})
+	_ = cmd.Flags().Set("if-exists", "skip")
+	var stderr bytes.Buffer
+	cmd.SetErr(&stderr)
+
+	mock := &mockFilesClient{
+		getMetadataFn: func(arg *files.GetMetadataArg) (files.IsMetadata, error) {
+			return &files.FileMetadata{Metadata: files.Metadata{PathDisplay: arg.Path}}, nil
+		},
+		uploadFn: func(arg *files.UploadArg, r io.Reader) (*files.FileMetadata, error) {
+			t.Fatal("upload should not be called for existing destination with --if-exists skip")
+			return nil, nil
+		},
+	}
+	stubFilesClient(t, mock)
+
+	err := put(cmd, []string{"-", "/existing.txt"})
+	if err != nil {
+		t.Fatalf("put stdin error: %v", err)
+	}
+	if !strings.Contains(stderr.String(), "Skipping /existing.txt") {
+		t.Errorf("stderr = %q, want skip message", stderr.String())
+	}
+}
+
 func TestPutStdin_UploadsToDashPath(t *testing.T) {
 	content := "dash path"
 	cmd := testPutCmdWithStdin(strings.NewReader(content))