public/cleanuperr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix content blocker env var usage (#44)

Browse Source
This commit is contained in:
Marius Nechifor
2025-01-18 16:23:34 +02:00
committed by GitHub
parent 666c2656ec
commit b88ddde417
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/Infrastructure/Verticals/DownloadClient/Deluge/DelugeService.cs
+3 -2
View File
@@ -20,9 +20,10 @@ public sealed class DelugeService : DownloadServiceBase
IOptions<DelugeConfig> config, IOptions<DelugeConfig> config,
IHttpClientFactory httpClientFactory, IHttpClientFactory httpClientFactory,
IOptions<QueueCleanerConfig> queueCleanerConfig, IOptions<QueueCleanerConfig> queueCleanerConfig,
IOptions<ContentBlockerConfig> contentBlockerConfig,
FilenameEvaluator filenameEvaluator, FilenameEvaluator filenameEvaluator,
Striker striker Striker striker
) : base(logger, queueCleanerConfig, filenameEvaluator, striker) ) : base(logger, queueCleanerConfig, contentBlockerConfig, filenameEvaluator, striker)
{ {
config.Value.Validate(); config.Value.Validate();
_client = new (config, httpClientFactory); _client = new (config, httpClientFactory);
@@ -92,7 +93,7 @@ public sealed class DelugeService : DownloadServiceBase
return false; return false;
} }
if (_queueCleanerConfig.StalledIgnorePrivate && status.Private) if (_contentBlockerConfig.IgnorePrivate && status.Private)
{ {
// ignore private trackers // ignore private trackers
_logger.LogDebug("skip files check | download is private | {name}", status.Name); _logger.LogDebug("skip files check | download is private | {name}", status.Name);
code/Infrastructure/Verticals/DownloadClient/DownloadServiceBase.cs
+3
View File
@@ -14,18 +14,21 @@ public abstract class DownloadServiceBase : IDownloadService
{ {
protected readonly ILogger<DownloadServiceBase> _logger; protected readonly ILogger<DownloadServiceBase> _logger;
protected readonly QueueCleanerConfig _queueCleanerConfig; protected readonly QueueCleanerConfig _queueCleanerConfig;
protected readonly ContentBlockerConfig _contentBlockerConfig;
protected readonly FilenameEvaluator _filenameEvaluator; protected readonly FilenameEvaluator _filenameEvaluator;
protected readonly Striker _striker; protected readonly Striker _striker;
protected DownloadServiceBase( protected DownloadServiceBase(
ILogger<DownloadServiceBase> logger, ILogger<DownloadServiceBase> logger,
IOptions<QueueCleanerConfig> queueCleanerConfig, IOptions<QueueCleanerConfig> queueCleanerConfig,
IOptions<ContentBlockerConfig> contentBlockerConfig,
FilenameEvaluator filenameEvaluator, FilenameEvaluator filenameEvaluator,
Striker striker Striker striker
) )
{ {
_logger = logger; _logger = logger;
_queueCleanerConfig = queueCleanerConfig.Value; _queueCleanerConfig = queueCleanerConfig.Value;
_contentBlockerConfig = contentBlockerConfig.Value;
_filenameEvaluator = filenameEvaluator; _filenameEvaluator = filenameEvaluator;
_striker = striker; _striker = striker;
} }
code/Infrastructure/Verticals/DownloadClient/DummyDownloadService.cs
+1 -1
View File
@@ -11,7 +11,7 @@ namespace Infrastructure.Verticals.DownloadClient;
public sealed class DummyDownloadService : DownloadServiceBase public sealed class DummyDownloadService : DownloadServiceBase
{ {
public DummyDownloadService(ILogger<DownloadServiceBase> logger, IOptions<QueueCleanerConfig> queueCleanerConfig, FilenameEvaluator filenameEvaluator, Striker striker) : base(logger, queueCleanerConfig, filenameEvaluator, striker) public DummyDownloadService(ILogger<DownloadServiceBase> logger, IOptions<QueueCleanerConfig> queueCleanerConfig, IOptions<ContentBlockerConfig> contentBlockerConfig, FilenameEvaluator filenameEvaluator, Striker striker) : base(logger, queueCleanerConfig, contentBlockerConfig, filenameEvaluator, striker)
{ {
} }
code/Infrastructure/Verticals/DownloadClient/QBittorrent/QBitService.cs
+3 -2
View File
@@ -22,9 +22,10 @@ public sealed class QBitService : DownloadServiceBase
IHttpClientFactory httpClientFactory, IHttpClientFactory httpClientFactory,
IOptions<QBitConfig> config, IOptions<QBitConfig> config,
IOptions<QueueCleanerConfig> queueCleanerConfig, IOptions<QueueCleanerConfig> queueCleanerConfig,
IOptions<ContentBlockerConfig> contentBlockerConfig,
FilenameEvaluator filenameEvaluator, FilenameEvaluator filenameEvaluator,
Striker striker Striker striker
) : base(logger, queueCleanerConfig, filenameEvaluator, striker) ) : base(logger, queueCleanerConfig, contentBlockerConfig, filenameEvaluator, striker)
{ {
_config = config.Value; _config = config.Value;
_config.Validate(); _config.Validate();
@@ -116,7 +117,7 @@ public sealed class QBitService : DownloadServiceBase
bool.TryParse(dictValue?.ToString(), out bool boolValue) bool.TryParse(dictValue?.ToString(), out bool boolValue)
&& boolValue; && boolValue;
if (_queueCleanerConfig.StalledIgnorePrivate && isPrivate) if (_contentBlockerConfig.IgnorePrivate && isPrivate)
{ {
// ignore private trackers // ignore private trackers
_logger.LogDebug("skip files check | download is private | {name}", torrent.Name); _logger.LogDebug("skip files check | download is private | {name}", torrent.Name);
code/Infrastructure/Verticals/DownloadClient/Transmission/TransmissionService.cs
+3 -2
View File
@@ -25,9 +25,10 @@ public sealed class TransmissionService : DownloadServiceBase
ILogger<TransmissionService> logger, ILogger<TransmissionService> logger,
IOptions<TransmissionConfig> config, IOptions<TransmissionConfig> config,
IOptions<QueueCleanerConfig> queueCleanerConfig, IOptions<QueueCleanerConfig> queueCleanerConfig,
IOptions<ContentBlockerConfig> contentBlockerConfig,
FilenameEvaluator filenameEvaluator, FilenameEvaluator filenameEvaluator,
Striker striker Striker striker
) : base(logger, queueCleanerConfig, filenameEvaluator, striker) ) : base(logger, queueCleanerConfig, contentBlockerConfig, filenameEvaluator, striker)
{ {
_config = config.Value; _config = config.Value;
_config.Validate(); _config.Validate();
@@ -95,7 +96,7 @@ public sealed class TransmissionService : DownloadServiceBase
return false; return false;
} }
if (_queueCleanerConfig.StalledIgnorePrivate && (torrent.IsPrivate ?? false)) if (_contentBlockerConfig.IgnorePrivate && (torrent.IsPrivate ?? false))
{ {
// ignore private trackers // ignore private trackers
_logger.LogDebug("skip files check | download is private | {name}", torrent.Name); _logger.LogDebug("skip files check | download is private | {name}", torrent.Name);