fixed merge conflicts

This commit is contained in:
Flaminel
2025-02-26 22:29:24 +02:00
parent c27ee326f7
commit 6b33075a21
9 changed files with 35 additions and 28 deletions
@@ -35,10 +35,10 @@ public class DelugeService : DownloadService, IDelugeService
IStriker striker,
INotificationPublisher notifier,
IDryRunInterceptor dryRunInterceptor,
IHardlinkFileService hardlinkFileService
IHardLinkFileService hardLinkFileService
) : base(
logger, queueCleanerConfig, contentBlockerConfig, downloadCleanerConfig, cache,
filenameEvaluator, striker, notifier, dryRunInterceptor, hardlinkFileService
filenameEvaluator, striker, notifier, dryRunInterceptor, hardLinkFileService
)
{
config.Value.Validate();
@@ -252,7 +252,7 @@ public class DelugeService : DownloadService, IDelugeService
continue;
}
await _dryRunInterceptor.InterceptAsync(DeleteDownload, download.Hash);
await _dryRunInterceptor.InterceptAsync(DeleteDownloadAsync, download.Hash);
_logger.LogInformation(
"download cleaned | {reason} reached | {name}",
@@ -32,7 +32,7 @@ public abstract class DownloadService : IDownloadService
protected readonly MemoryCacheEntryOptions _cacheOptions;
protected readonly INotificationPublisher _notifier;
protected readonly IDryRunInterceptor _dryRunInterceptor;
protected readonly IHardlinkFileService _hardlinkFileService;
protected readonly IHardLinkFileService _hardLinkFileService;
protected DownloadService(
ILogger<DownloadService> logger,
@@ -44,7 +44,7 @@ public abstract class DownloadService : IDownloadService
IStriker striker,
INotificationPublisher notifier,
IDryRunInterceptor dryRunInterceptor,
IHardlinkFileService hardlinkFileService
IHardLinkFileService hardLinkFileService
)
{
_logger = logger;
@@ -56,7 +56,7 @@ public abstract class DownloadService : IDownloadService
_striker = striker;
_notifier = notifier;
_dryRunInterceptor = dryRunInterceptor;
_hardlinkFileService = hardlinkFileService;
_hardLinkFileService = hardLinkFileService;
_cacheOptions = new MemoryCacheEntryOptions()
.SetSlidingExpiration(StaticConfiguration.TriggerValue + Constants.CacheLimitBuffer);
}
@@ -26,10 +26,10 @@ public class DummyDownloadService : DownloadService
IStriker striker,
NotificationPublisher notifier,
IDryRunInterceptor dryRunInterceptor,
IHardlinkFileService hardlinkFileService
IHardLinkFileService hardLinkFileService
) : base(
logger, queueCleanerConfig, contentBlockerConfig, downloadCleanerConfig,
cache, filenameEvaluator, striker, notifier, dryRunInterceptor, hardlinkFileService
cache, filenameEvaluator, striker, notifier, dryRunInterceptor, hardLinkFileService
)
{
}
@@ -38,10 +38,10 @@ public class QBitService : DownloadService, IQBitService
IStriker striker,
INotificationPublisher notifier,
IDryRunInterceptor dryRunInterceptor,
IHardlinkFileService hardlinkFileService
IHardLinkFileService hardLinkFileService
) : base(
logger, queueCleanerConfig, contentBlockerConfig, downloadCleanerConfig, cache,
filenameEvaluator, striker, notifier, dryRunInterceptor, hardlinkFileService
filenameEvaluator, striker, notifier, dryRunInterceptor, hardLinkFileService
)
{
_config = config.Value;
@@ -286,7 +286,7 @@ public class QBitService : DownloadService, IQBitService
continue;
}
await _dryRunInterceptor.InterceptAsync(DeleteDownload, download.Hash);
await _dryRunInterceptor.InterceptAsync(DeleteDownloadAsync, download.Hash);
_logger.LogInformation(
"download cleaned | {reason} reached | {name}",
@@ -404,7 +404,7 @@ public class QBitService : DownloadService, IQBitService
continue;
}
await ((QBitService)Proxy).ChangeCategory(download.Hash, _downloadCleanerConfig.NoHardLinksCategory);
await _dryRunInterceptor.InterceptAsync(ChangeCategory, download.Hash, _downloadCleanerConfig.NoHardLinksCategory);
_logger.LogInformation("category changed for {name}", download.Name);
@@ -40,10 +40,10 @@ public class TransmissionService : DownloadService, ITransmissionService
IStriker striker,
INotificationPublisher notifier,
IDryRunInterceptor dryRunInterceptor,
IHardlinkFileService hardlinkFileService
IHardLinkFileService hardLinkFileService
) : base(
logger, queueCleanerConfig, contentBlockerConfig, downloadCleanerConfig, cache,
filenameEvaluator, striker, notifier, dryRunInterceptor, hardlinkFileService
filenameEvaluator, striker, notifier, dryRunInterceptor, hardLinkFileService
)
{
_config = config.Value;