fix mounts; backward compatibility

pkg/qbit/downloader.go

@@ -52,14 +52,13 @@ Loop:
 func (q *QBit) ProcessManualFile(torrent *Torrent) (string, error) {
 	debridTorrent := torrent.DebridTorrent
 	q.logger.Info().Msgf("Downloading %d files...", len(debridTorrent.DownloadLinks))
-	torrentPath := common.RemoveExtension(debridTorrent.OriginalFilename)
-	parent := common.RemoveInvalidChars(filepath.Join(q.DownloadFolder, debridTorrent.Arr.Name, torrentPath))
-	err := os.MkdirAll(parent, os.ModePerm)
+	torrentPath := common.RemoveInvalidChars(filepath.Join(q.DownloadFolder, debridTorrent.Arr.Name, common.RemoveExtension(debridTorrent.OriginalFilename)))
+	err := os.MkdirAll(torrentPath, os.ModePerm)
 	if err != nil {
 		// add previous error to the error and return
-		return "", fmt.Errorf("failed to create directory: %s: %v", parent, err)
+		return "", fmt.Errorf("failed to create directory: %s: %v", torrentPath, err)
 	}
-	q.downloadFiles(torrent, parent)
+	q.downloadFiles(torrent, torrentPath)
 	return torrentPath, nil
 }
 
