Simplify drive wrapper, s/client/auth/

6 files changed, 13 insertions, 45 deletions

diff --git a/client/auth.go b/auth/oauth.go
index 9ea1ece..b8f1d47 100644
--- a/client/auth.go
+++ b/auth/oauth.go
@@ -1,4 +1,4 @@
-package client
+package auth
 
 import (
     "net/http"
diff --git a/client/token.go b/auth/token.go
index 0931284..926d9f6 100644
--- a/client/token.go
+++ b/auth/token.go
@@ -1,4 +1,4 @@
-package client
+package auth
 
 import (
     "golang.org/x/oauth2"
diff --git a/client/util.go b/auth/util.go
index b600fd6..b053c1f 100644
--- a/client/util.go
+++ b/auth/util.go
@@ -1,4 +1,4 @@
-package client
+package auth
 
 import (
     "os"
diff --git a/client/client.go b/client/client.go
deleted file mode 100644
index 1b48bbb..0000000
--- a/client/client.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package client
-
-import (
-    "net/http"
-    "google.golang.org/api/drive/v3"
-)
-
-type Client struct {
-    service *drive.Service
-    http *http.Client
-}
-
-func (self *Client) Service() *drive.Service {
-    return self.service
-}
-
-func (self *Client) Http() *http.Client {
-    return self.http
-}
-
-func NewClient(client *http.Client) (*Client, error) {
-    service, err := drive.New(client)
-    if err != nil {
-        return nil, err
-    }
-
-    return &Client{service, client}, nil
-}
diff --git a/drive/drive.go b/drive/drive.go
index 047030a..d908beb 100644
--- a/drive/drive.go
+++ b/drive/drive.go
@@ -5,19 +5,15 @@ import (
     "google.golang.org/api/drive/v3"
 )
 
-type Client interface {
-    Service() *drive.Service
-    Http() *http.Client
-}
-
 type Drive struct {
     service *drive.Service
-    http *http.Client
 }
 
-func NewDrive(client Client) *Drive {
-    return &Drive{
-        service: client.Service(),
-        http: client.Http(),
+func New(client *http.Client) (*Drive, error) {
+    service, err := drive.New(client)
+    if err != nil {
+        return nil, err
     }
+
+    return &Drive{service}, nil
 }
diff --git a/handlers.go b/handlers.go
index a36444c..f9775f7 100644
--- a/handlers.go
+++ b/handlers.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
     "./cli"
-	"./client"
+	"./auth"
 	"./drive"
 )
 
@@ -155,17 +155,17 @@ func printCommandHelp(ctx cli.Context) {
 func newDrive(args cli.Arguments) *drive.Drive {
     configDir := args.String("configDir")
     tokenPath := ConfigFilePath(configDir, TokenFilename)
-    oauth, err := client.NewOauthClient(ClientId, ClientSecret, tokenPath, authCodePrompt)
+    oauth, err := auth.NewOauthClient(ClientId, ClientSecret, tokenPath, authCodePrompt)
     if err != nil {
         ExitF("Failed getting oauth client: %s", err.Error())
     }
 
-    client, err := client.NewClient(oauth)
+    client, err := drive.New(oauth)
     if err != nil {
         ExitF("Failed getting drive: %s", err.Error())
     }
 
-    return drive.NewDrive(client)
+    return client
 }
 
 func authCodePrompt(url string) func() string {