diff --git a/pkg/debrid/torbox.go b/pkg/debrid/torbox.go index 7ac4ba1..4b2e2dd 100644 --- a/pkg/debrid/torbox.go +++ b/pkg/debrid/torbox.go @@ -11,6 +11,7 @@ import ( "net/http" gourl "net/url" "os" + "path" "slices" "strconv" "strings" @@ -170,6 +171,10 @@ func (r *Torbox) GetTorrent(id string) (*Torrent, error) { Size: f.Size, } } + if len(files) > 0 && name == data.Hash { + cleanPath := path.Clean(files[0].Name) + torrent.OriginalFilename = strings.Split(strings.TrimPrefix(cleanPath, "/"), "/")[0] + } torrent.Files = files torrent.Debrid = r return torrent, nil diff --git a/pkg/debrid/torrent.go b/pkg/debrid/torrent.go index 2d03ebe..ba3a104 100644 --- a/pkg/debrid/torrent.go +++ b/pkg/debrid/torrent.go @@ -57,12 +57,11 @@ func (t *Torrent) GetSymlinkFolder(parent string) string { } func (t *Torrent) GetMountFolder(rClonePath string) string { - pathWithNoExt := common.RemoveExtension(t.OriginalFilename) if common.FileReady(filepath.Join(rClonePath, t.OriginalFilename)) { return t.OriginalFilename } else if common.FileReady(filepath.Join(rClonePath, t.Filename)) { return t.Filename - } else if common.FileReady(filepath.Join(rClonePath, pathWithNoExt)) { + } else if pathWithNoExt := common.RemoveExtension(t.OriginalFilename); common.FileReady(filepath.Join(rClonePath, pathWithNoExt)) { return pathWithNoExt } else { return "" diff --git a/pkg/qbit/downloader.go b/pkg/qbit/downloader.go index 2d9933e..f874c34 100644 --- a/pkg/qbit/downloader.go +++ b/pkg/qbit/downloader.go @@ -4,7 +4,6 @@ import ( "goBlack/common" "goBlack/pkg/debrid" "goBlack/pkg/qbit/downloaders" - "log" "os" "path/filepath" "sync" @@ -60,7 +59,6 @@ func (q *QBit) processSymlink(torrent *Torrent, debridTorrent *debrid.Torrent, a q.logger.Printf("Checking %d files...", len(files)) rCloneBase := debridTorrent.Debrid.GetMountPath() - log.Println("Rclone base:", rCloneBase) torrentPath, err := q.getTorrentPath(rCloneBase, debridTorrent) // /MyTVShow/ if err != nil { q.MarkAsFailed(torrent)