diff options
| -rw-r--r-- | drive/delete.go | 13 | ||||
| -rw-r--r-- | gdrive.go | 10 | ||||
| -rw-r--r-- | handlers_drive.go | 1 |
3 files changed, 19 insertions, 5 deletions
diff --git a/drive/delete.go b/drive/delete.go index dc68753..d2469e1 100644 --- a/drive/delete.go +++ b/drive/delete.go @@ -8,19 +8,24 @@ import ( type DeleteArgs struct { Out io.Writer Id string + Recursive bool } -func (self *Drive) Delete(args DeleteArgs) (err error) { - f, err := self.service.Files.Get(args.Id).Fields("name").Do() +func (self *Drive) Delete(args DeleteArgs) error { + f, err := self.service.Files.Get(args.Id).Fields("name", "mimeType").Do() if err != nil { return fmt.Errorf("Failed to get file: %s", err) } + if isDir(f) && !args.Recursive { + return fmt.Errorf("'%s' is a directory, use the 'recursive' flag to delete directories", f.Name) + } + err = self.service.Files.Delete(args.Id).Do() if err != nil { return fmt.Errorf("Failed to delete file: %s", err) } - fmt.Fprintf(args.Out, "Removed file '%s'\n", f.Name) - return + fmt.Fprintf(args.Out, "Deleted '%s'\n", f.Name) + return nil } @@ -321,11 +321,19 @@ func main() { }, }, &cli.Handler{ - Pattern: "[global] delete <id>", + Pattern: "[global] delete [options] <id>", Description: "Delete file or directory", Callback: deleteHandler, Flags: cli.Flags{ "global": globalFlags, + "options": []cli.Flag{ + cli.BoolFlag{ + Name: "recursive", + Patterns: []string{"-r", "--recursive"}, + Description: "Delete directory and all it's content", + OmitValue: true, + }, + }, }, }, &cli.Handler{ diff --git a/handlers_drive.go b/handlers_drive.go index 9de27cc..714493c 100644 --- a/handlers_drive.go +++ b/handlers_drive.go @@ -225,6 +225,7 @@ func deleteHandler(ctx cli.Context) { err := newDrive(args).Delete(drive.DeleteArgs{ Out: os.Stdout, Id: args.String("id"), + Recursive: args.Bool("recursive"), }) checkErr(err) } |