improved naming

README.md

@@ -67,7 +67,11 @@ You will be prompted for a new verification code if the folder does not exist.
 
 ## Compile from source
 ```bash
-go get github.com/prasmussen/gdrive
+go get github.com/sabhiram/go-git-ignore
+go get github.com/soniakeys/graph
+go get -u google.golang.org/api/drive/v3
+go get -u golang.org/x/oauth2/google
+go get github.com/gdrive-org/gdrive
 ```
 The gdrive binary should now be available at `$GOPATH/bin/gdrive`
 

compare.go

@@ -2,8 +2,9 @@ package main
 
 import (
 	"encoding/json"
-	"github.com/prasmussen/gdrive/drive"
 	"os"
+
+	"./drive"
 )
 
 const MinCacheFileSize = 5 * 1024 * 1024

gdrive.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/prasmussen/gdrive/cli"
+	"./cli"
 )
 
 const Name = "gdrive"

handlers_drive.go

@@ -9,13 +9,16 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/prasmussen/gdrive/auth"
-	"github.com/prasmussen/gdrive/cli"
-	"github.com/prasmussen/gdrive/drive"
+	"golang.org/x/oauth2/google"
+	gd "google.golang.org/api/drive/v3"
+
+	"./auth"
+	"./cli"
+	"./drive"
 )
 
-const ClientId = "367116221053-7n0vf5akeru7on6o2fjinrecpdoe99eg.apps.googleusercontent.com"
-const ClientSecret = "1qsNodXNaWq1mQuBjUjmvhoO"
+var ClientId = "367116221053-7n0vf5akeru7on6o2fjinrecpdoe99eg.apps.googleusercontent.com"
+var ClientSecret = "1qsNodXNaWq1mQuBjUjmvhoO"
 const TokenFilename = "token_v2.json"
 const DefaultCacheFileName = "file_cache.json"
 
@@ -341,6 +344,26 @@ func aboutExportHandler(ctx cli.Context) {
 }
 
 func getOauthClient(args cli.Arguments) (*http.Client, error) {
+	configDir := getConfigDir(args)
+
+	// IF there exists .gdrive/credentials.json, use it.
+	// Otherwise fall back to our default hardcoded project
+	b, err := ioutil.ReadFile(ConfigFilePath(configDir, "credentials.json"))
+	if err == nil {
+		gconfig,err := google.ConfigFromJSON(b, gd.DriveMetadataReadonlyScope)
+
+		// If above is present, ideally we could just use
+		// gconfig.Client(context.Background(), token
+		// see https://developers.google.com/drive/api/v3/quickstart/go
+		// but that will have to be in future version of the code
+        	if err == nil {
+			ClientId = gconfig.ClientID
+			ClientSecret = gconfig.ClientSecret
+		}
+
+	}
+
+
 	if args.String("refreshToken") != "" && args.String("accessToken") != "" {
 		ExitF("Access token not needed when refresh token is provided")
 	}
@@ -353,7 +376,6 @@ func getOauthClient(args cli.Arguments) (*http.Client, error) {
 		return auth.NewAccessTokenClient(ClientId, ClientSecret, args.String("accessToken")), nil
 	}
 
-	configDir := getConfigDir(args)
 
 	if args.String("serviceAccount") != "" {
 		serviceAccountPath := ConfigFilePath(configDir, args.String("serviceAccount"))
@@ -365,6 +387,8 @@ func getOauthClient(args cli.Arguments) (*http.Client, error) {
 	}
 
 	tokenPath := ConfigFilePath(configDir, TokenFilename)
+
+	//println("Debug: using clientid=\n", ClientId);
 	return auth.NewFileSourceClient(ClientId, ClientSecret, tokenPath, authCodePrompt)
 }
 

handlers_meta.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/prasmussen/gdrive/cli"
+	"./cli"
 	"os"
 	"runtime"
 	"strings"