refactor service account / banned remotes logic into rclone package

Author: l3uddz

cmd/upload.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"github.com/dustin/go-humanize"
 	"github.com/l3uddz/crop/config"
+	"github.com/l3uddz/crop/rclone"
 	"github.com/l3uddz/crop/uploader"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -48,7 +49,7 @@ var uploadCmd = &cobra.Command{
 			} else {
 				// no service accounts were loaded
 				// check to see if any of the copy or move remote(s) are banned
-				banned, expiry := upload.RemotesBanned(upload.Config.Remotes.Copy)
+				banned, expiry := rclone.AnyRemotesBanned(upload.Config.Remotes.Copy)
 				if banned && !expiry.IsZero() {
 					// one of the copy remotes is banned, abort
 					upload.Log.WithFields(logrus.Fields{
@@ -58,7 +59,7 @@ var uploadCmd = &cobra.Command{
 					continue
 				}
 
-				banned, expiry = upload.RemotesBanned([]string{upload.Config.Remotes.Move})
+				banned, expiry = rclone.AnyRemotesBanned([]string{upload.Config.Remotes.Move})
 				if banned && !expiry.IsZero() {
 					// the move remote is banned, abort
 					upload.Log.WithFields(logrus.Fields{

uploader/cache.go rclone/sa.gouploader/cache.go renamed to rclone/sa.go

@@ -1,4 +1,4 @@
-package uploader
+package rclone
 
 import (
 	"github.com/l3uddz/crop/cache"
@@ -9,11 +9,11 @@ import (
 )
 
 /* Private */
-func (u *Uploader) getAvailableServiceAccount() (*pathutils.Path, error) {
+func GetAvailableServiceAccount(serviceAccountFiles []pathutils.Path) (*pathutils.Path, error) {
 	var serviceAccountFile *pathutils.Path = nil
 
 	// find an unbanned service account
-	for _, sa := range u.ServiceAccountFiles {
+	for _, sa := range serviceAccountFiles {
 		// does the cache already contain this service account?
 		if exists, _ := cache.Get(sa.RealPath); exists {
 			// service account is currently banned
@@ -34,7 +34,7 @@ func (u *Uploader) getAvailableServiceAccount() (*pathutils.Path, error) {
 }
 
 /* Public */
-func (u *Uploader) RemotesBanned(remotes []string) (bool, time.Time) {
+func AnyRemotesBanned(remotes []string) (bool, time.Time) {
 	var banned bool
 	var expires time.Time
 

uploader/copy.go

@@ -29,7 +29,7 @@ func (u *Uploader) Copy(additionalRcloneParams []string) error {
 			var err error
 
 			if u.ServiceAccountCount > 0 {
-				serviceAccount, err = u.getAvailableServiceAccount()
+				serviceAccount, err = rclone.GetAvailableServiceAccount(u.ServiceAccountFiles)
 				if err != nil {
 					return errors.WithMessagef(err,
 						"aborting further copy attempts of %q due to serviceAccount exhaustion",

uploader/move.go

@@ -57,7 +57,7 @@ func (u *Uploader) Move(serverSide bool, additionalRcloneParams []string) error
 
 			if u.ServiceAccountCount > 0 && !serverSide {
 				// server side moves not supported with service account files
-				serviceAccount, err = u.getAvailableServiceAccount()
+				serviceAccount, err = rclone.GetAvailableServiceAccount(u.ServiceAccountFiles)
 				if err != nil {
 					return errors.WithMessagef(err,
 						"aborting further move attempts of %q due to serviceAccount exhaustion",