change(service-account-server): refactor into own package and implement for uploader

Author: l3uddz

cmd/sync.go

@@ -123,7 +123,8 @@ func performSync(s *syncer.Syncer) error {
 	s.Log.Info("Running...")
 
 	var gcloneParams []string
-	if strings.Contains(s.GlobalConfig.Rclone.Path, "gclone") {
+	if strings.Contains(s.GlobalConfig.Rclone.Path, "gclone") &&
+		s.RemoteServiceAccountFiles.ServiceAccountsCount() > 0 {
 		// start web-server
 		s.Ws.Run()
 		defer s.Ws.Stop()

cmd/upload.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"fmt"
 	"github.com/dustin/go-humanize"
 	"github.com/l3uddz/crop/cache"
 	"github.com/l3uddz/crop/config"
@@ -116,6 +117,20 @@ func init() {
 func performUpload(u *uploader.Uploader) error {
 	u.Log.Info("Running...")
 
+	var gcloneParams []string
+
+	if strings.Contains(u.GlobalConfig.Rclone.Path, "gclone") &&
+		u.RemoteServiceAccountFiles.ServiceAccountsCount() > 0 {
+		// start web-server
+		u.Ws.Run()
+		defer u.Ws.Stop()
+
+		gcloneParams = append(gcloneParams,
+			"--drive-service-account-url",
+			fmt.Sprintf("http://%s:%d", u.Ws.Host, u.Ws.Port),
+		)
+	}
+
 	/* Cleans */
 	if u.Config.Hidden.Enabled {
 		err := performClean(u)
@@ -132,6 +147,11 @@ func performUpload(u *uploader.Uploader) error {
 		additionalRcloneParams = u.CheckRcloneParams()
 	}
 
+	// add gclone params set
+	if len(gcloneParams) > 0 {
+		additionalRcloneParams = append(additionalRcloneParams, gcloneParams...)
+	}
+
 	/* Copies */
 	if len(u.Config.Remotes.Copy) > 0 {
 		u.Log.Info("Running copies...")

syncer/syncer.go

@@ -4,6 +4,7 @@ import (
 	"github.com/l3uddz/crop/config"
 	"github.com/l3uddz/crop/logger"
 	"github.com/l3uddz/crop/rclone"
+	"github.com/l3uddz/crop/web"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
@@ -15,7 +16,7 @@ type Syncer struct {
 	Config                    *config.SyncerConfig
 	Name                      string
 	RemoteServiceAccountFiles *rclone.ServiceAccountManager
-	Ws                        *WebServer
+	Ws                        *web.Server
 }
 
 func New(config *config.Configuration, syncerConfig *config.SyncerConfig, syncerName string, parallelism int) (*Syncer, error) {
@@ -40,7 +41,7 @@ func New(config *config.Configuration, syncerConfig *config.SyncerConfig, syncer
 		Config:                    syncerConfig,
 		Name:                      syncerName,
 		RemoteServiceAccountFiles: sam,
-		Ws:                        newWebServer("127.0.0.1", l, syncerName, sam),
+		Ws:                        web.New("127.0.0.1", l, syncerName, sam),
 	}
 
 	return syncer, nil

syncer/web.go

@@ -9,6 +9,7 @@ import (
 	"github.com/l3uddz/crop/reutils"
 	"github.com/l3uddz/crop/uploader/checker"
 	"github.com/l3uddz/crop/uploader/cleaner"
+	"github.com/l3uddz/crop/web"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"regexp"
@@ -34,6 +35,8 @@ type Uploader struct {
 	LocalFilesSize uint64
 	HiddenFiles    []pathutils.Path
 	HiddenFolders  []pathutils.Path
+
+	Ws *web.Server
 }
 
 func New(config *config.Configuration, uploaderConfig *config.UploaderConfig, uploaderName string) (*Uploader, error) {
@@ -100,8 +103,9 @@ func New(config *config.Configuration, uploaderConfig *config.UploaderConfig, up
 	}
 
 	// init uploader
+	l := logger.GetLogger(uploaderName)
 	uploader := &Uploader{
-		Log:                       logger.GetLogger(uploaderName),
+		Log:                       l,
 		GlobalConfig:              config,
 		Config:                    uploaderConfig,
 		Name:                      uploaderName,
@@ -110,6 +114,7 @@ func New(config *config.Configuration, uploaderConfig *config.UploaderConfig, up
 		IncludePatterns:           includePatterns,
 		ExcludePatterns:           excludePatterns,
 		RemoteServiceAccountFiles: sam,
+		Ws:                        web.New("127.0.0.1", l, uploaderName, sam),
 	}
 
 	return uploader, nil