From d4d1b00c9609a4d493f79bdd74bae5dc60d37ed7 Mon Sep 17 00:00:00 2001
From: Petter Rasmussen
Date: Sun, 17 Jan 2016 23:12:26 +0100
Subject: Return error

---
 drive/upload.go | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'drive/upload.go')

diff --git a/drive/upload.go b/drive/upload.go
index ed373ef..16ae940 100644
--- a/drive/upload.go
+++ b/drive/upload.go
@@ -19,16 +19,20 @@ type UploadFileArgs struct {
     Share bool
 }
 
-func (self *Drive) Upload(args UploadFileArgs) {
+func (self *Drive) Upload(args UploadFileArgs) (err error) {
     //if args.Stdin {
     //    self.uploadStdin()
     //}
 
     srcFile, err := os.Open(args.Path)
-    errorF(err, "Failed to open file: %s", err)
+    if err != nil {
+        return fmt.Errorf("Failed to open file: %s", err)
+    }
 
     srcFileInfo, err := srcFile.Stat()
-    errorF(err, "Failed to read file metadata: %s", err)
+    if err != nil {
+        return fmt.Errorf("Failed to read file metadata: %s", err)
+    }
 
     // Instantiate empty drive file
     dstFile := &drive.File{}
@@ -53,10 +57,13 @@ func (self *Drive) Upload(args UploadFileArgs) {
     }
 
     f, err := self.service.Files.Create(dstFile).ResumableMedia(context.Background(), srcFile, srcFileInfo.Size(), dstFile.MimeType).Do()
-    errorF(err, "Failed to upload file: %s", err)
+    if err != nil {
+        return fmt.Errorf("Failed to upload file: %s", err)
+    }
 
     fmt.Printf("Uploaded '%s' at %s, total %d\n", f.Name, "x/s", f.Size)
     //if args.Share {
     //    self.Share(TODO)
     //}
+    return
 }
-- 
cgit v1.2.3