From 9299314b1498054a9f337ba37e6d354d9ae13bc5 Mon Sep 17 00:00:00 2001 From: Cucumberrbob <128094686+Cucumberrbob@users.noreply.github.com> Date: Thu, 13 Feb 2025 11:50:40 +0000 Subject: [PATCH] Log when rejecting files in `TB` `GetDownloadLinks` --- .../TorrentClients/TorBoxTorrentClient.cs | 33 +++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/server/RdtClient.Service/Services/TorrentClients/TorBoxTorrentClient.cs b/server/RdtClient.Service/Services/TorrentClients/TorBoxTorrentClient.cs index 3c64d05..506912a 100644 --- a/server/RdtClient.Service/Services/TorrentClients/TorBoxTorrentClient.cs +++ b/server/RdtClient.Service/Services/TorrentClients/TorBoxTorrentClient.cs @@ -6,6 +6,7 @@ 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; @@ -289,19 +290,37 @@ public class TorBoxTorrentClient(ILogger logger, IHttpClien var selectedFiles = torrent.Files.Where(file => { + var fileName = Path.GetFileName(file.Path); + 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)) { - return !Regex.IsMatch(Path.GetFileName(file.Path), 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)) { - return Regex.IsMatch(Path.GetFileName(file.Path), torrent.ExcludeRegex); + if (Regex.IsMatch(fileName, torrent.ExcludeRegex)) + + { + Log($"Not downloading {fileName}, it matches regex {torrent.ExcludeRegex}", torrent); + + return false; + } } return true; @@ -353,4 +372,14 @@ 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); + } }