diff --git a/server/RdtClient.Service/Services/TorrentClients/PremiumizeTorrentClient.cs b/server/RdtClient.Service/Services/TorrentClients/PremiumizeTorrentClient.cs index dd258d8..59da932 100644 --- a/server/RdtClient.Service/Services/TorrentClients/PremiumizeTorrentClient.cs +++ b/server/RdtClient.Service/Services/TorrentClients/PremiumizeTorrentClient.cs @@ -1,5 +1,4 @@ -using System.Text.RegularExpressions; -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging; using Newtonsoft.Json; using PremiumizeNET; using RdtClient.Data.Enums; @@ -288,39 +287,6 @@ public class PremiumizeTorrentClient(ILogger logger, IH if (!String.IsNullOrWhiteSpace(item.Link)) { Log($"Found item {item.Name} in folder {folder.Name} ({folderId}) with link {item.Link}", torrent); - - if (item.Type == "file") - { - if (torrent.DownloadMinSize > 0) - { - if (item.Link.Length < torrent.DownloadMinSize * 1024 * 1024) - { - Log($"Not downloading {item.Name}, its size of {item.Link.Length} bytes is smaller than the minimum size of {torrent.DownloadMinSize} bytes", torrent); - - continue; - } - } - - if (!String.IsNullOrWhiteSpace(torrent.IncludeRegex)) - { - if (!Regex.IsMatch(item.Name, torrent.IncludeRegex)) - { - Log($"Not downloading {item.Name}, it does not match regex {torrent.IncludeRegex}", torrent); - - continue; - } - } - else if (!String.IsNullOrWhiteSpace(torrent.ExcludeRegex)) - { - if (Regex.IsMatch(item.Name, torrent.ExcludeRegex)) - { - Log($"Not downloading {item.Name}, it matches regex {torrent.ExcludeRegex}", torrent); - - continue; - } - } - } - downloadLinks.Add(item.Link); } else diff --git a/server/RdtClient.Service/Services/TorrentClients/TorBoxTorrentClient.cs b/server/RdtClient.Service/Services/TorrentClients/TorBoxTorrentClient.cs index cc0a6ce..1a542f4 100644 --- a/server/RdtClient.Service/Services/TorrentClients/TorBoxTorrentClient.cs +++ b/server/RdtClient.Service/Services/TorrentClients/TorBoxTorrentClient.cs @@ -1,4 +1,3 @@ -using System.Text.RegularExpressions; using Microsoft.Extensions.Logging; using Newtonsoft.Json; using TorBoxNET; @@ -6,7 +5,6 @@ using RdtClient.Data.Enums; using RdtClient.Data.Models.TorrentClient; using System.Web; using RdtClient.Data.Models.Data; -using RdtClient.Service.Helpers; namespace RdtClient.Service.Services.TorrentClients; @@ -286,48 +284,17 @@ public class TorBoxTorrentClient(ILogger logger, IHttpClien public async Task?> GetDownloadLinks(Torrent torrent) { + var files = new List(); + var torrentId = await GetClient().Torrents.GetHashInfoAsync(torrent.Hash, skipCache: true); - var selectedFiles = torrent.Files.Where(file => + foreach (var file in torrent.Files) { - var fileName = Path.GetFileName(file.Path); + var newFile = $"https://torbox.app/fakedl/{torrentId?.Id}/{file.Id}"; + files.Add(newFile); + } - if (torrent.DownloadMinSize > 0 && file.Bytes < torrent.DownloadMinSize * 1024 * 1024) - { - Log($"Not downloading {fileName}, its size of {file.Bytes} bytes is smaller than the minimum size of {torrent.DownloadMinSize} bytes", torrent); - - return false; - } - - if (!String.IsNullOrWhiteSpace(torrent.IncludeRegex)) - { - if (!Regex.IsMatch(fileName, torrent.IncludeRegex)) - { - Log($"Not downloading {fileName}, it does not match regex {torrent.IncludeRegex}", torrent); - - return false; - } - - // If IncludeRegex is set, don't look at ExcludeRegex - return true; - } - - if (!String.IsNullOrWhiteSpace(torrent.ExcludeRegex)) - { - if (Regex.IsMatch(fileName, torrent.ExcludeRegex)) - - { - Log($"Not downloading {fileName}, it matches regex {torrent.ExcludeRegex}", torrent); - - return false; - } - } - - return true; - }); - - return selectedFiles.Select(file => $"https://torbox.app/fakedl/{torrentId?.Id}/{file.Id}") - .ToList(); + return files; } public async Task GetFileName(String downloadUrl) @@ -372,14 +339,4 @@ public class TorBoxTorrentClient(ILogger logger, IHttpClien return Map(result!); } - - private void Log(String message, Torrent? torrent = null) - { - if (torrent != null) - { - message = $"{message} {torrent.ToLog()}"; - } - - logger.LogDebug(message); - } }