Improve Transmission category detection (#62)

chart/values.yaml

@@ -10,6 +10,9 @@ deployment:
         repository: ghcr.io/flmorg/cleanuperr
         tag: latest
       env:
+        - name: DRY_RUN
+          value: "false"
+
         - name: LOGGING__LOGLEVEL
           value: Debug
         - name: LOGGING__FILE__ENABLED
@@ -18,6 +21,7 @@ deployment:
           value: /var/logs
         - name: LOGGING__ENHANCED
           value: "true"
+
         - name: TRIGGERS__QUEUECLEANER
           value: 0 0/5 * * * ?
         - name: TRIGGERS__CONTENTBLOCKER
@@ -47,6 +51,9 @@ deployment:
         - name: CONTENTBLOCKER__DELETE_PRIVATE
           value: "false"
 
+        - name: DOWNLOADCLEANER__ENABLED
+          value: "false"
+
         - name: DOWNLOAD_CLIENT
           value: qbittorrent
         - name: QBITTORRENT__URL
@@ -75,6 +82,17 @@ deployment:
           value: http://service.radarr-low-res.svc.cluster.local
         - name: RADARR__INSTANCES__1__URL
           value: http://service.radarr-high-res.svc.cluster.local
+
+        - name: NOTIFIARR__ON_IMPORT_FAILED_STRIKE
+          value: "true"
+        - name: NOTIFIARR__ON_STALLED_STRIKE
+          value: "true"
+        - name: NOTIFIARR__ON_QUEUE_ITEM_DELETED
+          value: "true"
+        - name: NOTIFIARR__ON_DOWNLOAD_CLEANED
+          value: "true"
+        - name: NOTIFIARR__CHANNEL_ID
+          value: "1340708411259748413"
       envFromSecret:
         - secretName: qbit-auth
           envs:
@@ -94,6 +112,10 @@ deployment:
               key: RDRL_API_KEY
             - name: RADARR__INSTANCES__1__APIKEY
               key: RDRH_API_KEY
+        - secretName: notifiarr-auth
+          envs:
+            - name: NOTIFIARR__API_KEY
+              key: API_KEY
       resources:
         requests:
           cpu: 0m
@@ -133,4 +155,8 @@ vaultSecrets:
     path: secrets/sonarr
     templates:
       SNRL_API_KEY: "{% .Secrets.low_api_key %}"
-      SNRH_API_KEY: "{% .Secrets.high_api_key %}"
+      SNRH_API_KEY: "{% .Secrets.high_api_key %}"
+  - name: notifiarr-auth
+    path: secrets/notifiarr
+    templates:
+      API_KEY: "{% .Secrets.passthrough_api_key %}"

code/Infrastructure/Verticals/DownloadClient/DummyDownloadService.cs

@@ -12,8 +12,13 @@ using Microsoft.Extensions.Options;
 
 namespace Infrastructure.Verticals.DownloadClient;
 
-public sealed class DummyDownloadService : DownloadService
+public class DummyDownloadService : DownloadService
 {
+    /// <inheritdoc/>
+    public DummyDownloadService()
+    {
+    }
+    
     public DummyDownloadService(ILogger<DownloadService> logger, IOptions<QueueCleanerConfig> queueCleanerConfig, IOptions<ContentBlockerConfig> contentBlockerConfig, IOptions<DownloadCleanerConfig> downloadCleanerConfig, IMemoryCache cache, IFilenameEvaluator filenameEvaluator, IStriker striker, NotificationPublisher notifier) : base(logger, queueCleanerConfig, contentBlockerConfig, downloadCleanerConfig, cache, filenameEvaluator, striker, notifier)
     {
     }

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

@@ -203,7 +203,16 @@ public class TransmissionService : DownloadService, ITransmissionService
             ?.Where(x => !string.IsNullOrEmpty(x.HashString))
             .Where(x => x.Status is 5 or 6)
             .Where(x => categories
-                .Any(cat => x.DownloadDir?.EndsWith(cat.Name, StringComparison.InvariantCultureIgnoreCase) is true)
+                .Any(cat =>
+                {
+                    if (x.DownloadDir is null)
+                    {
+                        return false;
+                    }
+                    
+                    return Path.GetFileName(Path.TrimEndingDirectorySeparator(x.DownloadDir))
+                        .Equals(cat.Name, StringComparison.InvariantCultureIgnoreCase);
+                })
             )
             .Cast<object>()
             .ToList();
@@ -220,8 +229,17 @@ public class TransmissionService : DownloadService, ITransmissionService
             }
             
             Category? category = categoriesToClean
-                .FirstOrDefault(x => download.DownloadDir?.EndsWith(x.Name, StringComparison.InvariantCultureIgnoreCase) is true);
+                .FirstOrDefault(x =>
+                {
+                    if (download.DownloadDir is null)
+                    {
+                        return false;
+                    }
 
+                    return Path.GetFileName(Path.TrimEndingDirectorySeparator(download.DownloadDir))
+                        .Equals(x.Name, StringComparison.InvariantCultureIgnoreCase);
+                });
+            
             if (category is null)
             {
                 continue;

code/test/docker-compose.yml

@@ -250,6 +250,7 @@ services:
       # - NOTIFIARR__ON_IMPORT_FAILED_STRIKE=true
       # - NOTIFIARR__ON_STALLED_STRIKE=true
       # - NOTIFIARR__ON_QUEUE_ITEM_DELETED=true
+      # - NOTIFIARR__ON_DOWNLOAD_CLEANED=true
       # - NOTIFIARR__API_KEY=notifiarr_secret
       # - NOTIFIARR__CHANNEL_ID=discord_channel_id
     volumes: