Migrate to full rclone rcd

pkg/debrid/debrid.go

@@ -12,22 +12,22 @@ import (
 	"github.com/sirrobot01/decypharr/pkg/debrid/providers/debrid_link"
 	"github.com/sirrobot01/decypharr/pkg/debrid/providers/realdebrid"
 	"github.com/sirrobot01/decypharr/pkg/debrid/providers/torbox"
-	"github.com/sirrobot01/decypharr/pkg/debrid/store"
+	debridStore "github.com/sirrobot01/decypharr/pkg/debrid/store"
 	"github.com/sirrobot01/decypharr/pkg/debrid/types"
-	"github.com/sirrobot01/decypharr/pkg/mount"
+	"github.com/sirrobot01/decypharr/pkg/rclone"
 	"sync"
 )
 
 type Debrid struct {
-	cache  *store.Cache // Could be nil if not using WebDAV
-	client types.Client // HTTP client for making requests to the debrid service
+	cache  *debridStore.Cache // Could be nil if not using WebDAV
+	client types.Client       // HTTP client for making requests to the debrid service
 }
 
 func (de *Debrid) Client() types.Client {
 	return de.client
 }
 
-func (de *Debrid) Cache() *store.Cache {
+func (de *Debrid) Cache() *debridStore.Cache {
 	return de.cache
 }
 
@@ -43,7 +43,7 @@ type Storage struct {
 	lastUsed string
 }
 
-func NewStorage() *Storage {
+func NewStorage(rcManager *rclone.Manager) *Storage {
 	cfg := config.Get()
 
 	_logger := logger.Default()
@@ -63,15 +63,15 @@ func NewStorage() *Storage {
 			continue
 		}
 		var (
-			cache   *store.Cache
-			mounter *mount.Mount
+			cache   *debridStore.Cache
+			mounter *rclone.Mount
 		)
 		_log := client.Logger()
 		if dc.UseWebDav {
-			if cfg.Rclone.Enabled {
-				mounter = mount.NewMount(dc.Name, webdavUrl)
+			if cfg.Rclone.Enabled && rcManager != nil {
+				mounter = rclone.NewMount(dc.Name, webdavUrl, rcManager)
 			}
-			cache = store.NewDebridCache(dc, client, mounter)
+			cache = debridStore.NewDebridCache(dc, client, mounter)
 			_log.Info().Msg("Debrid Service started with WebDAV")
 		} else {
 			_log.Info().Msg("Debrid Service started")
@@ -147,10 +147,10 @@ func (d *Storage) Clients() map[string]types.Client {
 	return clientsCopy
 }
 
-func (d *Storage) Caches() map[string]*store.Cache {
+func (d *Storage) Caches() map[string]*debridStore.Cache {
 	d.mu.RLock()
 	defer d.mu.RUnlock()
-	cachesCopy := make(map[string]*store.Cache)
+	cachesCopy := make(map[string]*debridStore.Cache)
 	for name, debrid := range d.debrids {
 		if debrid != nil && debrid.cache != nil {
 			cachesCopy[name] = debrid.cache
@@ -221,7 +221,7 @@ func Process(ctx context.Context, store *Storage, selectedDebrid string, magnet
 		debridTorrent.DownloadUncached = false
 	}
 
-	for index, db := range clients {
+	for _, db := range clients {
 		_logger := db.Logger()
 		_logger.Info().
 			Str("Debrid", db.Name()).
@@ -242,7 +242,7 @@ func Process(ctx context.Context, store *Storage, selectedDebrid string, magnet
 		}
 		dbt.Arr = a
 		_logger.Info().Str("id", dbt.Id).Msgf("Torrent: %s submitted to %s", dbt.Name, db.Name())
-		store.lastUsed = index
+		store.lastUsed = db.Name()
 
 		torrent, err := db.CheckStatus(dbt)
 		if err != nil && torrent != nil && torrent.Id != "" {

pkg/debrid/store/cache.go

@@ -6,7 +6,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/sirrobot01/decypharr/pkg/mount"
+	"github.com/sirrobot01/decypharr/pkg/rclone"
 	"os"
 	"path"
 	"path/filepath"
@@ -107,10 +107,10 @@ type Cache struct {
 
 	config        config.Debrid
 	customFolders []string
-	mounter       *mount.Mount
+	mounter       *rclone.Mount
 }
 
-func NewDebridCache(dc config.Debrid, client types.Client, mounter *mount.Mount) *Cache {
+func NewDebridCache(dc config.Debrid, client types.Client, mounter *rclone.Mount) *Cache {
 	cfg := config.Get()
 	cet, err := time.LoadLocation("CET")
 	if err != nil {

pkg/debrid/store/refresh.go

@@ -29,6 +29,12 @@ func (fi *fileInfo) IsDir() bool        { return fi.isDir }
 func (fi *fileInfo) ID() string         { return fi.id }
 func (fi *fileInfo) Sys() interface{}   { return nil }
 
+type RcloneRC struct {
+	URL  string
+	User string
+	Pass string
+}
+
 func (c *Cache) RefreshListings(refreshRclone bool) {
 	// Copy the torrents to a string|time map
 	c.torrents.refreshListing() // refresh torrent listings
@@ -147,10 +153,6 @@ func (c *Cache) refreshRcloneWithRC(dirs []string) error {
 		return nil
 	}
 
-	if cfg.RcUrl == "" {
-		return nil
-	}
-
 	client := http.DefaultClient
 	// Create form data
 	data := c.buildRcloneRequestData(dirs)