Fix empty torrents (#11)

* fixed unwanted deletion of torrents in downloading metadata state

* refactored jobs code

* updated arr test data

* updated gitignore

* updated test configuration and removed dispensable files

code/Infrastructure/Verticals/ContentBlocker/ContentBlocker.cs

@@ -3,21 +3,15 @@ using Domain.Arr.Queue;
 using Domain.Enums;
 using Infrastructure.Verticals.Arr;
 using Infrastructure.Verticals.DownloadClient;
+using Infrastructure.Verticals.Jobs;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
 namespace Infrastructure.Verticals.ContentBlocker;
 
-public sealed class ContentBlocker : IDisposable
+public sealed class ContentBlocker : GenericHandler
 {
-    private readonly ILogger<ContentBlocker> _logger;
-    private readonly SonarrConfig _sonarrConfig;
-    private readonly RadarrConfig _radarrConfig;
-    private readonly SonarrClient _sonarrClient;
-    private readonly RadarrClient _radarrClient;
-    private readonly ArrQueueIterator _arrArrQueueIterator;
     private readonly BlocklistProvider _blocklistProvider;
-    private readonly IDownloadService _downloadService;
     
     public ContentBlocker(
         ILogger<ContentBlocker> logger,
@@ -28,48 +22,18 @@ public sealed class ContentBlocker : IDisposable
         ArrQueueIterator arrArrQueueIterator,
         BlocklistProvider blocklistProvider,
         DownloadServiceFactory downloadServiceFactory
-    )
+    ) : base(logger, sonarrConfig.Value, radarrConfig.Value, sonarrClient, radarrClient, arrArrQueueIterator, downloadServiceFactory)
     {
-        _logger = logger;
-        _sonarrConfig = sonarrConfig.Value;
-        _radarrConfig = radarrConfig.Value;
-        _sonarrClient = sonarrClient;
-        _radarrClient = radarrClient;
-        _arrArrQueueIterator = arrArrQueueIterator;
         _blocklistProvider = blocklistProvider;
-        _downloadService = downloadServiceFactory.CreateDownloadClient();
     }
 
-    public async Task ExecuteAsync()
+    public override async Task ExecuteAsync()
     {
         await _blocklistProvider.LoadBlocklistAsync();
-        await _downloadService.LoginAsync();
-
-        await ProcessArrConfigAsync(_sonarrConfig, InstanceType.Sonarr);
-        await ProcessArrConfigAsync(_radarrConfig, InstanceType.Radarr);
+        await base.ExecuteAsync();
     }
 
-    private async Task ProcessArrConfigAsync(ArrConfig config, InstanceType instanceType)
-    {
-        if (!config.Enabled)
-        {
-            return;
-        }
-
-        foreach (ArrInstance arrInstance in config.Instances)
-        {
-            try
-            {
-                await ProcessInstanceAsync(arrInstance, instanceType);
-            }
-            catch (Exception exception)
-            {
-                _logger.LogError(exception, "failed to block content for {type} instance | {url}", instanceType, arrInstance.Url);
-            }
-        }
-    }
-
-    private async Task ProcessInstanceAsync(ArrInstance instance, InstanceType instanceType)
+    protected override async Task ProcessInstanceAsync(ArrInstance instance, InstanceType instanceType)
     {
         ArrClient arrClient = GetClient(instanceType);
 
@@ -101,9 +65,4 @@ public sealed class ContentBlocker : IDisposable
             InstanceType.Radarr => _radarrClient,
             _ => throw new NotImplementedException($"instance type {type} is not yet supported")
         };
-    
-    public void Dispose()
-    {
-        _downloadService.Dispose();
-    }
 }

code/Infrastructure/Verticals/DownloadClient/Deluge/DelugeService.cs

@@ -49,7 +49,8 @@ public sealed class DelugeService : IDownloadService
             _logger.LogDebug(exception, "failed to find torrent {hash} in the download client", hash);
         }
 
-        if (contents is null)
+        // if no files found, torrent might be stuck in Downloading metadata
+        if (contents?.Contents?.Count is null or 0)
         {
             return false;
         }

code/Infrastructure/Verticals/DownloadClient/QBittorrent/QBitService.cs

