Require recursive flag to delete directories

1 files changed, 9 insertions, 4 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
 }