diff options
| author | Petter Rasmussen | 2016-02-12 23:19:03 +0100 |
|---|---|---|
| committer | Petter Rasmussen | 2016-02-13 01:10:17 +0100 |
| commit | 5eae4f159d340d257e41e75604a0fc831cb76381 (patch) | |
| tree | 9e2b0f0e2de1a9dad0124bcd06c74b57eea05c1a /gdrive.go | |
| parent | ad4309f1028d165b8905a6a22be89191f787fc39 (diff) | |
| download | gdrive-5eae4f159d340d257e41e75604a0fc831cb76381.tar.bz2 | |
Add conflict handling and flags for downloads
Diffstat (limited to 'gdrive.go')
| -rw-r--r-- | gdrive.go | 30 |
1 files changed, 24 insertions, 6 deletions
@@ -394,15 +394,21 @@ func main() { cli.NewFlagGroup("global", globalFlags...), cli.NewFlagGroup("options", cli.BoolFlag{ - Name: "noProgress", - Patterns: []string{"--no-progress"}, - Description: "Hide progress", + Name: "keepRemote", + Patterns: []string{"--keep-remote"}, + Description: "Keep remote file when a conflict is encountered", OmitValue: true, }, cli.BoolFlag{ - Name: "dryRun", - Patterns: []string{"--dry-run"}, - Description: "Show what would have been transferred", + 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{ @@ -411,6 +417,18 @@ func main() { Description: "Delete extraneous local 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, + }, ), }, }, |