Changelog 0.3.2

pkg/debrid/debrid.go

@@ -34,10 +34,13 @@ type Service interface {
 	GetLogger() *log.Logger
 }
 
-func NewDebrid(debs []common.DebridConfig, cache *common.Cache) *DebridService {
+func NewDebrid(debs []common.DebridConfig, maxCachedSize int) *DebridService {
 	debrids := make([]Service, 0)
+	// Divide the cache size by the number of debrids
+	maxCacheSize := maxCachedSize / len(debs)
+
 	for _, dc := range debs {
-		d := createDebrid(dc, cache)
+		d := createDebrid(dc, common.NewCache(maxCacheSize))
 		d.GetLogger().Println("Debrid Service started")
 		debrids = append(debrids, d)
 	}
@@ -114,26 +117,27 @@ func getTorrentInfo(filePath string) (*Torrent, error) {
 
 func GetLocalCache(infohashes []string, cache *common.Cache) ([]string, map[string]bool) {
 	result := make(map[string]bool)
+	hashes := make([]string, 0)
 
-	//if len(infohashes) == 0 {
-	//	return hashes, result
-	//}
-	//if len(infohashes) == 1 {
-	//	if cache.Exists(infohashes[0]) {
-	//		return hashes, map[string]bool{infohashes[0]: true}
-	//	}
-	//	return infohashes, result
-	//}
-	//
-	//cachedHashes := cache.GetMultiple(infohashes)
-	//for _, h := range infohashes {
-	//	_, exists := cachedHashes[h]
-	//	if !exists {
-	//		hashes = append(hashes, h)
-	//	} else {
-	//		result[h] = true
-	//	}
-	//}
+	if len(infohashes) == 0 {
+		return hashes, result
+	}
+	if len(infohashes) == 1 {
+		if cache.Exists(infohashes[0]) {
+			return hashes, map[string]bool{infohashes[0]: true}
+		}
+		return infohashes, result
+	}
+
+	cachedHashes := cache.GetMultiple(infohashes)
+	for _, h := range infohashes {
+		_, exists := cachedHashes[h]
+		if !exists {
+			hashes = append(hashes, h)
+		} else {
+			result[h] = true
+		}
+	}
 
 	return infohashes, result
 }

pkg/debrid/debrid_link.go

@@ -39,8 +39,8 @@ func (r *DebridLink) IsAvailable(infohashes []string) map[string]bool {
 	}
 
 	// Divide hashes into groups of 100
-	for i := 0; i < len(hashes); i += 200 {
-		end := i + 200
+	for i := 0; i < len(hashes); i += 100 {
+		end := i + 100
 		if end > len(hashes) {
 			end = len(hashes)
 		}

pkg/debrid/realdebrid.go

@@ -168,7 +168,6 @@ func (r *RealDebrid) CheckStatus(torrent *Torrent, isSymlink bool) (*Torrent, er
 		var data structs.RealDebridTorrentInfo
 		err = json.Unmarshal(resp, &data)
 		status := data.Status
-		fmt.Println("RD STATUS: ", status)
 		name := common.RemoveInvalidChars(data.OriginalFilename)
 		torrent.Name = name // Important because some magnet changes the name
 		torrent.Folder = name
@@ -181,7 +180,7 @@ func (r *RealDebrid) CheckStatus(torrent *Torrent, isSymlink bool) (*Torrent, er
 		torrent.Links = data.Links
 		torrent.Status = status
 		torrent.Debrid = r
-		downloading_status := []string{"downloading", "magnet_conversion", "queued", "compressing", "uploading"}
+		downloadingStatus := []string{"downloading", "magnet_conversion", "queued", "compressing", "uploading"}
 		if status == "error" || status == "dead" || status == "magnet_error" {
 			return torrent, fmt.Errorf("torrent: %s has error: %s", torrent.Name, status)
 		} else if status == "waiting_files_selection" {
@@ -214,7 +213,7 @@ func (r *RealDebrid) CheckStatus(torrent *Torrent, isSymlink bool) (*Torrent, er
 				}
 			}
 			break
-		} else if slices.Contains(downloading_status, status) {
+		} else if slices.Contains(downloadingStatus, status) {
 			if !r.DownloadUncached {
 				return torrent, fmt.Errorf("torrent: %s not cached", torrent.Name)
 			}

pkg/debrid/service.go

@@ -11,3 +11,12 @@ func (d *DebridService) Get() Service {
 	}
 	return d.debrids[d.lastUsed]
 }
+
+func (d *DebridService) GetByName(name string) Service {
+	for _, deb := range d.debrids {
+		if deb.GetName() == name {
+			return deb
+		}
+	}
+	return nil
+}

pkg/debrid/torbox.go

@@ -45,8 +45,8 @@ func (r *Torbox) IsAvailable(infohashes []string) map[string]bool {
 	}
 
 	// Divide hashes into groups of 100
-	for i := 0; i < len(hashes); i += 200 {
-		end := i + 200
+	for i := 0; i < len(hashes); i += 100 {
+		end := i + 100
 		if end > len(hashes) {
 			end = len(hashes)
 		}
@@ -165,9 +165,6 @@ func (r *Torbox) GetTorrent(id string) (*Torrent, error) {
 	torrent.Filename = name
 	torrent.OriginalFilename = name
 	files := make([]TorrentFile, 0)
-	if len(data.Files) == 0 {
-		return torrent, fmt.Errorf("no files found for torrent: %s", name)
-	}
 	for _, f := range data.Files {
 		fileName := filepath.Base(f.Name)
 		if (!common.RegexMatch(common.VIDEOMATCH, fileName) &&
@@ -183,10 +180,13 @@ func (r *Torbox) GetTorrent(id string) (*Torrent, error) {
 		}
 		files = append(files, file)
 	}
-	if len(files) == 0 {
-		return torrent, fmt.Errorf("no video files found")
+	var cleanPath string
+	if len(files) > 0 {
+		cleanPath = path.Clean(data.Files[0].Name)
+	} else {
+		cleanPath = path.Clean(data.Name)
 	}
-	cleanPath := path.Clean(data.Files[0].Name)
+
 	torrent.OriginalFilename = strings.Split(cleanPath, "/")[0]
 	torrent.Files = files
 	torrent.Debrid = r
@@ -229,7 +229,7 @@ func (r *Torbox) CheckStatus(torrent *Torrent, isSymlink bool) (*Torrent, error)
 }
 
 func (r *Torbox) DeleteTorrent(torrent *Torrent) {
-	url := fmt.Sprintf("%s/api//torrents/controltorrent/%s", r.Host, torrent.Id)
+	url := fmt.Sprintf("%s/api/torrents/controltorrent/%s", r.Host, torrent.Id)
 	payload := map[string]string{"torrent_id": torrent.Id, "action": "Delete"}
 	jsonPayload, _ := json.Marshal(payload)
 	req, _ := http.NewRequest(http.MethodDelete, url, bytes.NewBuffer(jsonPayload))