diff options
| author | Petter Rasmussen | 2016-09-06 17:14:26 +0200 |
|---|---|---|
| committer | GitHub | 2016-09-06 17:14:26 +0200 |
| commit | 9efbb88bf8bc418bb8c5e32b4ea18d5023ee7cb3 (patch) | |
| tree | 5dd5d61d596243309078958efffa48e0956148fc | |
| parent | 604140a109fb3d47374d9a87ba4edc4fd30987d7 (diff) | |
| parent | 5406c618d2b271959438908845b49b4d553c6bc6 (diff) | |
| download | gdrive-9efbb88bf8bc418bb8c5e32b4ea18d5023ee7cb3.tar.bz2 | |
Merge pull request #187 from vandenoever/master
Add --mime option to gdrive import
| -rw-r--r-- | drive/import.go | 8 | ||||
| -rw-r--r-- | gdrive.go | 5 | ||||
| -rw-r--r-- | handlers_drive.go | 1 |
3 files changed, 12 insertions, 2 deletions
diff --git a/drive/import.go b/drive/import.go index 2ee5f1e..0162aa3 100644 --- a/drive/import.go +++ b/drive/import.go @@ -11,15 +11,19 @@ import ( type ImportArgs struct { Out io.Writer + Mime string Progress io.Writer Path string Parents []string } func (self *Drive) Import(args ImportArgs) error { - fromMime := getMimeType(args.Path) + fromMime := args.Mime if fromMime == "" { - return fmt.Errorf("Could not determine mime type of file") + fromMime = getMimeType(args.Path) + } + if fromMime == "" { + return fmt.Errorf("Could not determine mime type of file, use --mime") } about, err := self.service.About.Get().Fields("importFormats").Do() @@ -719,6 +719,11 @@ func main() { Description: "Hide progress", OmitValue: true, }, + cli.StringFlag{ + Name: "mime", + Patterns: []string{"--mime"}, + Description: "Mime type of imported file", + }, ), }, }, diff --git a/handlers_drive.go b/handlers_drive.go index 8db7329..c89b8c2 100644 --- a/handlers_drive.go +++ b/handlers_drive.go @@ -190,6 +190,7 @@ func infoHandler(ctx cli.Context) { func importHandler(ctx cli.Context) { args := ctx.Args() err := newDrive(args).Import(drive.ImportArgs{ + Mime: args.String("mime"), Out: os.Stdout, Path: args.String("path"), Parents: args.StringSlice("parent"), |