- Delete empty files selected torrents

- Add more info to UI
- Add a global file download limit for local downloads

pkg/debrid/alldebrid/alldebrid.go

@@ -232,14 +232,12 @@ func (ad *AllDebrid) CheckStatus(torrent *types.Torrent, isSymlink bool) (*types
 			break
 		} else if slices.Contains(ad.GetDownloadingStatus(), status) {
 			if !torrent.DownloadUncached {
-				_ = ad.DeleteTorrent(torrent.Id)
 				return torrent, fmt.Errorf("torrent: %s not cached", torrent.Name)
 			}
 			// Break out of the loop if the torrent is downloading.
 			// This is necessary to prevent infinite loop since we moved to sync downloading and async processing
 			return torrent, nil
 		} else {
-			_ = ad.DeleteTorrent(torrent.Id)
 			return torrent, fmt.Errorf("torrent: %s has error", torrent.Name)
 		}
 

pkg/debrid/debrid/debrid.go

@@ -76,7 +76,12 @@ func ProcessTorrent(d *Engine, magnet *utils.Magnet, a *arr.Arr, isSymlink, over
 		}
 		logger.Info().Msgf("Torrent: %s(id=%s) submitted to %s", dbt.Name, dbt.Id, db.GetName())
 		d.LastUsed = index
-		return db.CheckStatus(dbt, isSymlink)
+		torrent, err := db.CheckStatus(dbt, isSymlink)
+		if err != nil && torrent != nil && torrent.Id != "" {
+			// Delete the torrent if it was not downloaded
+			_ = db.DeleteTorrent(torrent.Id)
+		}
+		return torrent, err
 	}
 	err := fmt.Errorf("failed to process torrent")
 	for _, e := range errs {

pkg/debrid/debrid/repair.go

@@ -167,14 +167,14 @@ func (c *Cache) reInsertTorrent(ct *CachedTorrent) (*CachedTorrent, error) {
 	}
 	torrent.DownloadUncached = false // Set to false, avoid re-downloading
 	torrent, err = c.client.CheckStatus(torrent, true)
-	if err != nil && torrent != nil {
+	if err != nil {
+		if torrent != nil && torrent.Id != "" {
+			// Delete the torrent if it was not downloaded
+			_ = c.client.DeleteTorrent(torrent.Id)
+		}
 		c.failedToReinsert.Store(oldID, struct{}{})
 		return ct, fmt.Errorf("failed to check status: %w", err)
 	}
-	if torrent == nil {
-		c.failedToReinsert.Store(oldID, struct{}{})
-		return ct, fmt.Errorf("failed to check status: empty torrent")
-	}
 
 	// Update the torrent in the cache
 	addedOn, err := time.Parse(time.RFC3339, torrent.Added)

pkg/debrid/debrid_link/debrid_link.go

@@ -227,14 +227,12 @@ func (dl *DebridLink) CheckStatus(torrent *types.Torrent, isSymlink bool) (*type
 			break
 		} else if slices.Contains(dl.GetDownloadingStatus(), status) {
 			if !torrent.DownloadUncached {
-				_ = dl.DeleteTorrent(torrent.Id)
 				return torrent, fmt.Errorf("torrent: %s not cached", torrent.Name)
 			}
 			// Break out of the loop if the torrent is downloading.
 			// This is necessary to prevent infinite loop since we moved to sync downloading and async processing
 			return torrent, nil
 		} else {
-			_ = dl.DeleteTorrent(torrent.Id)
 			return torrent, fmt.Errorf("torrent: %s has error", torrent.Name)
 		}
 

pkg/debrid/realdebrid/realdebrid.go

@@ -354,12 +354,10 @@ func (r *RealDebrid) CheckStatus(t *types.Torrent, isSymlink bool) (*types.Torre
 			break
 		} else if slices.Contains(r.GetDownloadingStatus(), status) {
 			if !t.DownloadUncached {
-				_ = r.DeleteTorrent(t.Id)
 				return t, fmt.Errorf("torrent: %s not cached", t.Name)
 			}
 			return t, nil
 		} else {
-			_ = r.DeleteTorrent(t.Id)
 			return t, fmt.Errorf("torrent: %s has error: %s", t.Name, status)
 		}
 
@@ -482,7 +480,7 @@ func (r *RealDebrid) _getDownloadLink(file *types.File) (*types.DownloadLink, er
 	}
 	var data UnrestrictResponse
 	if err = json.Unmarshal(b, &data); err != nil {
-		return nil, err
+		return nil, fmt.Errorf("realdebrid API error: Error unmarshalling response: %w", err)
 	}
 	if data.Download == "" {
 		return nil, fmt.Errorf("realdebrid API error: download link not found")

pkg/debrid/torbox/torbox.go

@@ -11,11 +11,13 @@ import (
 	"github.com/sirrobot01/decypharr/internal/request"
 	"github.com/sirrobot01/decypharr/internal/utils"
 	"github.com/sirrobot01/decypharr/pkg/debrid/types"
+	"github.com/sirrobot01/decypharr/pkg/version"
 	"mime/multipart"
 	"net/http"
 	gourl "net/url"
 	"path"
 	"path/filepath"
+	"runtime"
 	"slices"
 	"strconv"
 	"strings"
@@ -41,6 +43,7 @@ func New(dc config.Debrid) *Torbox {
 
 	headers := map[string]string{
 		"Authorization": fmt.Sprintf("Bearer %s", dc.APIKey),
+		"User-Agent":    fmt.Sprintf("Decypharr/%s (%s; %s)", version.GetInfo(), runtime.GOOS, runtime.GOARCH),
 	}
 	_log := logger.New(dc.Name)
 	client := request.New(
@@ -259,14 +262,12 @@ func (tb *Torbox) CheckStatus(torrent *types.Torrent, isSymlink bool) (*types.To
 			break
 		} else if slices.Contains(tb.GetDownloadingStatus(), status) {
 			if !torrent.DownloadUncached {
-				_ = tb.DeleteTorrent(torrent.Id)
 				return torrent, fmt.Errorf("torrent: %s not cached", torrent.Name)
 			}
 			// Break out of the loop if the torrent is downloading.
 			// This is necessary to prevent infinite loop since we moved to sync downloading and async processing
 			return torrent, nil
 		} else {
-			_ = tb.DeleteTorrent(torrent.Id)
 			return torrent, fmt.Errorf("torrent: %s has error", torrent.Name)
 		}