From 12e431b5e17ff4ceb6680987bd4649a94b83f896 Mon Sep 17 00:00:00 2001
From: Petter Rasmussen
Date: Sat, 13 Feb 2016 01:09:47 +0100
Subject: Add conflict handling and flags for uploads

---
 gdrive.go | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

(limited to 'gdrive.go')

diff --git a/gdrive.go b/gdrive.go
index 43f992d..36b4a09 100644
--- a/gdrive.go
+++ b/gdrive.go
@@ -440,15 +440,21 @@ func main() {
                 cli.NewFlagGroup("global", globalFlags...),
                 cli.NewFlagGroup("options",
                     cli.BoolFlag{
-                        Name: "dryRun",
-                        Patterns: []string{"--dry-run"},
-                        Description: "Show what would have been transferred",
+                        Name: "keepRemote",
+                        Patterns: []string{"--keep-remote"},
+                        Description: "Keep remote file when a conflict is encountered",
                         OmitValue: true,
                     },
                     cli.BoolFlag{
-                        Name: "noProgress",
-                        Patterns: []string{"--no-progress"},
-                        Description: "Hide progress",
+                        Name: "keepLocal",
+                        Patterns: []string{"--keep-local"},
+                        Description: "Keep local file when a conflict is encountered",
+                        OmitValue: true,
+                    },
+                    cli.BoolFlag{
+                        Name: "keepLargest",
+                        Patterns: []string{"--keep-largest"},
+                        Description: "Keep largest file when a conflict is encountered",
                         OmitValue: true,
                     },
                     cli.BoolFlag{
@@ -457,6 +463,18 @@ func main() {
                         Description: "Delete extraneous remote files",
                         OmitValue: true,
                     },
+                    cli.BoolFlag{
+                        Name: "dryRun",
+                        Patterns: []string{"--dry-run"},
+                        Description: "Show what would have been transferred",
+                        OmitValue: true,
+                    },
+                    cli.BoolFlag{
+                        Name: "noProgress",
+                        Patterns: []string{"--no-progress"},
+                        Description: "Hide progress",
+                        OmitValue: true,
+                    },
                     cli.IntFlag{
                         Name: "chunksize",
                         Patterns: []string{"--chunksize"},
-- 
cgit v1.2.3