@@ -140,25 +139,26 @@ func (q *QBit) ProcessSymlink(torrent *Torrent) (string, error) {
 	if len(files) == 0 {
 		return "", fmt.Errorf("no video files found")
 	}
-	q.logger.Info().Msgf("Checking %d files...", len(files))
+	q.logger.Info().Msgf("Checking symlinks for %d files...", len(files))
 	rCloneBase := debridTorrent.MountPath
 	torrentPath, err := q.getTorrentPath(rCloneBase, debridTorrent) // /MyTVShow/
+	// This returns filename.ext for alldebrid instead of the parent folder filename/
+	torrentFolder := torrentPath
 	if err != nil {
 		return "", fmt.Errorf("failed to get torrent path: %v", err)
 	}
-	// Fix for alldebrid
-	newTorrentPath := torrentPath
-	if newTorrentPath == "" {
-		// Alldebrid at times doesn't return the parent folder for single file torrents
-		newTorrentPath = common.RemoveExtension(debridTorrent.Name) // MyTVShow
+	// Check if the torrent path is a file
+	torrentRclonePath := filepath.Join(rCloneBase, torrentPath) // leave it as is
+	if debridTorrent.Debrid == "alldebrid" && len(files) == 1 {
+		// Alldebrid hotfix for single file torrents
+		torrentFolder = common.RemoveExtension(torrentFolder)
+		torrentRclonePath = rCloneBase // /mnt/rclone/magnets/  // Remove the filename since it's in the root folder
 	}
-	torrentSymlinkPath := filepath.Join(q.DownloadFolder, debridTorrent.Arr.Name, newTorrentPath) // /mnt/symlinks/{category}/MyTVShow/
+	torrentSymlinkPath := filepath.Join(q.DownloadFolder, debridTorrent.Arr.Name, torrentFolder) // /mnt/symlinks/{category}/MyTVShow/
 	err = os.MkdirAll(torrentSymlinkPath, os.ModePerm)
 	if err != nil {
 		return "", fmt.Errorf("failed to create directory: %s: %v", torrentSymlinkPath, err)
 	}
-	torrentRclonePath := filepath.Join(rCloneBase, torrentPath) // leave it as is
-	q.logger.Debug().Msgf("Debrid torrent path: %s\nSymlink Path: %s", torrentRclonePath, torrentSymlinkPath)
 	for _, file := range files {
 		wg.Add(1)
 		go checkFileLoop(&wg, torrentRclonePath, file, ready)
@@ -173,12 +173,11 @@ func (q *QBit) ProcessSymlink(torrent *Torrent) (string, error) {
 		q.logger.Info().Msgf("File is ready: %s", f.Path)
 		q.createSymLink(torrentSymlinkPath, torrentRclonePath, f)
 	}
-	return torrentPath, nil
+	return torrentSymlinkPath, nil
 }
 
 func (q *QBit) getTorrentPath(rclonePath string, debridTorrent *debrid.Torrent) (string, error) {
 	for {
-		q.logger.Debug().Msgf("Checking for torrent path: %s", rclonePath)
 		torrentPath, err := debridTorrent.GetMountFolder(rclonePath)
 		if err == nil {
 			q.logger.Debug().Msgf("Found torrent path: %s", torrentPath)

pkg/qbit/import.go

@@ -74,6 +74,7 @@ func (i *ImportRequest) Process(q *QBit) (err error) {
 	torrent := CreateTorrentFromMagnet(magnet, i.Arr.Name, "manual")
 	debridTorrent, err := debrid.ProcessTorrent(svc.Debrid, magnet, i.Arr, i.IsSymlink)
 	if err != nil || debridTorrent == nil {
+		fmt.Println("Error deleting torrent: ", err)
 		if debridTorrent != nil {
 			dbClient := service.GetDebrid().GetByName(debridTorrent.Debrid)
 			go dbClient.DeleteTorrent(debridTorrent)

pkg/qbit/qbit.go

@@ -6,6 +6,7 @@ import (
 	"github.com/sirrobot01/debrid-blackhole/internal/config"
 	"github.com/sirrobot01/debrid-blackhole/internal/logger"
 	"os"
+	"path/filepath"
 )
 
 type QBit struct {
@@ -22,7 +23,8 @@ type QBit struct {
 }
 
 func New() *QBit {
-	cfg := config.GetConfig().QBitTorrent
+	_cfg := config.GetConfig()
+	cfg := _cfg.QBitTorrent
 	port := cmp.Or(cfg.Port, os.Getenv("QBIT_PORT"), "8282")
 	refreshInterval := cmp.Or(cfg.RefreshInterval, 10)
 	return &QBit{
@@ -31,7 +33,7 @@ func New() *QBit {
 		Port:            port,
 		DownloadFolder:  cfg.DownloadFolder,
 		Categories:      cfg.Categories,
-		Storage:         NewTorrentStorage(cmp.Or(os.Getenv("TORRENT_FILE"), "/data/qbit_torrents.json")),
+		Storage:         NewTorrentStorage(filepath.Join(_cfg.Path, "torrents.json")),
 		logger:          logger.NewLogger("qbit", cfg.LogLevel, os.Stdout),
 		RefreshInterval: refreshInterval,
 	}

pkg/qbit/routes.go

@@ -2,15 +2,11 @@ package qbit
 
 import (
 	"github.com/go-chi/chi/v5"
-	"github.com/go-chi/chi/v5/middleware"
 	"net/http"
 )
 
 func (q *QBit) Routes() http.Handler {
 	r := chi.NewRouter()
-	if q.logger.GetLevel().String() == "debug" {
-		r.Use(middleware.Logger)
-	}
 	r.Use(q.CategoryContext)
 	r.Post("/auth/login", q.handleLogin)
 

pkg/qbit/torrent.go

@@ -90,14 +90,14 @@ func (q *QBit) ProcessFiles(torrent *Torrent, debridTorrent *debrid.Torrent, arr
 		torrent = q.UpdateTorrentMin(torrent, debridTorrent)
 	}
 	var (
-		torrentPath string
-		err         error
+		torrentSymlinkPath string
+		err                error
 	)
 	debridTorrent.Arr = arr
 	if isSymlink {
-		torrentPath, err = q.ProcessSymlink(torrent)
+		torrentSymlinkPath, err = q.ProcessSymlink(torrent) // /mnt/symlinks/{category}/MyTVShow/
 	} else {
-		torrentPath, err = q.ProcessManualFile(torrent)
+		torrentSymlinkPath, err = q.ProcessManualFile(torrent)
 	}
 	if err != nil {
 		q.MarkAsFailed(torrent)
@@ -105,7 +105,7 @@ func (q *QBit) ProcessFiles(torrent *Torrent, debridTorrent *debrid.Torrent, arr
 		q.logger.Info().Msgf("Error: %v", err)
 		return
 	}
-	torrent.TorrentPath = filepath.Base(torrentPath)
+	torrent.TorrentPath = torrentSymlinkPath
 	q.UpdateTorrent(torrent, debridTorrent)
 	_ = arr.Refresh()
 }
@@ -161,7 +161,6 @@ func (q *QBit) UpdateTorrentMin(t *Torrent, debridTorrent *debrid.Torrent) *Torr
 
 func (q *QBit) UpdateTorrent(t *Torrent, debridTorrent *debrid.Torrent) *Torrent {
 	_db := service.GetDebrid().GetByName(debridTorrent.Debrid)
-	rcLoneMount := _db.GetMountPath()
 	if debridTorrent == nil && t.ID != "" {
 		debridTorrent, _ = _db.GetTorrent(t.ID)
 	}
@@ -172,15 +171,9 @@ func (q *QBit) UpdateTorrent(t *Torrent, debridTorrent *debrid.Torrent) *Torrent
 	if debridTorrent.Status != "downloaded" {
 		debridTorrent, _ = _db.GetTorrent(t.ID)
 	}
-
-	if t.TorrentPath == "" {
-		tPath, _ := debridTorrent.GetMountFolder(rcLoneMount)
-		t.TorrentPath = filepath.Base(tPath)
-	}
-	savePath := filepath.Join(q.DownloadFolder, t.Category) + string(os.PathSeparator)
-	torrentPath := filepath.Join(savePath, t.TorrentPath) + string(os.PathSeparator)
 	t = q.UpdateTorrentMin(t, debridTorrent)
-	t.ContentPath = torrentPath
+	t.ContentPath = t.TorrentPath + string(os.PathSeparator)
+	t.SavePath = t.ContentPath
 
 	if t.IsReady() {
 		t.State = "pausedUP"