@@ -53,18 +53,14 @@ public sealed class QBitService : IDownloadService
 
         IReadOnlyList<TorrentContent>? files = await _client.GetTorrentContentsAsync(hash);
 
-        if (files is null)
+        // if no files found, torrent might be stuck in Downloading metadata
+        if (files?.Count is null or 0)
         {
             return false;
         }
-        
-        // if all files are marked as skip
-        if (files.All(x => x.Priority is TorrentContentPriority.Skip))
-        {
-            return true;
-        }
 
-        return false;
+        // if all files are marked as skip
+        return files.All(x => x.Priority is TorrentContentPriority.Skip);
     }
 
     public async Task BlockUnwantedFilesAsync(string hash)

code/Infrastructure/Verticals/DownloadClient/Transmission/TransmissionService.cs

@@ -41,7 +41,8 @@ public sealed class TransmissionService : IDownloadService
     {
         TorrentInfo? torrent = await GetTorrentAsync(hash);
 
-        if (torrent is null)
+        // if no files found, torrent might be stuck in Downloading metadata
+        if (torrent?.FileStats?.Length is null or 0)
         {
             return false;
         }

code/Infrastructure/Verticals/Jobs/GenericHandler.cs

@@ -0,0 +1,90 @@
+using Common.Configuration;
+using Domain.Arr.Queue;
+using Domain.Enums;
+using Infrastructure.Verticals.Arr;
+using Infrastructure.Verticals.DownloadClient;
+using Microsoft.Extensions.Logging;
+
+namespace Infrastructure.Verticals.Jobs;
+
+public abstract class GenericHandler : IDisposable
+{
+    protected readonly ILogger<GenericHandler> _logger;
+    protected readonly SonarrConfig _sonarrConfig;
+    protected readonly RadarrConfig _radarrConfig;
+    protected readonly SonarrClient _sonarrClient;
+    protected readonly RadarrClient _radarrClient;
+    protected readonly ArrQueueIterator _arrArrQueueIterator;
+    protected readonly IDownloadService _downloadService;
+
+    protected GenericHandler(
+        ILogger<GenericHandler> logger,
+        SonarrConfig sonarrConfig,
+        RadarrConfig radarrConfig,
+        SonarrClient sonarrClient,
+        RadarrClient radarrClient,
+        ArrQueueIterator arrArrQueueIterator,
+        DownloadServiceFactory downloadServiceFactory
+    )
+    {
+        _logger = logger;
+        _sonarrConfig = sonarrConfig;
+        _radarrConfig = radarrConfig;
+        _sonarrClient = sonarrClient;
+        _radarrClient = radarrClient;
+        _arrArrQueueIterator = arrArrQueueIterator;
+        _downloadService = downloadServiceFactory.CreateDownloadClient();
+    }
+
+    public virtual async Task ExecuteAsync()
+    {
+        await _downloadService.LoginAsync();
+
+        await ProcessArrConfigAsync(_sonarrConfig, InstanceType.Sonarr);
+        await ProcessArrConfigAsync(_radarrConfig, InstanceType.Radarr);
+    }
+
+    public virtual void Dispose()
+    {
+        _downloadService.Dispose();
+    }
+
+    protected abstract Task ProcessInstanceAsync(ArrInstance instance, InstanceType instanceType);
+    
+    protected async Task ProcessArrConfigAsync(ArrConfig config, InstanceType instanceType)
+    {
+        if (!config.Enabled)
+        {
+            return;
+        }
+
+        foreach (ArrInstance arrInstance in config.Instances)
+        {
+            try
+            {
+                await ProcessInstanceAsync(arrInstance, instanceType);
+            }
+            catch (Exception exception)
+            {
+                _logger.LogError(exception, "failed to clean {type} instance | {url}", instanceType, arrInstance.Url);
+            }
+        }
+    }
+    
+    protected ArrClient GetClient(InstanceType type) =>
+        type switch
+        {
+            InstanceType.Sonarr => _sonarrClient,
+            InstanceType.Radarr => _radarrClient,
+            _ => throw new NotImplementedException($"instance type {type} is not yet supported")
+        };
+    
+    protected int GetRecordId(InstanceType type, QueueRecord record) =>
+        type switch
+        {
+            // TODO add episode id
+            InstanceType.Sonarr => record.SeriesId,
+            InstanceType.Radarr => record.MovieId,
+            _ => throw new NotImplementedException($"instance type {type} is not yet supported")
+        };
+}

code/Infrastructure/Verticals/QueueCleaner/QueueCleaner.cs

@@ -3,21 +3,14 @@ using Domain.Arr.Queue;
 using Domain.Enums;
 using Infrastructure.Verticals.Arr;
 using Infrastructure.Verticals.DownloadClient;
+using Infrastructure.Verticals.Jobs;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
 namespace Infrastructure.Verticals.QueueCleaner;
 
-public sealed class QueueCleaner : IDisposable
+public sealed class QueueCleaner : GenericHandler
 {
-    private readonly ILogger<QueueCleaner> _logger;
-    private readonly SonarrConfig _sonarrConfig;
-    private readonly RadarrConfig _radarrConfig;
-    private readonly SonarrClient _sonarrClient;
-    private readonly RadarrClient _radarrClient;
-    private readonly ArrQueueIterator _arrArrQueueIterator;
-    private readonly IDownloadService _downloadService;
-    
     public QueueCleaner(
         ILogger<QueueCleaner> logger,
         IOptions<SonarrConfig> sonarrConfig,
@@ -26,48 +19,11 @@ public sealed class QueueCleaner : IDisposable
         RadarrClient radarrClient,
         ArrQueueIterator arrArrQueueIterator,
         DownloadServiceFactory downloadServiceFactory
-    )
+    ) : base(logger, sonarrConfig.Value, radarrConfig.Value, sonarrClient, radarrClient, arrArrQueueIterator, downloadServiceFactory)
     {
-        _logger = logger;
-        _sonarrConfig = sonarrConfig.Value;
-        _radarrConfig = radarrConfig.Value;
-        _sonarrClient = sonarrClient;
-        _radarrClient = radarrClient;
-        _arrArrQueueIterator = arrArrQueueIterator;
-        _downloadService = downloadServiceFactory.CreateDownloadClient();
     }
     
-    public async Task ExecuteAsync()
-    {
-        await _downloadService.LoginAsync();
-
-        await ProcessArrConfigAsync(_sonarrConfig, InstanceType.Sonarr);
-        await ProcessArrConfigAsync(_radarrConfig, InstanceType.Radarr);
-        
-        // await _downloadClient.LogoutAsync();
-    }
-
-    private async Task ProcessArrConfigAsync(ArrConfig config, InstanceType instanceType)
-    {
-        if (!config.Enabled)
-        {
-            return;
-        }
-
-        foreach (ArrInstance arrInstance in config.Instances)
-        {
-            try
-            {
-                await ProcessInstanceAsync(arrInstance, instanceType);
-            }
-            catch (Exception exception)
-            {
-                _logger.LogError(exception, "failed to clean {type} instance | {url}", instanceType, arrInstance.Url);
-            }
-        }
-    }
-
-    private async Task ProcessInstanceAsync(ArrInstance instance, InstanceType instanceType)
+    protected override async Task ProcessInstanceAsync(ArrInstance instance, InstanceType instanceType)
     {
         HashSet<int> itemsToBeRefreshed = [];
         ArrClient arrClient = GetClient(instanceType);
@@ -101,26 +57,4 @@ public sealed class QueueCleaner : IDisposable
         
         await arrClient.RefreshItemsAsync(instance, itemsToBeRefreshed);
     }
-
-    private ArrClient GetClient(InstanceType type) =>
-        type switch
-        {
-            InstanceType.Sonarr => _sonarrClient,
-            InstanceType.Radarr => _radarrClient,
-            _ => throw new NotImplementedException($"instance type {type} is not yet supported")
-        };
-    
-    private int GetRecordId(InstanceType type, QueueRecord record) =>
-        type switch
-        {
-            // TODO add episode id
-            InstanceType.Sonarr => record.SeriesId,
-            InstanceType.Radarr => record.MovieId,
-            _ => throw new NotImplementedException($"instance type {type} is not yet supported")
-        };
-
-    public void Dispose()
-    {
-        _downloadService.Dispose();
-    }
 }