Improve Transmission category detection (#62)

.github/ISSUE_TEMPLATE/1-bug.yml

@@ -1,6 +1,6 @@
 name: Bug report
 description: File a bug report if something is not working right.
-title: "[BUG]: "
+title: "[BUG] "
 labels: ["bug"]
 body:
   - type: markdown
@@ -14,8 +14,12 @@ body:
       options:
         - label: Reviewed the documentation.
           required: true
+        - label: Ensured I am using ghcr.io/flmorg/cleanuperr docker repository.
+          required: true
         - label: Ensured I am using the latest version.
           required: true
+        - label: Enabled debug logging.
+          required: true
   - type: textarea
     id: what-happened
     attributes:
@@ -23,14 +27,6 @@ body:
       description: If applicable, mention what you expected to happen.
     validations:
       required: true
-  - type: input
-    id: version
-    attributes:
-      label: Version
-      description: What version of our software are you running?
-      placeholder: e.g. 1.3.0 or latest
-    validations:
-      required: true
   - type: dropdown
     id: os
     attributes:
@@ -40,6 +36,7 @@ body:
         - Windows
         - Linux
         - MacOS
+        - Unraid
     validations:
       required: true
   - type: dropdown

.github/ISSUE_TEMPLATE/2-feature.yml

@@ -1,6 +1,6 @@
 name: Feature request
 description: File a feature request.
-title: "[FEATURE]: "
+title: "[FEATURE] "
 labels: ["enhancement"]
 body:
   - type: markdown

.github/ISSUE_TEMPLATE/3-help.yml

@@ -1,12 +1,25 @@
 name: Help request
 description: Ask a question to receive help.
-title: "[HELP]: "
+title: "[HELP] "
 labels: ["question"]
 body:
   - type: markdown
     attributes:
       value: |
         If you are experiencing unexpected behavior, please consider submitting a bug report instead.
+  - type: checkboxes
+    id: init
+    attributes:
+      label: "Before submitting a help request, I have:"
+      options:
+        - label: Reviewed the documentation.
+          required: true
+        - label: Ensured I am using ghcr.io/flmorg/cleanuperr docker repository.
+          required: true
+        - label: Ensured I am using the latest version.
+          required: true
+        - label: Enabled debug logging.
+          required: true
   - type: textarea
     id: description
     attributes:

.gitignore

@@ -105,7 +105,6 @@ _NCrunch_*
 _TeamCity*
 
 # Sonarr
-config.xml
 nzbdrone.log*txt
 UpdateLogs/
 *workspace.xml

README.md

@@ -1,28 +1,47 @@
+_Love this project? Give it a ⭐️ and let others know!_
+
 # <img width="24px" src="./Logo/256.png" alt="cleanuperr"></img> cleanuperr
 
+[![Discord](https://img.shields.io/discord/1306721212587573389?color=7289DA&label=Discord&style=for-the-badge&logo=discord)](https://discord.gg/sWggpnmGNY)
+
 cleanuperr is a tool for automating the cleanup of unwanted or blocked files in Sonarr, Radarr, and supported download clients like qBittorrent. It removes incomplete or blocked downloads, updates queues, and enforces blacklists or whitelists to manage file selection. After removing blocked content, cleanuperr can also trigger a search to replace the deleted shows/movies.
 
 cleanuperr was created primarily to address malicious files, such as `*.lnk` or `*.zipx`, that were getting stuck in Sonarr/Radarr and required manual intervention. Some of the reddit posts that made cleanuperr come to life can be found [here](https://www.reddit.com/r/sonarr/comments/1gqnx16/psa_sonarr_downloaded_a_virus/), [here](https://www.reddit.com/r/sonarr/comments/1gqwklr/sonar_downloaded_a_mkv_file_which_looked_like_a/), [here](https://www.reddit.com/r/sonarr/comments/1gpw2wa/downloaded_waiting_to_import/) and [here](https://www.reddit.com/r/sonarr/comments/1gpi344/downloads_not_importing_no_files_found/).
 
 The tool supports both qBittorrent's built-in exclusion features and its own blocklist-based system. Binaries for all platforms are provided, along with Docker images for easy deployment.
 
-Refer to the [Environment variables](#Environment-variables) section for detailed configuration instructions and the [Setup](#Setup) section for an in-depth explanation of the cleanup process.
+#
+
+> [!NOTE]
+> ### Quick Start
+>
+> 1. **Docker (Recommended)**  
+> Pull the Docker image from `ghcr.io/flmorg/cleanuperr:latest`.
+>
+> 2. **Unraid (for Unraid users)**  
+> Use the Unraid Community App.
+>
+> 3. **Manual Installation (if you're not using Docker)**  
+> More details [here](#binaries-if-youre-not-using-docker).
+
+> [!TIP]
+> Refer to the [Environment variables](#Environment-variables) section for detailed configuration instructions and the [Setup](#Setup) section for an in-depth explanation of the cleanup process.
 
 ## Key features
 - Marks unwanted files as skip/unwanted in the download client.
 - Automatically strikes stalled or stuck downloads. 
 - Removes and blocks downloads that reached the maximum number of strikes or are marked as unwanted by the download client or by cleanuperr and triggers a search for removed downloads.
 
-## Important note
+> [!IMPORTANT]
+> Only the **latest versions** of the following apps are supported, or earlier versions that have the same API as the latest version:
+> - qBittorrent
+> - Deluge
+> - Transmission
+> - Sonarr
+> - Radarr
+> - Lidarr
 
-Only the **latest versions** of the following apps are supported, or earlier versions that have the same API as the latest version:
-- qBittorrent
-- Deluge
-- Transmission
-- Sonarr
-- Radarr
-
-This tool is actively developed and still a work in progress. Join the Discord server if you want to reach out to me quickly (or just stay updated on new releases) so we can squash those pesky bugs together:
+This tool is actively developed and still a work in progress, so using the `latest` Docker tag may result in breaking changes. Join the Discord server if you want to reach out to me quickly (or just stay updated on new releases) so we can squash those pesky bugs together:
 
 > https://discord.gg/sWggpnmGNY
 
@@ -35,10 +54,14 @@ This tool is actively developed and still a work in progress. Join the Discord s
    - Mark the files that were found in the queue as **unwanted/skipped** if:
      - They **are listed in the blacklist**, or
      - They **are not included in the whitelist**.
+   - If **all files** of a download **are unwanted**:
+     - It will be removed from the *arr's queue and blocked.
+     - It will be deleted from the download client.
+     - A new search will be triggered for the *arr item.
 2. **Queue cleaner** will:
-   - Run every 5 minutes (or configured cron).
+   - Run every 5 minutes (or configured cron, or right after `content blocker`).
    - Process all items in the *arr queue.
-   - Check each queue item if it is **stalled (download speed is 0)**, **stuck in matadata downloading** or **failed to be imported**.
+   - Check each queue item if it is **stalled (download speed is 0)**, **stuck in metadata downloading** or **failed to be imported**.
      - If it is, the item receives a **strike** and will continue to accumulate strikes every time it meets any of these conditions.
    - Check each queue item if it meets one of the following condition in the download client:
      - **Marked as completed, but 0 bytes have been downloaded** (due to files being blocked by qBittorrent or the **content blocker**).
@@ -48,6 +71,9 @@ This tool is actively developed and still a work in progress. Join the Discord s
      - It will be removed from the *arr's queue and blocked.
      - It will be deleted from the download client.
      - A new search will be triggered for the *arr item.
+3. **Download cleaner** will:
+   - Run every hour (or configured cron).
+   - Automatically clean up downloads that have been seeding for a certain amount of time.
 
 # Setup
 
@@ -63,12 +89,21 @@ This tool is actively developed and still a work in progress. Join the Discord s
 
 ## Using cleanuperr's blocklist (works with all supported download clients)
 
-1. Set both `QUEUECLEANER_ENABLED` and `CONTENTBLOCKER_ENABLED` to `true` in your environment variables.
-2. Configure and enable either a **blacklist** or a **whitelist** as described in the [Environment variables](#Environment-variables) section.
+1. Set both `QUEUECLEANER__ENABLED` and `CONTENTBLOCKER__ENABLED` to `true` in your environment variables.
+2. Configure and enable either a **blacklist** or a **whitelist** as described in the [Arr variables](#Arr-variables) section.
 3. Once configured, cleanuperr will perform the following tasks:
    - Execute the **content blocker** job, as explained in the [How it works](#how-it-works) section.
    - Execute the **queue cleaner** job, as explained in the [How it works](#how-it-works) section.
 
+## Using cleanuperr just for failed *arr imports (works for Usenet users as well)
+
+1. Set `QUEUECLEANER__ENABLED` to `true`.
+2. Set `QUEUECLEANER__IMPORT_FAILED_MAX_STRIKES` to a desired value.
+3. Optionally set failed import message patterns to ignore using `QUEUECLEANER__IMPORT_FAILED_IGNORE_PATTERNS__<NUMBER>`.
+4. Set `DOWNLOAD_CLIENT` to `none`.
+
+**No other action involving a download client would work (e.g. content blocking, removing stalled downloads, excluding private trackers).**
+
 ## Usage
 
 ### Docker compose yaml
@@ -77,9 +112,13 @@ This tool is actively developed and still a work in progress. Join the Discord s
 version: "3.3"
 services:
   cleanuperr:
+    image: ghcr.io/flmorg/cleanuperr:latest
+    restart: unless-stopped
     volumes:
       - ./cleanuperr/logs:/var/logs
     environment:
+      - DRY_RUN=false
+
       - LOGGING__LOGLEVEL=Information
       - LOGGING__FILE__ENABLED=false
       - LOGGING__FILE__PATH=/var/logs/
@@ -87,23 +126,41 @@ services:
 
       - TRIGGERS__QUEUECLEANER=0 0/5 * * * ?
       - TRIGGERS__CONTENTBLOCKER=0 0/5 * * * ?
+      - TRIGGERS__DOWNLOADCLEANER=0 0 * * * ?
 
       - QUEUECLEANER__ENABLED=true
       - QUEUECLEANER__RUNSEQUENTIALLY=true
       - QUEUECLEANER__IMPORT_FAILED_MAX_STRIKES=5
+      - QUEUECLEANER__IMPORT_FAILED_IGNORE_PRIVATE=false
+      - QUEUECLEANER__IMPORT_FAILED_DELETE_PRIVATE=false
+      # - QUEUECLEANER__IMPORT_FAILED_IGNORE_PATTERNS__0=title mismatch
+      # - QUEUECLEANER__IMPORT_FAILED_IGNORE_PATTERNS__1=manual import required
       - QUEUECLEANER__STALLED_MAX_STRIKES=5
+      - QUEUECLEANER__STALLED_RESET_STRIKES_ON_PROGRESS=false
+      - QUEUECLEANER__STALLED_IGNORE_PRIVATE=false
+      - QUEUECLEANER__STALLED_DELETE_PRIVATE=false
 
       - CONTENTBLOCKER__ENABLED=true
-      - CONTENTBLOCKER__BLACKLIST__ENABLED=true
-      - CONTENTBLOCKER__BLACKLIST__PATH=https://raw.githubusercontent.com/flmorg/cleanuperr/refs/heads/main/blacklist
-      # OR
-      # - CONTENTBLOCKER__WHITELIST__ENABLED=true
-      # - CONTENTBLOCKER__WHITELIST__PATH=https://raw.githubusercontent.com/flmorg/cleanuperr/refs/heads/main/whitelist
+      - CONTENTBLOCKER__IGNORE_PRIVATE=false
+      - CONTENTBLOCKER__DELETE_PRIVATE=false
 
-      - DOWNLOAD_CLIENT=qBittorrent
-      - QBITTORRENT__URL=http://localhost:8080
-      - QBITTORRENT__USERNAME=user
-      - QBITTORRENT__PASSWORD=pass
+      - DOWNLOADCLEANER__ENABLED=true
+      - DOWNLOADCLEANER__DELETE_PRIVATE=false
+      - DOWNLOADCLEANER__CATEGORIES__0__NAME=tv-sonarr
+      - DOWNLOADCLEANER__CATEGORIES__0__MAX_RATIO=-1
+      - DOWNLOADCLEANER__CATEGORIES__0__MIN_SEED_TIME=0
+      - DOWNLOADCLEANER__CATEGORIES__0__MAX_SEED_TIME=240
+      - DOWNLOADCLEANER__CATEGORIES__1__NAME=radarr
+      - DOWNLOADCLEANER__CATEGORIES__1__MAX_RATIO=-1
+      - DOWNLOADCLEANER__CATEGORIES__1__MIN_SEED_TIME=0
+      - DOWNLOADCLEANER__CATEGORIES__1__MAX_SEED_TIME=240
+
+      - DOWNLOAD_CLIENT=none
+      # OR
+      # - DOWNLOAD_CLIENT=qBittorrent
+      # - QBITTORRENT__URL=http://localhost:8080
+      # - QBITTORRENT__USERNAME=user
+      # - QBITTORRENT__PASSWORD=pass
       # OR
       # - DOWNLOAD_CLIENT=deluge
       # - DELUGE__URL=http://localhost:8112
@@ -116,85 +173,48 @@ services:
 
       - SONARR__ENABLED=true
       - SONARR__SEARCHTYPE=Episode
+      - SONARR__BLOCK__TYPE=blacklist
+      - SONARR__BLOCK__PATH=https://example.com/path/to/file.txt
       - SONARR__INSTANCES__0__URL=http://localhost:8989
       - SONARR__INSTANCES__0__APIKEY=secret1
       - SONARR__INSTANCES__1__URL=http://localhost:8990
       - SONARR__INSTANCES__1__APIKEY=secret2
 
       - RADARR__ENABLED=true
+      - RADARR__BLOCK__TYPE=blacklist
+      - RADARR__BLOCK__PATH=https://example.com/path/to/file.txt
       - RADARR__INSTANCES__0__URL=http://localhost:7878
       - RADARR__INSTANCES__0__APIKEY=secret3
       - RADARR__INSTANCES__1__URL=http://localhost:7879
       - RADARR__INSTANCES__1__APIKEY=secret4
-    image: ghcr.io/flmorg/cleanuperr:latest
-    restart: unless-stopped
+
+      - LIDARR__ENABLED=true
+      - LIDARR__BLOCK__TYPE=blacklist
+      - LIDARR__BLOCK__PATH=https://example.com/path/to/file.txt
+      - LIDARR__INSTANCES__0__URL=http://radarr:8686
+      - LIDARR__INSTANCES__0__APIKEY=secret5
+      - LIDARR__INSTANCES__1__URL=http://radarr:8687
+      - LIDARR__INSTANCES__1__APIKEY=secret6
+
+      - 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
 ```
 
-### Environment variables
+## Environment variables
 
-| Variable | Required | Description | Default value |
-|---|---|---|---|
-| LOGGING__LOGLEVEL | No | Can be `Verbose`, `Debug`, `Information`, `Warning`, `Error` or `Fatal` | `Information` |
-| LOGGING__FILE__ENABLED | No | Enable or disable logging to file | false |
-| LOGGING__FILE__PATH | No | Directory where to save the log files | empty |
-| LOGGING__ENHANCED | No | Enhance logs whenever possible<br>A more detailed description is provided [here](variables.md#LOGGING__ENHANCED) | true |
-|||||
-| TRIGGERS__QUEUECLEANER | Yes if queue cleaner is enabled | [Quartz cron trigger](https://www.quartz-scheduler.org/documentation/quartz-2.3.0/tutorials/crontrigger.html)<br>Can be a max of 6h interval<br>**Is ignored if `QUEUECLEANER__RUNSEQUENTIALLY=true` and `CONTENTBLOCKER__ENABLED=true`** | 0 0/5 * * * ? |
-| TRIGGERS__CONTENTBLOCKER | Yes if content blocker is enabled | [Quartz cron trigger](https://www.quartz-scheduler.org/documentation/quartz-2.3.0/tutorials/crontrigger.html)<br>Can be a max of 6h interval | 0 0/5 * * * ? |
-|||||
-| QUEUECLEANER__ENABLED | No | Enable or disable the queue cleaner | true |
-| QUEUECLEANER__RUNSEQUENTIALLY | No | If set to true, the queue cleaner will run after the content blocker instead of running in parallel, streamlining the cleaning process | true |
-| QUEUECLEANER__IMPORT_FAILED_MAX_STRIKES | No | After how many strikes should a failed import be removed<br>0 means never | 0 |
-| QUEUECLEANER__STALLED_MAX_STRIKES | No | After how many strikes should a stalled download be removed<br>0 means never | 0 |
-|||||
-| CONTENTBLOCKER__ENABLED | No | Enable or disable the content blocker | false |
-| CONTENTBLOCKER__BLACKLIST__ENABLED | Yes if content blocker is enabled and whitelist is not enabled | Enable or disable the blacklist | false |
-| CONTENTBLOCKER__BLACKLIST__PATH | Yes if blacklist is enabled | Path to the blacklist (local file or url)<br>Needs to be json compatible | empty |
-| CONTENTBLOCKER__WHITELIST__ENABLED | Yes if content blocker is enabled and blacklist is not enabled | Enable or disable the whitelist | false |
-| CONTENTBLOCKER__WHITELIST__PATH | Yes if whitelist is enabled | Path to the whitelist (local file or url)<br>Needs to be json compatible | empty |
-|||||
-| DOWNLOAD_CLIENT | No | Download client that is used by *arrs<br>Can be `qbittorrent`, `deluge` or `transmission` | `qbittorrent` |
-| QBITTORRENT__URL | No | qBittorrent instance url | http://localhost:8112 |
-| QBITTORRENT__USERNAME | No | qBittorrent user | empty |
-| QBITTORRENT__PASSWORD | No | qBittorrent password | empty |
-|||||
-| DELUGE__URL | No | Deluge instance url | http://localhost:8080 |
-| DELUGE__PASSWORD | No | Deluge password | empty |
-|||||
-| TRANSMISSION__URL | No | Transmission instance url | http://localhost:9091 |
-| TRANSMISSION__USERNAME | No | Transmission user | empty |
-| TRANSMISSION__PASSWORD | No | Transmission password | empty |
-|||||
-| SONARR__ENABLED | No | Enable or disable Sonarr cleanup  | true |
-| SONARR__SEARCHTYPE | No | What to search for after removing a queue item<br>Can be `Episode`, `Season` or `Series` | `Episode` |
-| SONARR__INSTANCES__0__URL | No | First Sonarr instance url | http://localhost:8989 |
-| SONARR__INSTANCES__0__APIKEY | No | First Sonarr instance API key | empty |
-|||||
-| RADARR__ENABLED | No | Enable or disable Radarr cleanup  | false |
-| RADARR__INSTANCES__0__URL | No | First Radarr instance url | http://localhost:8989 |
-| RADARR__INSTANCES__0__APIKEY | No | First Radarr instance API key | empty |
-
-#
-### To be noted
-
-1. The blacklist and the whitelist can not be both enabled at the same time.
-2. The queue cleaner and content blocker can be enabled or disabled separately, if you want to run only one of them.
-3. Only one download client can be enabled at a time. If you have more than one download client, you should deploy multiple instances of cleanuperr.
-4. The blocklists (blacklist/whitelist) should have a single pattern on each line and supports the following:
-```
-*example      // file name ends with "example"
-example*      // file name starts with "example"
-*example*     // file name has "example" in the name
-example       // file name is exactly the word "example"
-regex:<ANY_REGEX>   // regex that needs to be marked at the start of the line with "regex:"
-```
-5. Multiple Sonarr/Radarr instances can be specified using this format, where `<NUMBER>` starts from 0:
-```
-SONARR__INSTANCES__<NUMBER>__URL
-SONARR__INSTANCES__<NUMBER>__APIKEY
-```
-
-#
+Jump to:
+- [General settings](variables.md#general-settings)
+- [Queue Cleaner settings](variables.md#queue-cleaner-settings)
+- [Content Blocker settings](variables.md#content-blocker-settings)
+- [Download Cleaner settings](variables.md#download-cleaner-settings)
+- [Download Client settings](variables.md#download-client-settings)
+- [Arr settings](variables.md#arr-settings)
+- [Notification settings](variables.md#notification-settings)
+- [Advanced settings](variables.md#advanced-settings)
 
 ### Binaries (if you're not using Docker)
 
@@ -202,18 +222,19 @@ SONARR__INSTANCES__<NUMBER>__APIKEY
 2. Extract them from the zip file.
 3. Edit **appsettings.json**. The paths from this json file correspond with the docker env vars, as described [above](#environment-variables).
 
-### Run as a Windows Service
-
-Check out this stackoverflow answer on how to do it: https://stackoverflow.com/a/15719678
+> [!TIP]
+> ### Run as a Windows Service
+> Check out this stackoverflow answer on how to do it: https://stackoverflow.com/a/15719678
 
 # Credits
 Special thanks for inspiration go to:
 - [ThijmenGThN/swaparr](https://github.com/ThijmenGThN/swaparr)
 - [ManiMatter/decluttarr](https://github.com/ManiMatter/decluttarr)
 - [PaeyMoopy/sonarr-radarr-queue-cleaner](https://github.com/PaeyMoopy/sonarr-radarr-queue-cleaner)
-- [Sonarr](https://github.com/Sonarr/Sonarr) & [Radarr](https://github.com/Radarr/Radarr) for the logo
+- [Sonarr](https://github.com/Sonarr/Sonarr) & [Radarr](https://github.com/Radarr/Radarr)
 
 # Buy me a coffee
 If I made your life just a tiny bit easier, consider buying me a coffee!
 
-<a href="https://buymeacoffee.com/flaminel" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" style="height: 41px !important;width: 174px !important;box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;-webkit-box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;" ></a>
+<a href="https://buymeacoffee.com/flaminel" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" style="height: 41px !important;width: 174px !important;box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;-webkit-box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;" ></a>
+

chart/values.yaml

@@ -10,50 +10,89 @@ deployment:
         repository: ghcr.io/flmorg/cleanuperr
         tag: latest
       env:
+        - name: DRY_RUN
+          value: "false"
+
         - name: LOGGING__LOGLEVEL
-          value: Information
+          value: Debug
         - name: LOGGING__FILE__ENABLED
           value: "true"
         - name: LOGGING__FILE__PATH
           value: /var/logs
         - name: LOGGING__ENHANCED
           value: "true"
+
         - name: TRIGGERS__QUEUECLEANER
           value: 0 0/5 * * * ?
         - name: TRIGGERS__CONTENTBLOCKER
           value: 0 0/5 * * * ?
+
         - name: QUEUECLEANER__ENABLED
           value: "true"
         - name: QUEUECLEANER__RUNSEQUENTIALLY
           value: "true"
         - name: QUEUECLEANER__IMPORT_FAILED_MAX_STRIKES
           value: "3"
+        - name: QUEUECLEANER__IMPORT_FAILED_IGNORE_PRIVATE
+          value: "false"
+        - name: QUEUECLEANER__IMPORT_FAILED_DELETE_PRIVATE
+          value: "false"
         - name: QUEUECLEANER__STALLED_MAX_STRIKES
           value: "3"
+        - name: QUEUECLEANER__STALLED_IGNORE_PRIVATE
+          value: "false"
+        - name: QUEUECLEANER__STALLED_DELETE_PRIVATE
+          value: "false"
+
         - name: CONTENTBLOCKER__ENABLED
           value: "true"
-        - name: CONTENTBLOCKER__BLACKLIST__ENABLED
+        - name: CONTENTBLOCKER__IGNORE_PRIVATE
           value: "true"
-        - name: CONTENTBLOCKER__BLACKLIST__PATH
-          value: https://raw.githubusercontent.com/flmorg/cleanuperr/refs/heads/main/blacklist
+        - name: CONTENTBLOCKER__DELETE_PRIVATE
+          value: "false"
+
+        - name: DOWNLOADCLEANER__ENABLED
+          value: "false"
+
         - name: DOWNLOAD_CLIENT
           value: qbittorrent
         - name: QBITTORRENT__URL
           value: http://service.qbittorrent-videos.svc.cluster.local
+
         - name: SONARR__ENABLED
           value: "true"
         - name: SONARR__SEARCHTYPE
           value: Episode
+        - name: SONARR__BLOCK__TYPE
+          value: blacklist
+        - name: SONARR__BLOCK__PATH
+          value: https://raw.githubusercontent.com/flmorg/cleanuperr/refs/heads/main/blacklist
         - name: SONARR__INSTANCES__0__URL
           value: http://service.sonarr-low-res.svc.cluster.local
         - name: SONARR__INSTANCES__1__URL
           value: http://service.sonarr-high-res.svc.cluster.local
+
         - name: RADARR__ENABLED
           value: "true"
+        - name: RADARR__BLOCK__TYPE
+          value: blacklist
+        - name: RADARR__BLOCK__PATH
+          value: https://raw.githubusercontent.com/flmorg/cleanuperr/refs/heads/main/blacklist
         - name: RADARR__INSTANCES__0__URL
           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:
@@ -73,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
@@ -112,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/Common/Attributes/DryRunSafeguardAttribute.cs

@@ -0,0 +1,6 @@
+namespace Common.Attributes;
+
+[AttributeUsage(AttributeTargets.Method, Inherited = true)]
+public class DryRunSafeguardAttribute : Attribute
+{
+}

code/Common/Common.csproj

@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.2" />
       <PackageReference Include="Serilog" Version="4.2.0" />
     </ItemGroup>
 

code/Common/Configuration/Arr/ArrConfig.cs

@@ -1,8 +1,19 @@
+using Common.Configuration.ContentBlocker;
+
 namespace Common.Configuration.Arr;
 
 public abstract record ArrConfig
 {
     public required bool Enabled { get; init; }
+
+    public Block Block { get; init; } = new();
     
     public required List<ArrInstance> Instances { get; init; }
+}
+
+public readonly record struct Block
+{
+    public BlocklistType Type { get; init; }
+    
+    public string? Path { get; init; }
 }

code/Common/Configuration/Arr/LidarrConfig.cs

@@ -0,0 +1,6 @@
+namespace Common.Configuration.Arr;
+
+public sealed record LidarrConfig : ArrConfig
+{
+    public const string SectionName = "Lidarr";
+}

code/Common/Configuration/ContentBlocker/BlocklistType.cs

@@ -1,4 +1,4 @@
-namespace Domain.Enums;
+namespace Common.Configuration.ContentBlocker;
 
 public enum BlocklistType
 {

code/Common/Configuration/ContentBlocker/ContentBlockerConfig.cs

@@ -1,4 +1,6 @@
-namespace Common.Configuration.ContentBlocker;
+using Microsoft.Extensions.Configuration;
+
+namespace Common.Configuration.ContentBlocker;
 
 public sealed record ContentBlockerConfig : IJobConfig
 {
@@ -6,35 +8,13 @@ public sealed record ContentBlockerConfig : IJobConfig
     
     public required bool Enabled { get; init; }
     
-    public PatternConfig? Blacklist { get; init; }
+    [ConfigurationKeyName("IGNORE_PRIVATE")]
+    public bool IgnorePrivate { get; init; }
+    
+    [ConfigurationKeyName("DELETE_PRIVATE")]
+    public bool DeletePrivate { get; init; }
     
-    public PatternConfig? Whitelist { get; init; }
-
     public void Validate()
     {
-        if (!Enabled)
-        {
-            return;
-        }
-
-        if (Blacklist is null && Whitelist is null)
-        {
-            throw new Exception("content blocker is enabled, but both blacklist and whitelist are missing");
-        }
-
-        if (Blacklist?.Enabled is true && Whitelist?.Enabled is true)
-        {
-            throw new Exception("only one exclusion (blacklist/whitelist) list is allowed");
-        }
-
-        if (Blacklist?.Enabled is true && string.IsNullOrEmpty(Blacklist.Path))
-        {
-            throw new Exception("blacklist path is required");
-        }
-        
-        if (Whitelist?.Enabled is true && string.IsNullOrEmpty(Whitelist.Path))
-        {
-            throw new Exception("blacklist path is required");
-        }
     }
 }

code/Common/Configuration/ContentBlocker/PatternConfig.cs

@@ -1,8 +0,0 @@
-namespace Common.Configuration.ContentBlocker;
-
-public sealed record PatternConfig
-{
-    public bool Enabled { get; init; }
-    
-    public string? Path { get; init; }
-}

code/Common/Configuration/DownloadCleaner/Category.cs

@@ -0,0 +1,45 @@
+using Common.Exceptions;
+using Microsoft.Extensions.Configuration;
+
+namespace Common.Configuration.DownloadCleaner;
+
+public sealed record Category : IConfig
+{
+    public required string Name { get; init; }
+
+    /// <summary>
+    /// Max ratio before removing a download.
+    /// </summary>
+    [ConfigurationKeyName("MAX_RATIO")]
+    public required double MaxRatio { get; init; } = -1;
+
+    /// <summary>
+    /// Min number of hours to seed before removing a download, if the ratio has been met.
+    /// </summary>
+    [ConfigurationKeyName("MIN_SEED_TIME")]
+    public required double MinSeedTime { get; init; } = 0;
+
+    /// <summary>
+    /// Number of hours to seed before removing a download.
+    /// </summary>
+    [ConfigurationKeyName("MAX_SEED_TIME")]
+    public required double MaxSeedTime { get; init; } = -1;
+
+    public void Validate()
+    {
+        if (string.IsNullOrWhiteSpace(Name))
+        {
+            throw new ValidationException($"{nameof(Name)} can not be empty");
+        }
+
+        if (MaxRatio < 0 && MaxSeedTime < 0)
+        {
+            throw new ValidationException($"both {nameof(MaxRatio)} and {nameof(MaxSeedTime)} are disabled");
+        }
+
+        if (MinSeedTime < 0)
+        {
+            throw new ValidationException($"{nameof(MinSeedTime)} can not be negative");
+        }
+    }
+}

code/Common/Configuration/DownloadCleaner/DownloadCleanerConfig.cs

@@ -0,0 +1,36 @@
+using Common.Exceptions;
+using Microsoft.Extensions.Configuration;
+
+namespace Common.Configuration.DownloadCleaner;
+
+public sealed record DownloadCleanerConfig : IJobConfig
+{
+    public const string SectionName = "DownloadCleaner";
+    
+    public bool Enabled { get; init; }
+    
+    public List<Category>? Categories { get; init; }
+
+    [ConfigurationKeyName("DELETE_PRIVATE")]
+    public bool DeletePrivate { get; set; }
+
+    public void Validate()
+    {
+        if (!Enabled)
+        {
+            return;
+        }
+        
+        if (Categories?.Count is null or 0)
+        {
+            throw new ValidationException("no categories configured");
+        }
+
+        if (Categories?.GroupBy(x => x.Name).Any(x => x.Count() > 1) is true)
+        {
+            throw new ValidationException("duplicated categories found");
+        }
+        
+        Categories?.ForEach(x => x.Validate());
+    }
+}

code/Common/Configuration/DownloadClient/DelugeConfig.cs

@@ -1,4 +1,6 @@
-namespace Common.Configuration.DownloadClient;
+using Common.Exceptions;
+
+namespace Common.Configuration.DownloadClient;
 
 public sealed record DelugeConfig : IConfig
 {
@@ -12,7 +14,7 @@ public sealed record DelugeConfig : IConfig
     {
         if (Url is null)
         {
-            throw new ArgumentNullException(nameof(Url));
+            throw new ValidationException($"{nameof(Url)} is empty");
         }
     }
 }

code/Common/Configuration/DownloadClient/DownloadClientConfig.cs

@@ -0,0 +1,9 @@
+using Microsoft.Extensions.Configuration;
+
+namespace Common.Configuration.DownloadClient;
+
+public sealed record DownloadClientConfig
+{
+    [ConfigurationKeyName("DOWNLOAD_CLIENT")]
+    public Enums.DownloadClient DownloadClient { get; init; } = Enums.DownloadClient.None;
+}

code/Common/Configuration/DownloadClient/QBitConfig.cs

@@ -1,4 +1,6 @@
-namespace Common.Configuration.DownloadClient;
+using Common.Exceptions;
+
+namespace Common.Configuration.DownloadClient;
 
 public sealed class QBitConfig : IConfig
 {
@@ -14,7 +16,7 @@ public sealed class QBitConfig : IConfig
     {
         if (Url is null)
         {
-            throw new ArgumentNullException(nameof(Url));
+            throw new ValidationException($"{nameof(Url)} is empty");
         }
     }
 }

code/Common/Configuration/DownloadClient/TransmissionConfig.cs

@@ -1,4 +1,6 @@
-namespace Common.Configuration.DownloadClient;
+using Common.Exceptions;
+
+namespace Common.Configuration.DownloadClient;
 
 public record TransmissionConfig : IConfig
 {
@@ -14,7 +16,7 @@ public record TransmissionConfig : IConfig
     {
         if (Url is null)
         {
-            throw new ArgumentNullException(nameof(Url));
+            throw new ValidationException($"{nameof(Url)} is empty");
         }
     }
 }

code/Common/Configuration/EnvironmentVariables.cs

@@ -1,6 +0,0 @@
-namespace Common.Configuration;
-
-public static class EnvironmentVariables
-{
-    public const string DownloadClient = "DOWNLOAD_CLIENT";
-}

code/Common/Configuration/General/DryRunConfig.cs

@@ -0,0 +1,9 @@
+using Microsoft.Extensions.Configuration;
+
+namespace Common.Configuration.General;
+
+public sealed record DryRunConfig
+{
+    [ConfigurationKeyName("DRY_RUN")]
+    public bool IsDryRun { get; init; }
+}

code/Common/Configuration/General/HttpConfig.cs

@@ -0,0 +1,21 @@
+using Common.Exceptions;
+using Microsoft.Extensions.Configuration;
+
+namespace Common.Configuration.General;
+
+public sealed record HttpConfig : IConfig
+{
+    [ConfigurationKeyName("HTTP_MAX_RETRIES")]
+    public ushort MaxRetries { get; init; }
+    
+    [ConfigurationKeyName("HTTP_TIMEOUT")]
+    public ushort Timeout { get; init; } = 100;
+
+    public void Validate()
+    {
+        if (Timeout is 0)
+        {
+            throw new ValidationException("HTTP_TIMEOUT must be greater than 0");
+        }
+    }
+}

code/Common/Configuration/General/TriggersConfig.cs

@@ -1,4 +1,4 @@
-namespace Common.Configuration;
+namespace Common.Configuration.General;
 
 public sealed class TriggersConfig
 {
@@ -7,4 +7,6 @@ public sealed class TriggersConfig
     public required string QueueCleaner { get; init; }
     
     public required string ContentBlocker { get; init; }
+    
+    public required string DownloadCleaner { get; init; }
 }

code/Common/Configuration/Notification/NotificationConfig.cs

@@ -0,0 +1,22 @@
+using Microsoft.Extensions.Configuration;
+
+namespace Common.Configuration.Notification;
+
+public abstract record NotificationConfig
+{
+    [ConfigurationKeyName("ON_IMPORT_FAILED_STRIKE")]
+    public bool OnImportFailedStrike { get; init; }
+    
+    [ConfigurationKeyName("ON_STALLED_STRIKE")]
+    public bool OnStalledStrike { get; init; }
+    
+    [ConfigurationKeyName("ON_QUEUE_ITEM_DELETED")]
+    public bool OnQueueItemDeleted { get; init; }
+    
+    [ConfigurationKeyName("ON_DOWNLOAD_CLEANED")]
+    public bool OnDownloadCleaned { get; init; }
+
+    public bool IsEnabled => OnImportFailedStrike || OnStalledStrike || OnQueueItemDeleted || OnDownloadCleaned;
+
+    public abstract bool IsValid();
+}

code/Common/Configuration/QueueCleaner/QueueCleanerConfig.cs

@@ -13,8 +13,26 @@ public sealed record QueueCleanerConfig : IJobConfig
     [ConfigurationKeyName("IMPORT_FAILED_MAX_STRIKES")]
     public ushort ImportFailedMaxStrikes { get; init; }
     
+    [ConfigurationKeyName("IMPORT_FAILED_IGNORE_PRIVATE")]
+    public bool ImportFailedIgnorePrivate { get; init; }
+    
+    [ConfigurationKeyName("IMPORT_FAILED_DELETE_PRIVATE")]
+    public bool ImportFailedDeletePrivate { get; init; }
+    
+    [ConfigurationKeyName("IMPORT_FAILED_IGNORE_PATTERNS")]
+    public List<string>? ImportFailedIgnorePatterns { get; init; }
+    
     [ConfigurationKeyName("STALLED_MAX_STRIKES")]
     public ushort StalledMaxStrikes { get; init; }
+    
+    [ConfigurationKeyName("STALLED_RESET_STRIKES_ON_PROGRESS")]
+    public bool StalledResetStrikesOnProgress { get; init; }
+    
+    [ConfigurationKeyName("STALLED_IGNORE_PRIVATE")]
+    public bool StalledIgnorePrivate { get; init; }
+    
+    [ConfigurationKeyName("STALLED_DELETE_PRIVATE")]
+    public bool StalledDeletePrivate { get; init; }
 
     public void Validate()
     {

code/Common/Enums/DownloadClient.cs

@@ -1,8 +1,9 @@
-namespace Domain.Enums;
+namespace Common.Enums;
 
 public enum DownloadClient
 {
     QBittorrent,
     Deluge,
-    Transmission
+    Transmission,
+    None
 }

code/Common/Exceptions/ValidationException.cs

@@ -0,0 +1,12 @@
+namespace Common.Exceptions;
+
+public sealed class ValidationException : Exception
+{
+    public ValidationException()
+    {
+    }
+
+    public ValidationException(string message) : base(message)
+    {
+    }
+}

code/Common/Helpers/Constants.cs

@@ -4,4 +4,6 @@ public static class Constants
 {
     public static readonly TimeSpan TriggerMaxLimit  = TimeSpan.FromHours(6);
     public static readonly TimeSpan CacheLimitBuffer = TimeSpan.FromHours(2);
+
+    public const string HttpClientWithRetryName = "retry";
 }

code/Domain/Enums/CleanReason.cs

@@ -0,0 +1,8 @@
+namespace Domain.Enums;
+
+public enum CleanReason
+{
+    None,
+    MaxRatioReached,
+    MaxSeedTimeReached,
+}

code/Domain/Enums/DeleteReason.cs

@@ -0,0 +1,8 @@
+namespace Domain.Enums;
+
+public enum DeleteReason
+{
+    Stalled,
+    ImportFailed,
+    AllFilesBlocked
+}

code/Domain/Models/Arr/Blocking/BlockedItem.cs

@@ -0,0 +1,8 @@
+namespace Domain.Models.Arr.Blocking;
+
+public record BlockedItem
+{
+    public required string Hash { get; init; }
+    
+    public required Uri InstanceUrl { get; init; }
+}

code/Domain/Models/Arr/Blocking/LidarrBlockedItem.cs

@@ -0,0 +1,8 @@
+namespace Domain.Models.Arr.Blocking;
+
+public sealed record LidarrBlockedItem : BlockedItem
+{
+    public required long AlbumId { get; init; }
+    
+    public required long ArtistId { get; init; }
+}

code/Domain/Models/Arr/Blocking/RadarrBlockedItem.cs

@@ -0,0 +1,6 @@
+namespace Domain.Models.Arr.Blocking;
+
+public sealed record RadarrBlockedItem : BlockedItem
+{
+    public required long MovieId { get; init; }
+}

code/Domain/Models/Arr/Blocking/SonarrBlockedItem.cs

@@ -0,0 +1,10 @@
+namespace Domain.Models.Arr.Blocking;
+
+public sealed record SonarrBlockedItem : BlockedItem
+{
+    public required long EpisodeId { get; init; }
+    
+    public required long SeasonNumber { get; init; }
+    
+    public required long SeriesId { get; init; }
+}

code/Domain/Models/Arr/Queue/Image.cs

@@ -0,0 +1,8 @@
+namespace Domain.Models.Arr.Queue;
+
+public record Image
+{
+    public required string CoverType { get; init; }
+    
+    public required Uri RemoteUrl { get; init; }
+}

code/Domain/Models/Arr/Queue/LidarrImage.cs

@@ -0,0 +1,8 @@
+namespace Domain.Models.Arr.Queue;
+
+public record LidarrImage
+{
+    public required string CoverType { get; init; }
+    
+    public required Uri Url { get; init; }
+}

code/Domain/Models/Arr/Queue/QueueAlbum.cs

@@ -0,0 +1,6 @@
+namespace Domain.Models.Arr.Queue;
+
+public sealed record QueueAlbum
+{
+    public List<LidarrImage> Images { get; init; } = [];
+}

code/Domain/Models/Arr/Queue/QueueMovie.cs

@@ -0,0 +1,6 @@
+namespace Domain.Models.Arr.Queue;
+
+public sealed record QueueMovie
+{
+    public List<Image> Images { get; init; } = [];
+}

code/Domain/Models/Arr/Queue/QueueRecord.cs

@@ -1,16 +1,33 @@
-namespace Domain.Models.Arr.Queue;
+namespace Domain.Models.Arr.Queue;
 
-public record QueueRecord
+public sealed record QueueRecord
 {
-    public int SeriesId { get; init; }
-    public int EpisodeId { get; init; }
-    public int SeasonNumber { get; init; }
-    public int MovieId { get; init; }
+    // Sonarr
+    public long SeriesId { get; init; }
+    public long EpisodeId { get; init; }
+    public long SeasonNumber { get; init; }
+    
+    public QueueSeries? Series { get; init; }
+    
+    // Radarr
+    public long MovieId { get; init; }
+    
+    public QueueSeries? Movie { get; init; }
+    
+    // Lidarr
+    public long ArtistId { get; init; }
+    
+    public long AlbumId { get; init; }
+    
+    public QueueAlbum? Album { get; init; }
+    
+    // common
     public required string Title { get; init; }
     public string Status { get; init; }
     public string TrackedDownloadStatus { get; init; }
     public string TrackedDownloadState { get; init; }
+    public List<TrackedDownloadStatusMessage>? StatusMessages { get; init; }
     public required string DownloadId { get; init; }
     public required string Protocol { get; init; }
-    public required int Id { get; init; }
+    public required long Id { get; init; }
 }

code/Domain/Models/Arr/Queue/QueueSeries.cs

@@ -0,0 +1,6 @@
+namespace Domain.Models.Arr.Queue;
+
+public sealed record QueueSeries
+{
+    public List<Image> Images { get; init; } = [];
+}

code/Domain/Models/Arr/Queue/TrackedDownloadStatusMessage.cs

@@ -0,0 +1,8 @@
+namespace Domain.Models.Arr.Queue;
+
+public sealed record TrackedDownloadStatusMessage
+{
+    public string Title { get; set; }
+    
+    public List<string>? Messages { get; set; }
+}

code/Domain/Models/Cache/CacheItem.cs

@@ -0,0 +1,9 @@
+namespace Domain.Models.Cache;
+
+public sealed record CacheItem
+{
+    /// <summary>
+    /// The amount of bytes that have been downloaded.
+    /// </summary>
+    public long Downloaded { get; set; }
+}

code/Domain/Models/Deluge/Response/TorrentStatus.cs

@@ -1,12 +1,26 @@
-namespace Domain.Models.Deluge.Response;
+using Newtonsoft.Json;
+
+namespace Domain.Models.Deluge.Response;
 
 public sealed record TorrentStatus
 {
-    public string? Hash { get; set; }
+    public string? Hash { get; init; }
     
-    public string? State { get; set; }
+    public string? State { get; init; }
     
-    public string? Name { get; set; }
+    public string? Name { get; init; }
     
-    public ulong Eta { get; set; }
+    public ulong Eta { get; init; }
+    
+    public bool Private { get; init; }
+    
+    [JsonProperty("total_done")]
+    public long TotalDone { get; init; }
+    
+    public string? Label { get; init; }
+    
+    [JsonProperty("seeding_time")]
+    public long SeedingTime { get; init; }
+    
+    public float Ratio { get; init; }
 }

code/Domain/Models/Lidarr/Album.cs

@@ -0,0 +1,12 @@
+namespace Domain.Models.Lidarr;
+
+public sealed record Album
+{
+    public long Id { get; set; }
+    
+    public string Title { get; set; }
+    
+    public long ArtistId { get; set; }
+    
+    public Artist Artist { get; set; }
+}

code/Domain/Models/Lidarr/Artist.cs

@@ -0,0 +1,8 @@
+namespace Domain.Models.Lidarr;
+
+public sealed record Artist
+{
+    public long Id { get; set; }
+    
+    public string ArtistName { get; set; }
+}

code/Domain/Models/Lidarr/LidarrCommand.cs

@@ -0,0 +1,10 @@
+namespace Domain.Models.Lidarr;
+
+public sealed record LidarrCommand
+{
+    public string Name { get; set; }
+    
+    public List<long> AlbumIds { get; set; }
+    
+    public long ArtistId { get; set; }
+}

code/Executable/DependencyInjection/ConfigurationDI.cs

@@ -1,10 +1,10 @@
-using Common.Configuration;
-using Common.Configuration.Arr;
+using Common.Configuration.Arr;
 using Common.Configuration.ContentBlocker;
+using Common.Configuration.DownloadCleaner;
 using Common.Configuration.DownloadClient;
+using Common.Configuration.General;
 using Common.Configuration.Logging;
 using Common.Configuration.QueueCleaner;
-using Domain.Enums;
 
 namespace Executable.DependencyInjection;
 
@@ -12,12 +12,16 @@ public static class ConfigurationDI
 {
     public static IServiceCollection AddConfiguration(this IServiceCollection services, IConfiguration configuration) =>
         services
+            .Configure<DryRunConfig>(configuration)
             .Configure<QueueCleanerConfig>(configuration.GetSection(QueueCleanerConfig.SectionName))
             .Configure<ContentBlockerConfig>(configuration.GetSection(ContentBlockerConfig.SectionName))
+            .Configure<DownloadCleanerConfig>(configuration.GetSection(DownloadCleanerConfig.SectionName))
+            .Configure<DownloadClientConfig>(configuration)
             .Configure<QBitConfig>(configuration.GetSection(QBitConfig.SectionName))
             .Configure<DelugeConfig>(configuration.GetSection(DelugeConfig.SectionName))
             .Configure<TransmissionConfig>(configuration.GetSection(TransmissionConfig.SectionName))
             .Configure<SonarrConfig>(configuration.GetSection(SonarrConfig.SectionName))
             .Configure<RadarrConfig>(configuration.GetSection(RadarrConfig.SectionName))
+            .Configure<LidarrConfig>(configuration.GetSection(LidarrConfig.SectionName))
             .Configure<LoggingConfig>(configuration.GetSection(LoggingConfig.SectionName));
 }

code/Executable/DependencyInjection/LoggingDI.cs

@@ -1,5 +1,7 @@
 using Common.Configuration.Logging;
+using Domain.Enums;
 using Infrastructure.Verticals.ContentBlocker;
+using Infrastructure.Verticals.DownloadCleaner;
 using Infrastructure.Verticals.QueueCleaner;
 using Serilog;
 using Serilog.Events;
@@ -27,11 +29,22 @@ public static class LoggingDI
         }
         
         LoggerConfiguration logConfig = new();
-        const string consoleOutputTemplate = "[{@t:yyyy-MM-dd HH:mm:ss.fff} {@l:u3}]{#if JobName is not null} {Concat('[',JobName,']'),PAD}{#end} {@m}\n{@x}";
-        const string fileOutputTemplate = "{@t:yyyy-MM-dd HH:mm:ss.fff zzz} [{@l:u3}]{#if JobName is not null} {Concat('[',JobName,']'),PAD}{#end} {@m:lj}\n{@x}";
+        const string jobNameTemplate = "{#if JobName is not null} {Concat('[',JobName,']'),JOB_PAD}{#end}";
+        const string instanceNameTemplate = "{#if InstanceName is not null} {Concat('[',InstanceName,']'),ARR_PAD}{#end}";
+        const string consoleOutputTemplate = $"[{{@t:yyyy-MM-dd HH:mm:ss.fff}} {{@l:u3}}]{jobNameTemplate}{instanceNameTemplate} {{@m}}\n{{@x}}";
+        const string fileOutputTemplate = $"{{@t:yyyy-MM-dd HH:mm:ss.fff zzz}} [{{@l:u3}}]{jobNameTemplate}{instanceNameTemplate} {{@m:lj}}\n{{@x}}";
         LogEventLevel level = LogEventLevel.Information;
-        List<string> jobNames = [nameof(ContentBlocker), nameof(QueueCleaner)];
-        int padding = jobNames.Max(x => x.Length) + 2;
+        List<string> names = [nameof(ContentBlocker), nameof(QueueCleaner), nameof(DownloadCleaner)];
+        int jobPadding = names.Max(x => x.Length) + 2;
+        names = [InstanceType.Sonarr.ToString(), InstanceType.Radarr.ToString(), InstanceType.Lidarr.ToString()];
+        int arrPadding = names.Max(x => x.Length) + 2;
+
+        string consoleTemplate = consoleOutputTemplate
+            .Replace("JOB_PAD", jobPadding.ToString())
+            .Replace("ARR_PAD", arrPadding.ToString());
+        string fileTemplate = fileOutputTemplate
+            .Replace("JOB_PAD", jobPadding.ToString())
+            .Replace("ARR_PAD", arrPadding.ToString());
 
         if (config is not null)
         {
@@ -41,7 +54,7 @@ public static class LoggingDI
             {
                 logConfig.WriteTo.File(
                     path: Path.Combine(config.File.Path, "cleanuperr-.txt"),
-                    formatter: new ExpressionTemplate(fileOutputTemplate.Replace("PAD", padding.ToString())),
+                    formatter: new ExpressionTemplate(fileTemplate),
                     fileSizeLimitBytes: 10L * 1024 * 1024,
                     rollingInterval: RollingInterval.Day,
                     rollOnFileSizeLimit: true
@@ -51,11 +64,12 @@ public static class LoggingDI
 
         Log.Logger = logConfig
             .MinimumLevel.Is(level)
+            .MinimumLevel.Override("MassTransit", LogEventLevel.Warning)
             .MinimumLevel.Override("Microsoft.Hosting.Lifetime", LogEventLevel.Information)
             .MinimumLevel.Override("Microsoft.Extensions.Http", LogEventLevel.Warning)
             .MinimumLevel.Override("Quartz", LogEventLevel.Warning)
             .MinimumLevel.Override("System.Net.Http.HttpClient", LogEventLevel.Error)
-            .WriteTo.Console(new ExpressionTemplate(consoleOutputTemplate.Replace("PAD", padding.ToString())))
+            .WriteTo.Console(new ExpressionTemplate(consoleTemplate))
             .Enrich.FromLogContext()
             .Enrich.WithProperty("ApplicationName", "cleanuperr")
             .CreateLogger();

code/Executable/DependencyInjection/MainDI.cs

@@ -1,14 +1,14 @@
 using System.Net;
-using Common.Configuration;
-using Common.Configuration.ContentBlocker;
-using Executable.Jobs;
-using Infrastructure.Verticals.Arr;
-using Infrastructure.Verticals.ContentBlocker;
-using Infrastructure.Verticals.DownloadClient;
+using Castle.DynamicProxy;
+using Common.Configuration.General;
+using Common.Helpers;
+using Infrastructure.Interceptors;
 using Infrastructure.Verticals.DownloadClient.Deluge;
-using Infrastructure.Verticals.DownloadClient.QBittorrent;
-using Infrastructure.Verticals.DownloadClient.Transmission;
-using Infrastructure.Verticals.QueueCleaner;
+using Infrastructure.Verticals.Notifications.Consumers;
+using Infrastructure.Verticals.Notifications.Models;
+using MassTransit;
+using Polly;
+using Polly.Extensions.Http;
 
 namespace Executable.DependencyInjection;
 
@@ -17,16 +17,49 @@ public static class MainDI
     public static IServiceCollection AddInfrastructure(this IServiceCollection services, IConfiguration configuration) =>
         services
             .AddLogging(builder => builder.ClearProviders().AddConsole())
-            .AddHttpClients()
+            .AddHttpClients(configuration)
             .AddConfiguration(configuration)
             .AddMemoryCache()
             .AddServices()
-            .AddQuartzServices(configuration);
+            .AddQuartzServices(configuration)
+            .AddNotifications(configuration)
+            .AddMassTransit(config =>
+            {
+                config.AddConsumer<NotificationConsumer<FailedImportStrikeNotification>>();
+                config.AddConsumer<NotificationConsumer<StalledStrikeNotification>>();
+                config.AddConsumer<NotificationConsumer<QueueItemDeletedNotification>>();
+                config.AddConsumer<NotificationConsumer<DownloadCleanedNotification>>();
+
+                config.UsingInMemory((context, cfg) =>
+                {
+                    cfg.ReceiveEndpoint("notification-queue", e =>
+                    {
+                        e.ConfigureConsumer<NotificationConsumer<FailedImportStrikeNotification>>(context);
+                        e.ConfigureConsumer<NotificationConsumer<StalledStrikeNotification>>(context);
+                        e.ConfigureConsumer<NotificationConsumer<QueueItemDeletedNotification>>(context);
+                        e.ConfigureConsumer<NotificationConsumer<DownloadCleanedNotification>>(context);
+                        e.ConcurrentMessageLimit = 1;
+                        e.PrefetchCount = 1;
+                    });
+                });
+            })
+            .AddDryRunInterceptor();
     
-    private static IServiceCollection AddHttpClients(this IServiceCollection services)
+    private static IServiceCollection AddHttpClients(this IServiceCollection services, IConfiguration configuration)
     {
         // add default HttpClient
         services.AddHttpClient();
+        
+        HttpConfig config = configuration.Get<HttpConfig>() ?? new();
+        config.Validate();
+
+        // add retry HttpClient
+        services
+            .AddHttpClient(Constants.HttpClientWithRetryName, x =>
+            {
+                x.Timeout = TimeSpan.FromSeconds(config.Timeout);
+            })
+            .AddRetryPolicyHandler(config);
 
         // add Deluge HttpClient
         services
@@ -44,6 +77,43 @@ public static class MainDI
                     AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate,
                     ServerCertificateCustomValidationCallback = (_, _, _, _) => true
                 };
+            })
+            .AddRetryPolicyHandler(config);
+
+        return services;
+    }
+
+    private static IHttpClientBuilder AddRetryPolicyHandler(this IHttpClientBuilder builder, HttpConfig config) =>
+        builder.AddPolicyHandler(
+            HttpPolicyExtensions
+                .HandleTransientHttpError()
+                // do not retry on Unauthorized
+                .OrResult(response => !response.IsSuccessStatusCode && response.StatusCode != HttpStatusCode.Unauthorized)
+                .WaitAndRetryAsync(config.MaxRetries, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)))
+        );
+
+    private static IServiceCollection AddDryRunInterceptor(this IServiceCollection services)
+    {
+        services
+            .Where(s => s.ServiceType != typeof(IDryRunService) && typeof(IDryRunService).IsAssignableFrom(s.ServiceType))
+            .ToList()
+            .ForEach(service =>
+            {
+                services.Decorate(service.ServiceType, (target, svc) =>
+                {
+                    ProxyGenerator proxyGenerator = new();
+                    DryRunAsyncInterceptor interceptor = svc.GetRequiredService<DryRunAsyncInterceptor>();
+
+                    object implementation = proxyGenerator.CreateClassProxyWithTarget(
+                        service.ServiceType,
+                        target,
+                        interceptor
+                    );
+
+                    ((IInterceptedService)target).Proxy = implementation;
+
+                    return implementation;
+                });
             });
 
         return services;

code/Executable/DependencyInjection/NotificationsDI.cs

@@ -0,0 +1,16 @@
+using Infrastructure.Verticals.Notifications;
+using Infrastructure.Verticals.Notifications.Notifiarr;
+
+namespace Executable.DependencyInjection;
+
+public static class NotificationsDI
+{
+    public static IServiceCollection AddNotifications(this IServiceCollection services, IConfiguration configuration) =>
+        services
+            .Configure<NotifiarrConfig>(configuration.GetSection(NotifiarrConfig.SectionName))
+            .AddTransient<INotifiarrProxy, NotifiarrProxy>()
+            .AddTransient<INotificationProvider, NotifiarrProvider>()
+            .AddTransient<NotificationPublisher>()
+            .AddTransient<INotificationFactory, NotificationFactory>()
+            .AddTransient<NotificationService>();
+}

code/Executable/DependencyInjection/QuartzDI.cs

@@ -1,9 +1,12 @@
 using Common.Configuration;
 using Common.Configuration.ContentBlocker;
+using Common.Configuration.DownloadCleaner;
+using Common.Configuration.General;
 using Common.Configuration.QueueCleaner;
 using Common.Helpers;
 using Executable.Jobs;
 using Infrastructure.Verticals.ContentBlocker;
+using Infrastructure.Verticals.DownloadCleaner;
 using Infrastructure.Verticals.Jobs;
 using Infrastructure.Verticals.QueueCleaner;
 using Quartz;
@@ -58,6 +61,12 @@ public static class QuartzDI
         {
             q.AddJob<QueueCleaner>(queueCleanerConfig, triggersConfig.QueueCleaner);
         }
+        
+        DownloadCleanerConfig? downloadCleanerConfig = configuration
+            .GetRequiredSection(DownloadCleanerConfig.SectionName)
+            .Get<DownloadCleanerConfig>();
+
+        q.AddJob<DownloadCleaner>(downloadCleanerConfig, triggersConfig.DownloadCleaner);
     }
     
     private static void AddJob<T>(
@@ -108,7 +117,7 @@ public static class QuartzDI
         
         if (triggerValue > Constants.TriggerMaxLimit)
         {
-            throw new Exception($"{trigger} should have a fire time of maximum 1 hour");
+            throw new Exception($"{trigger} should have a fire time of maximum {Constants.TriggerMaxLimit.TotalHours} hours");
         }
 
         if (triggerValue > StaticConfiguration.TriggerValue)

code/Executable/DependencyInjection/ServicesDI.cs

@@ -1,5 +1,7 @@
-using Infrastructure.Verticals.Arr;
+using Infrastructure.Interceptors;
+using Infrastructure.Verticals.Arr;
 using Infrastructure.Verticals.ContentBlocker;
+using Infrastructure.Verticals.DownloadCleaner;
 using Infrastructure.Verticals.DownloadClient;
 using Infrastructure.Verticals.DownloadClient.Deluge;
 using Infrastructure.Verticals.DownloadClient.QBittorrent;
@@ -13,16 +15,20 @@ public static class ServicesDI
 {
     public static IServiceCollection AddServices(this IServiceCollection services) =>
         services
+            .AddTransient<DryRunAsyncInterceptor>()
             .AddTransient<SonarrClient>()
             .AddTransient<RadarrClient>()
+            .AddTransient<LidarrClient>()
             .AddTransient<QueueCleaner>()
             .AddTransient<ContentBlocker>()
-            .AddTransient<FilenameEvaluator>()
+            .AddTransient<DownloadCleaner>()
+            .AddTransient<IFilenameEvaluator, FilenameEvaluator>()
+            .AddTransient<DummyDownloadService>()
             .AddTransient<QBitService>()
             .AddTransient<DelugeService>()
             .AddTransient<TransmissionService>()
             .AddTransient<ArrQueueIterator>()
             .AddTransient<DownloadServiceFactory>()
             .AddSingleton<BlocklistProvider>()
-            .AddSingleton<Striker>();
+            .AddSingleton<IStriker, Striker>();
 }

code/Executable/Executable.csproj

@@ -10,8 +10,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.2" />
         <PackageReference Include="Quartz" Version="3.13.1" />
         <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.13.1" />
         <PackageReference Include="Quartz.Extensions.Hosting" Version="3.13.1" />

code/Executable/Jobs/GenericJob.cs

@@ -6,7 +6,7 @@ namespace Executable.Jobs;
 
 [DisallowConcurrentExecution]
 public sealed class GenericJob<T> : IJob
-    where T : GenericHandler
+    where T : IHandler
 {
     private readonly ILogger<GenericJob<T>> _logger;
     private readonly T _handler;

code/Executable/appsettings.Development.json

@@ -1,4 +1,7 @@
 {
+  "DRY_RUN": true,
+  "HTTP_MAX_RETRIES": 0,
+  "HTTP_TIMEOUT": 10,
   "Logging": {
     "LogLevel": "Debug",
     "Enhanced": true,
@@ -9,24 +12,39 @@
   },
   "Triggers": {
     "QueueCleaner": "0/10 * * * * ?",
-    "ContentBlocker": "0/10 * * * * ?"
+    "ContentBlocker": "0/10 * * * * ?",
+    "DownloadCleaner": "0/10 * * * * ?"
   },
   "ContentBlocker": {
     "Enabled": true,
-    "Blacklist": {
-      "Enabled": false,
-      "Path": "https://raw.githubusercontent.com/flmorg/cleanuperr/refs/heads/main/blacklist"
-    },
-    "Whitelist": {
-      "Enabled": false,
-      "Path": "https://raw.githubusercontent.com/flmorg/cleanuperr/refs/heads/main/whitelist"
-    }
+    "IGNORE_PRIVATE": true,
+    "DELETE_PRIVATE": false
   },
   "QueueCleaner": {
     "Enabled": true,
     "RunSequentially": true,
     "IMPORT_FAILED_MAX_STRIKES": 5,
-    "STALLED_MAX_STRIKES": 5
+    "IMPORT_FAILED_IGNORE_PRIVATE": true,
+    "IMPORT_FAILED_DELETE_PRIVATE": false,
+    "IMPORT_FAILED_IGNORE_PATTERNS": [
+      "file is a sample"
+    ],
+    "STALLED_MAX_STRIKES": 5,
+    "STALLED_RESET_STRIKES_ON_PROGRESS": true,
+    "STALLED_IGNORE_PRIVATE": true,
+    "STALLED_DELETE_PRIVATE": false
+  },
+  "DownloadCleaner": {
+    "Enabled": false,
+    "DELETE_PRIVATE": false,
+    "CATEGORIES": [
+      {
+        "Name": "tv-sonarr",
+        "MAX_RATIO": -1,
+        "MIN_SEED_TIME": 0,
+        "MAX_SEED_TIME": -1
+      }
+    ]
   },
   "DOWNLOAD_CLIENT": "qbittorrent",
   "qBittorrent": {
@@ -46,20 +64,49 @@
   "Sonarr": {
     "Enabled": true,
     "SearchType": "Episode",
+    "Block": {
+      "Type": "blacklist",
+      "Path": "https://raw.githubusercontent.com/flmorg/cleanuperr/refs/heads/main/blacklist"
+    },
     "Instances": [
       {
         "Url": "http://localhost:8989",
-        "ApiKey": "96736c3eb3144936b8f1d62d27be8cee"
+        "ApiKey": "425d1e713f0c405cbbf359ac0502c1f4"
       }
     ]
   },
   "Radarr": {
     "Enabled": true,
+    "Block": {
+      "Type": "blacklist",
+      "Path": "https://raw.githubusercontent.com/flmorg/cleanuperr/refs/heads/main/blacklist"
+    },
     "Instances": [
       {
         "Url": "http://localhost:7878",
-        "ApiKey": "705b553732ab4167ab23909305d60600"
+        "ApiKey": "8b7454f668e54c5b8f44f56f93969761"
       }
     ]
+  },
+  "Lidarr": {
+    "Enabled": true,
+    "Block": {
+      "Type": "blacklist",
+      "Path": "https://raw.githubusercontent.com/flmorg/cleanuperr/refs/heads/main/blacklist"
+    },
+    "Instances": [
+      {
+        "Url": "http://localhost:8686",
+        "ApiKey": "7f677cfdc074414397af53dd633860c5"
+      }
+    ]
+  },
+  "Notifiarr": {
+    "ON_IMPORT_FAILED_STRIKE": true,
+    "ON_STALLED_STRIKE": true,
+    "ON_QUEUE_ITEM_DELETED": true,
+    "ON_DOWNLOAD_CLEANED": true,
+    "API_KEY": "",
+    "CHANNEL_ID": ""
   }
 }

code/Executable/appsettings.json

@@ -1,4 +1,7 @@
 {
+  "DRY_RUN": false,
+  "HTTP_MAX_RETRIES": 0,
+  "HTTP_TIMEOUT": 100,
   "Logging": {
     "LogLevel": "Information",
     "Enhanced": true,
@@ -9,26 +12,31 @@
   },
   "Triggers": {
     "QueueCleaner": "0 0/5 * * * ?",
-    "ContentBlocker": "0 0/5 * * * ?"
+    "ContentBlocker": "0 0/5 * * * ?",
+    "DownloadCleaner": "0 0 * * * ?"
   },
   "ContentBlocker": {
     "Enabled": false,
-    "Blacklist": {
-      "Enabled": false,
-      "Path": ""
-    },
-    "Whitelist": {
-      "Enabled": false,
-      "Path": ""
-    }
+    "IGNORE_PRIVATE": false
   },
   "QueueCleaner": {
     "Enabled": true,
     "RunSequentially": true,
-    "IMPORT_FAILED_MAX_STRIKES": 5,
-    "STALLED_MAX_STRIKES": 5
+    "IMPORT_FAILED_MAX_STRIKES": 0,
+    "IMPORT_FAILED_IGNORE_PRIVATE": false,
+    "IMPORT_FAILED_DELETE_PRIVATE": false,
+    "IMPORT_FAILED_IGNORE_PATTERNS": [],
+    "STALLED_MAX_STRIKES": 0,
+    "STALLED_RESET_STRIKES_ON_PROGRESS": false,
+    "STALLED_IGNORE_PRIVATE": false,
+    "STALLED_DELETE_PRIVATE": false
   },
-  "DOWNLOAD_CLIENT": "qbittorrent",
+  "DownloadCleaner": {
+    "Enabled": false,
+    "DELETE_PRIVATE": false,
+    "CATEGORIES": []
+  },
+  "DOWNLOAD_CLIENT": "none",
   "qBittorrent": {
     "Url": "http://localhost:8080",
     "Username": "",
@@ -44,8 +52,12 @@
     "Password": "testing"
   },
   "Sonarr": {
-    "Enabled": true,
+    "Enabled": false,
     "SearchType": "Episode",
+    "Block": {
+      "Type": "blacklist",
+      "Path": ""
+    },
     "Instances": [
       {
         "Url": "http://localhost:8989",
@@ -55,11 +67,36 @@
   },
   "Radarr": {
     "Enabled": false,
+    "Block": {
+      "Type": "blacklist",
+      "Path": ""
+    },
     "Instances": [
       {
         "Url": "http://localhost:7878",
         "ApiKey": ""
       }
     ]
+  },
+  "Lidarr": {
+    "Enabled": false,
+    "Block": {
+      "Type": "blacklist",
+      "Path": ""
+    },
+    "Instances": [
+      {
+        "Url": "http://localhost:8686",
+        "ApiKey": ""
+      }
+    ]
+  },
+  "Notifiarr": {
+    "ON_IMPORT_FAILED_STRIKE": false,
+    "ON_STALLED_STRIKE": false,
+    "ON_QUEUE_ITEM_DELETED": false,
+    "ON_DOWNLOAD_CLEANED": false,
+    "API_KEY": "",
+    "CHANNEL_ID": ""
   }
 }

code/Infrastructure.Tests/Infrastructure.Tests.csproj

@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net9.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="coverlet.collector" Version="6.0.4">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+        <PackageReference Include="NSubstitute" Version="5.3.0" />
+        <PackageReference Include="Shouldly" Version="4.3.0" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+        <Using Include="Xunit"/>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
+    </ItemGroup>
+
+</Project>

code/Infrastructure.Tests/Verticals/ContentBlocker/FilenameEvaluatorFixture.cs

@@ -0,0 +1,20 @@
+using Infrastructure.Verticals.ContentBlocker;
+using Microsoft.Extensions.Logging;
+using NSubstitute;
+
+namespace Infrastructure.Tests.Verticals.ContentBlocker;
+
+public class FilenameEvaluatorFixture
+{
+    public ILogger<FilenameEvaluator> Logger { get; }
+    
+    public FilenameEvaluatorFixture()
+    {
+        Logger = Substitute.For<ILogger<FilenameEvaluator>>();
+    }
+
+    public FilenameEvaluator CreateSut()
+    {
+        return new FilenameEvaluator(Logger);
+    }
+}

code/Infrastructure.Tests/Verticals/ContentBlocker/FilenameEvaluatorTests.cs

@@ -0,0 +1,219 @@
+using System.Collections.Concurrent;
+using System.Text.RegularExpressions;
+using Common.Configuration.ContentBlocker;
+using Shouldly;
+
+namespace Infrastructure.Tests.Verticals.ContentBlocker;
+
+public class FilenameEvaluatorTests : IClassFixture<FilenameEvaluatorFixture>
+{
+    private readonly FilenameEvaluatorFixture _fixture;
+
+    public FilenameEvaluatorTests(FilenameEvaluatorFixture fixture)
+    {
+        _fixture = fixture;
+    }
+
+    public class PatternTests : FilenameEvaluatorTests
+    {
+        public PatternTests(FilenameEvaluatorFixture fixture) : base(fixture) { }
+
+        [Fact]
+        public void WhenNoPatterns_ShouldReturnTrue()
+        {
+            // Arrange
+            var sut = _fixture.CreateSut();
+            var patterns = new ConcurrentBag<string>();
+            var regexes = new ConcurrentBag<Regex>();
+
+            // Act
+            var result = sut.IsValid("test.txt", BlocklistType.Blacklist, patterns, regexes);
+
+            // Assert
+            result.ShouldBeTrue();
+        }
+
+        [Theory]
+        [InlineData("test.txt", "test.txt", true)]  // Exact match
+        [InlineData("test.txt", "*.txt", true)]     // End wildcard
+        [InlineData("test.txt", "test.*", true)]    // Start wildcard
+        [InlineData("test.txt", "*test*", true)]    // Both wildcards
+        [InlineData("test.txt", "other.txt", false)] // No match
+        public void Blacklist_ShouldMatchPatterns(string filename, string pattern, bool shouldBeBlocked)
+        {
+            // Arrange
+            var sut = _fixture.CreateSut();
+            var patterns = new ConcurrentBag<string> { pattern };
+            var regexes = new ConcurrentBag<Regex>();
+
+            // Act
+            var result = sut.IsValid(filename, BlocklistType.Blacklist, patterns, regexes);
+
+            // Assert
+            result.ShouldBe(!shouldBeBlocked);
+        }
+
+        [Theory]
+        [InlineData("test.txt", "test.txt", true)]  // Exact match
+        [InlineData("test.txt", "*.txt", true)]     // End wildcard
+        [InlineData("test.txt", "test.*", true)]    // Start wildcard
+        [InlineData("test.txt", "*test*", true)]    // Both wildcards
+        [InlineData("test.txt", "other.txt", false)] // No match
+        public void Whitelist_ShouldMatchPatterns(string filename, string pattern, bool shouldBeAllowed)
+        {
+            // Arrange
+            var sut = _fixture.CreateSut();
+            var patterns = new ConcurrentBag<string> { pattern };
+            var regexes = new ConcurrentBag<Regex>();
+
+            // Act
+            var result = sut.IsValid(filename, BlocklistType.Whitelist, patterns, regexes);
+
+            // Assert
+            result.ShouldBe(shouldBeAllowed);
+        }
+
+        [Theory]
+        [InlineData("TEST.TXT", "test.txt")]
+        [InlineData("test.txt", "TEST.TXT")]
+        public void ShouldBeCaseInsensitive(string filename, string pattern)
+        {
+            // Arrange
+            var sut = _fixture.CreateSut();
+            var patterns = new ConcurrentBag<string> { pattern };
+            var regexes = new ConcurrentBag<Regex>();
+
+            // Act
+            var result = sut.IsValid(filename, BlocklistType.Blacklist, patterns, regexes);
+
+            // Assert
+            result.ShouldBeFalse();
+        }
+
+        [Fact]
+        public void MultiplePatterns_ShouldMatchAny()
+        {
+            // Arrange
+            var sut = _fixture.CreateSut();
+            var patterns = new ConcurrentBag<string> 
+            { 
+                "other.txt",
+                "*.pdf",
+                "test.*"
+            };
+            var regexes = new ConcurrentBag<Regex>();
+
+            // Act
+            var result = sut.IsValid("test.txt", BlocklistType.Blacklist, patterns, regexes);
+
+            // Assert
+            result.ShouldBeFalse();
+        }
+    }
+
+    public class RegexTests : FilenameEvaluatorTests
+    {
+        public RegexTests(FilenameEvaluatorFixture fixture) : base(fixture) { }
+
+        [Fact]
+        public void WhenNoRegexes_ShouldReturnTrue()
+        {
+            // Arrange
+            var sut = _fixture.CreateSut();
+            var patterns = new ConcurrentBag<string>();
+            var regexes = new ConcurrentBag<Regex>();
+
+            // Act
+            var result = sut.IsValid("test.txt", BlocklistType.Blacklist, patterns, regexes);
+
+            // Assert
+            result.ShouldBeTrue();
+        }
+
+        [Theory]
+        [InlineData(@"test\d+\.txt", "test123.txt", true)]
+        [InlineData(@"test\d+\.txt", "test.txt", false)]
+        public void Blacklist_ShouldMatchRegexes(string pattern, string filename, bool shouldBeBlocked)
+        {
+            // Arrange
+            var sut = _fixture.CreateSut();
+            var patterns = new ConcurrentBag<string>();
+            var regexes = new ConcurrentBag<Regex> { new Regex(pattern, RegexOptions.IgnoreCase) };
+
+            // Act
+            var result = sut.IsValid(filename, BlocklistType.Blacklist, patterns, regexes);
+
+            // Assert
+            result.ShouldBe(!shouldBeBlocked);
+        }
+
+        [Theory]
+        [InlineData(@"test\d+\.txt", "test123.txt", true)]
+        [InlineData(@"test\d+\.txt", "test.txt", false)]
+        public void Whitelist_ShouldMatchRegexes(string pattern, string filename, bool shouldBeAllowed)
+        {
+            // Arrange
+            var sut = _fixture.CreateSut();
+            var patterns = new ConcurrentBag<string>();
+            var regexes = new ConcurrentBag<Regex> { new Regex(pattern, RegexOptions.IgnoreCase) };
+
+            // Act
+            var result = sut.IsValid(filename, BlocklistType.Whitelist, patterns, regexes);
+
+            // Assert
+            result.ShouldBe(shouldBeAllowed);
+        }
+
+        [Theory]
+        [InlineData(@"TEST\d+\.TXT", "test123.txt")]
+        [InlineData(@"test\d+\.txt", "TEST123.TXT")]
+        public void ShouldBeCaseInsensitive(string pattern, string filename)
+        {
+            // Arrange
+            var sut = _fixture.CreateSut();
+            var patterns = new ConcurrentBag<string>();
+            var regexes = new ConcurrentBag<Regex> { new Regex(pattern, RegexOptions.IgnoreCase) };
+
+            // Act
+            var result = sut.IsValid(filename, BlocklistType.Blacklist, patterns, regexes);
+
+            // Assert
+            result.ShouldBeFalse();
+        }
+    }
+
+    public class CombinedTests : FilenameEvaluatorTests
+    {
+        public CombinedTests(FilenameEvaluatorFixture fixture) : base(fixture) { }
+
+        [Fact]
+        public void WhenBothPatternsAndRegexes_ShouldMatchBoth()
+        {
+            // Arrange
+            var sut = _fixture.CreateSut();
+            var patterns = new ConcurrentBag<string> { "*.txt" };
+            var regexes = new ConcurrentBag<Regex> { new Regex(@"test\d+", RegexOptions.IgnoreCase) };
+
+            // Act
+            var result = sut.IsValid("test123.txt", BlocklistType.Blacklist, patterns, regexes);
+
+            // Assert
+            result.ShouldBeFalse();
+        }
+
+        [Fact]
+        public void WhenPatternMatchesButRegexDoesNot_ShouldReturnFalse()
+        {
+            // Arrange
+            var sut = _fixture.CreateSut();
+            var patterns = new ConcurrentBag<string> { "*.txt" };
+            var regexes = new ConcurrentBag<Regex> { new Regex(@"test\d+", RegexOptions.IgnoreCase) };
+
+            // Act
+            var result = sut.IsValid("other.txt", BlocklistType.Whitelist, patterns, regexes);
+
+            // Assert
+            result.ShouldBeFalse();
+        }
+    }
+}

code/Infrastructure.Tests/Verticals/DownloadClient/DownloadServiceFixture.cs

@@ -0,0 +1,74 @@
+using Common.Configuration.ContentBlocker;
+using Common.Configuration.DownloadCleaner;
+using Common.Configuration.QueueCleaner;
+using Infrastructure.Verticals.ContentBlocker;
+using Infrastructure.Verticals.DownloadClient;
+using Infrastructure.Verticals.ItemStriker;
+using Infrastructure.Verticals.Notifications;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using NSubstitute;
+
+namespace Infrastructure.Tests.Verticals.DownloadClient;
+
+public class DownloadServiceFixture : IDisposable
+{
+    public ILogger<DownloadService> Logger { get; set; }
+    public IMemoryCache Cache { get; set; }
+    public IStriker Striker { get; set; }
+
+    public DownloadServiceFixture()
+    {
+        Logger = Substitute.For<ILogger<DownloadService>>();
+        Cache = Substitute.For<IMemoryCache>();
+        Striker = Substitute.For<IStriker>();
+    }
+
+    public TestDownloadService CreateSut(
+        QueueCleanerConfig? queueCleanerConfig = null,
+        ContentBlockerConfig? contentBlockerConfig = null
+    )
+    {
+        queueCleanerConfig ??= new QueueCleanerConfig
+        {
+            Enabled = true,
+            RunSequentially = true,
+            StalledResetStrikesOnProgress = true,
+            StalledMaxStrikes = 3
+        };
+
+        var queueCleanerOptions = Substitute.For<IOptions<QueueCleanerConfig>>();
+        queueCleanerOptions.Value.Returns(queueCleanerConfig);
+
+        contentBlockerConfig ??= new ContentBlockerConfig
+        {
+            Enabled = true
+        };
+        
+        var contentBlockerOptions = Substitute.For<IOptions<ContentBlockerConfig>>();
+        contentBlockerOptions.Value.Returns(contentBlockerConfig);
+
+        var downloadCleanerOptions = Substitute.For<IOptions<DownloadCleanerConfig>>();
+        downloadCleanerOptions.Value.Returns(new DownloadCleanerConfig());
+
+        var filenameEvaluator = Substitute.For<IFilenameEvaluator>();
+        var notifier = Substitute.For<NotificationPublisher>();
+
+        return new TestDownloadService(
+            Logger,
+            queueCleanerOptions,
+            contentBlockerOptions,
+            downloadCleanerOptions,
+            Cache,
+            filenameEvaluator,
+            Striker,
+            notifier
+        );
+    }
+
+    public void Dispose()
+    {
+        // Cleanup if needed
+    }
+}

code/Infrastructure.Tests/Verticals/DownloadClient/DownloadServiceTests.cs

@@ -0,0 +1,235 @@
+using Common.Configuration.DownloadCleaner;
+using Domain.Enums;
+using Domain.Models.Cache;
+using Infrastructure.Helpers;
+using Infrastructure.Verticals.Context;
+using Infrastructure.Verticals.DownloadClient;
+using NSubstitute;
+using NSubstitute.ClearExtensions;
+using Shouldly;
+
+namespace Infrastructure.Tests.Verticals.DownloadClient;
+
+public class DownloadServiceTests : IClassFixture<DownloadServiceFixture>
+{
+    private readonly DownloadServiceFixture _fixture;
+
+    public DownloadServiceTests(DownloadServiceFixture fixture)
+    {
+        _fixture = fixture;
+        _fixture.Cache.ClearSubstitute();
+        _fixture.Striker.ClearSubstitute();
+    }
+
+    public class ResetStrikesOnProgressTests : DownloadServiceTests
+    {
+        public ResetStrikesOnProgressTests(DownloadServiceFixture fixture) : base(fixture)
+        {
+        }
+
+        [Fact]
+        public void WhenStalledStrikeDisabled_ShouldNotResetStrikes()
+        {
+            // Arrange
+            TestDownloadService sut = _fixture.CreateSut(queueCleanerConfig: new()
+            {
+                Enabled = true,
+                RunSequentially = true,
+                StalledResetStrikesOnProgress = false,
+            });
+
+            // Act
+            sut.ResetStrikesOnProgress("test-hash", 100);
+
+            // Assert
+            _fixture.Cache.ReceivedCalls().ShouldBeEmpty();
+        }
+        
+        [Fact]
+        public void WhenProgressMade_ShouldResetStrikes()
+        {
+            // Arrange
+            const string hash = "test-hash";
+            CacheItem cacheItem = new CacheItem { Downloaded = 100 };
+            
+            _fixture.Cache.TryGetValue(Arg.Any<object>(), out Arg.Any<object?>())
+                .Returns(x =>
+                {
+                    x[1] = cacheItem;
+                    return true;
+                });
+            
+            TestDownloadService sut = _fixture.CreateSut();
+
+            // Act
+            sut.ResetStrikesOnProgress(hash, 200);
+
+            // Assert
+            _fixture.Cache.Received(1).Remove(CacheKeys.Strike(StrikeType.Stalled, hash));
+        }
+
+        [Fact]
+        public void WhenNoProgress_ShouldNotResetStrikes()
+        {
+            // Arrange
+            const string hash = "test-hash";
+            CacheItem cacheItem = new CacheItem { Downloaded = 200 };
+            
+            _fixture.Cache
+                .TryGetValue(Arg.Any<object>(), out Arg.Any<object?>())
+                .Returns(x =>
+                {
+                    x[1] = cacheItem;
+                    return true;
+                });
+            
+            TestDownloadService sut = _fixture.CreateSut();
+
+            // Act
+            sut.ResetStrikesOnProgress(hash, 100);
+
+            // Assert
+            _fixture.Cache.DidNotReceive().Remove(Arg.Any<object>());
+        }
+    }
+
+    public class StrikeAndCheckLimitTests : DownloadServiceTests
+    {
+        public StrikeAndCheckLimitTests(DownloadServiceFixture fixture) : base(fixture)
+        {
+        }
+
+        [Fact]
+        public async Task ShouldDelegateCallToStriker()
+        {
+            // Arrange
+            const string hash = "test-hash";
+            const string itemName = "test-item";
+            _fixture.Striker.StrikeAndCheckLimit(hash, itemName, 3, StrikeType.Stalled)
+                .Returns(true);
+            
+            TestDownloadService sut = _fixture.CreateSut();
+
+            // Act
+            bool result = await sut.StrikeAndCheckLimit(hash, itemName);
+
+            // Assert
+            result.ShouldBeTrue();
+            await _fixture.Striker
+                .Received(1)
+                .StrikeAndCheckLimit(hash, itemName, 3, StrikeType.Stalled);
+        }
+    }
+
+    public class ShouldCleanDownloadTests : DownloadServiceTests
+    {
+        public ShouldCleanDownloadTests(DownloadServiceFixture fixture) : base(fixture) 
+        {
+            ContextProvider.Set("downloadName", "test-download");
+        }
+
+        [Fact]
+        public void WhenRatioAndMinSeedTimeReached_ShouldReturnTrue()
+        {
+            // Arrange
+            Category category = new()
+            {
+                Name = "test",
+                MaxRatio = 1.0,
+                MinSeedTime = 1,
+                MaxSeedTime = -1
+            };
+            const double ratio = 1.5;
+            TimeSpan seedingTime = TimeSpan.FromHours(2);
+            
+            TestDownloadService sut = _fixture.CreateSut();
+
+            // Act
+            var result = sut.ShouldCleanDownload(ratio, seedingTime, category);
+
+            // Assert
+            result.ShouldSatisfyAllConditions(
+                () => result.ShouldClean.ShouldBeTrue(),
+                () => result.Reason.ShouldBe(CleanReason.MaxRatioReached)
+            );
+        }
+
+        [Fact]
+        public void WhenRatioReachedAndMinSeedTimeNotReached_ShouldReturnFalse()
+        {
+            // Arrange
+            Category category = new()
+            {
+                Name = "test",
+                MaxRatio = 1.0,
+                MinSeedTime = 3,
+                MaxSeedTime = -1
+            };
+            const double ratio = 1.5;
+            TimeSpan seedingTime = TimeSpan.FromHours(2);
+            
+            TestDownloadService sut = _fixture.CreateSut();
+
+            // Act
+            var result = sut.ShouldCleanDownload(ratio, seedingTime, category);
+
+            // Assert
+            result.ShouldSatisfyAllConditions(
+                () => result.ShouldClean.ShouldBeFalse(),
+                () => result.Reason.ShouldBe(CleanReason.None)
+            );
+        }
+
+        [Fact]
+        public void WhenMaxSeedTimeReached_ShouldReturnTrue()
+        {
+            // Arrange
+            Category category = new()
+            {
+                Name = "test",
+                MaxRatio = -1,
+                MinSeedTime = 0,
+                MaxSeedTime = 1
+            };
+            const double ratio = 0.5;
+            TimeSpan seedingTime = TimeSpan.FromHours(2);
+            
+            TestDownloadService sut = _fixture.CreateSut();
+
+            // Act
+            SeedingCheckResult result = sut.ShouldCleanDownload(ratio, seedingTime, category);
+
+            // Assert
+            result.ShouldSatisfyAllConditions(
+                () => result.ShouldClean.ShouldBeTrue(),
+                () => result.Reason.ShouldBe(CleanReason.MaxSeedTimeReached)
+            );
+        }
+
+        [Fact]
+        public void WhenNeitherConditionMet_ShouldReturnFalse()
+        {
+            // Arrange
+            Category category = new()
+            {
+                Name = "test",
+                MaxRatio = 2.0,
+                MinSeedTime = 0,
+                MaxSeedTime = 3
+            };
+            const double ratio = 1.0;
+            TimeSpan seedingTime = TimeSpan.FromHours(1);
+            
+            TestDownloadService sut = _fixture.CreateSut();
+
+            // Act
+            var result = sut.ShouldCleanDownload(ratio, seedingTime, category);
+
+            // Assert
+            result.ShouldSatisfyAllConditions(
+                () => result.ShouldClean.ShouldBeFalse(),
+                () => result.Reason.ShouldBe(CleanReason.None)
+            );
+        }
+    }
+}

code/Infrastructure.Tests/Verticals/DownloadClient/TestDownloadService.cs

@@ -0,0 +1,45 @@
+using System.Collections.Concurrent;
+using System.Text.RegularExpressions;
+using Common.Configuration.ContentBlocker;
+using Common.Configuration.DownloadCleaner;
+using Common.Configuration.QueueCleaner;
+using Infrastructure.Verticals.ContentBlocker;
+using Infrastructure.Verticals.DownloadClient;
+using Infrastructure.Verticals.ItemStriker;
+using Infrastructure.Verticals.Notifications;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Infrastructure.Tests.Verticals.DownloadClient;
+
+public class TestDownloadService : DownloadService
+{
+    public TestDownloadService(
+        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)
+    {
+    }
+
+    public override void Dispose() { }
+    public override Task LoginAsync() => Task.CompletedTask;
+    public override Task<StalledResult> ShouldRemoveFromArrQueueAsync(string hash) => Task.FromResult(new StalledResult());
+    public override Task<BlockFilesResult> BlockUnwantedFilesAsync(string hash, BlocklistType blocklistType, 
+        ConcurrentBag<string> patterns, ConcurrentBag<Regex> regexes) => Task.FromResult(new BlockFilesResult());
+    public override Task DeleteDownload(string hash) => Task.CompletedTask;
+    public override Task<List<object>?> GetAllDownloadsToBeCleaned(List<Category> categories) => Task.FromResult<List<object>?>(null);
+    public override Task CleanDownloads(List<object> downloads, List<Category> categoriesToClean, HashSet<string> excludedHashes) => Task.CompletedTask;
+
+    // Expose protected methods for testing
+    public new void ResetStrikesOnProgress(string hash, long downloaded) => base.ResetStrikesOnProgress(hash, downloaded);
+    public new Task<bool> StrikeAndCheckLimit(string hash, string itemName) => base.StrikeAndCheckLimit(hash, itemName);
+    public new SeedingCheckResult ShouldCleanDownload(double ratio, TimeSpan seedingTime, Category category) => base.ShouldCleanDownload(ratio, seedingTime, category);
+}

code/Infrastructure/Helpers/CacheKeys.cs

@@ -0,0 +1,14 @@
+using Domain.Enums;
+
+namespace Infrastructure.Helpers;
+
+public static class CacheKeys
+{
+    public static string Strike(StrikeType strikeType, string hash) => $"{strikeType.ToString()}_{hash}";
+
+    public static string BlocklistType(InstanceType instanceType) => $"{instanceType.ToString()}_type";
+    public static string BlocklistPatterns(InstanceType instanceType) => $"{instanceType.ToString()}_patterns";
+    public static string BlocklistRegexes(InstanceType instanceType) => $"{instanceType.ToString()}_regexes";
+    
+    public static string Item(string hash) => $"item_{hash}";
+}

code/Infrastructure/Infrastructure.csproj

@@ -12,11 +12,15 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="FLM.Transmission" Version="1.0.0" />
-      <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
-      <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
-      <PackageReference Include="QBittorrent.Client" Version="1.9.24285.1" />
+      <PackageReference Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
+      <PackageReference Include="FLM.QBittorrent" Version="1.0.0" />
+      <PackageReference Include="FLM.Transmission" Version="1.0.2" />
+      <PackageReference Include="Mapster" Version="7.4.0" />
+      <PackageReference Include="MassTransit" Version="8.3.6" />
+      <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.2" />
+      <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.2" />
       <PackageReference Include="Quartz" Version="3.13.1" />
+      <PackageReference Include="Scrutor" Version="6.0.1" />
     </ItemGroup>
 
 </Project>

code/Infrastructure/Interceptors/DryRunInterceptor.cs

@@ -0,0 +1,49 @@
+using System.Reflection;
+using Castle.DynamicProxy;
+using Common.Attributes;
+using Common.Configuration.General;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Infrastructure.Interceptors;
+
+public class DryRunAsyncInterceptor : AsyncInterceptorBase
+{
+    private readonly ILogger<DryRunAsyncInterceptor> _logger;
+    private readonly DryRunConfig _config;
+    
+    public DryRunAsyncInterceptor(ILogger<DryRunAsyncInterceptor> logger, IOptions<DryRunConfig> config)
+    {
+        _logger = logger;
+        _config = config.Value;
+    }
+    
+    protected override async Task InterceptAsync(IInvocation invocation, IInvocationProceedInfo proceedInfo, Func<IInvocation, IInvocationProceedInfo, Task> proceed)
+    {
+        MethodInfo? method = invocation.MethodInvocationTarget ?? invocation.Method;
+        if (IsDryRun(method))
+        {
+            _logger.LogInformation("[DRY RUN] skipping method: {name}", method.Name);
+            return;
+        }
+
+        await proceed(invocation, proceedInfo);
+    }
+
+    protected override async Task<TResult> InterceptAsync<TResult>(IInvocation invocation, IInvocationProceedInfo proceedInfo, Func<IInvocation, IInvocationProceedInfo, Task<TResult>> proceed)
+    {
+        MethodInfo? method = invocation.MethodInvocationTarget ?? invocation.Method;
+        if (IsDryRun(method))
+        {
+            _logger.LogInformation("[DRY RUN] skipping method: {name}", method.Name);
+            return default!;
+        }
+
+        return await proceed(invocation, proceedInfo);
+    }
+
+    private bool IsDryRun(MethodInfo method)
+    {
+        return method.GetCustomAttributes(typeof(DryRunSafeguardAttribute), true).Any() && _config.IsDryRun;
+    }
+}

code/Infrastructure/Interceptors/IDryRunService.cs

@@ -0,0 +1,5 @@
+namespace Infrastructure.Interceptors;
+
+public interface IDryRunService : IInterceptedService
+{
+}

code/Infrastructure/Interceptors/IInterceptedService.cs

@@ -0,0 +1,6 @@
+namespace Infrastructure.Interceptors;
+
+public interface IInterceptedService
+{
+    public object Proxy { get; set; }
+}

code/Infrastructure/Interceptors/InterceptedService.cs

@@ -0,0 +1,21 @@
+namespace Infrastructure.Interceptors;
+
+public class InterceptedService : IInterceptedService
+{
+    private object? _proxy;
+
+    public object Proxy
+    {
+        get
+        {
+            if (_proxy is null)
+            {
+                throw new Exception("Proxy is not set");
+            }
+
+            return _proxy;
+        }
+        
+        set => _proxy = value;
+    }
+}

code/Infrastructure/Verticals/Arr/ArrClient.cs

@@ -1,9 +1,13 @@
-using Common.Configuration.Arr;
+using Common.Attributes;
+using Common.Configuration.Arr;
 using Common.Configuration.Logging;
 using Common.Configuration.QueueCleaner;
+using Common.Helpers;
 using Domain.Enums;
 using Domain.Models.Arr;
 using Domain.Models.Arr.Queue;
+using Infrastructure.Interceptors;
+using Infrastructure.Verticals.Arr.Interfaces;
 using Infrastructure.Verticals.ItemStriker;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -11,25 +15,31 @@ using Newtonsoft.Json;
 
 namespace Infrastructure.Verticals.Arr;
 
-public abstract class ArrClient
+public abstract class ArrClient : InterceptedService, IArrClient, IDryRunService
 {
     protected readonly ILogger<ArrClient> _logger;
     protected readonly HttpClient _httpClient;
     protected readonly LoggingConfig _loggingConfig;
     protected readonly QueueCleanerConfig _queueCleanerConfig;
-    protected readonly Striker _striker;
+    protected readonly IStriker _striker;
+    
+    /// <summary>
+    /// Constructor to be used by interceptors.
+    /// </summary>
+    protected ArrClient()
+    {
+    }
     
     protected ArrClient(
         ILogger<ArrClient> logger,
         IHttpClientFactory httpClientFactory,
         IOptions<LoggingConfig> loggingConfig,
         IOptions<QueueCleanerConfig> queueCleanerConfig,
-        Striker striker
+        IStriker striker
     )
     {
         _logger = logger;
-        _striker = striker;
-        _httpClient = httpClientFactory.CreateClient();
+        _httpClient = httpClientFactory.CreateClient(Constants.HttpClientWithRetryName);
         _loggingConfig = loggingConfig.Value;
         _queueCleanerConfig = queueCleanerConfig.Value;
         _striker = striker;
@@ -65,18 +75,37 @@ public abstract class ArrClient
         return queueResponse;
     }
 
-    public virtual bool ShouldRemoveFromQueue(QueueRecord record)
+    public virtual async Task<bool> ShouldRemoveFromQueue(InstanceType instanceType, QueueRecord record, bool isPrivateDownload)
     {
+        if (_queueCleanerConfig.ImportFailedIgnorePrivate && isPrivateDownload)
+        {
+            // ignore private trackers
+            _logger.LogDebug("skip failed import check | download is private | {name}", record.Title);
+            return false;
+        }
+        
         bool hasWarn() => record.TrackedDownloadStatus
             .Equals("warning", StringComparison.InvariantCultureIgnoreCase);
         bool isImportBlocked() => record.TrackedDownloadState
             .Equals("importBlocked", StringComparison.InvariantCultureIgnoreCase);
         bool isImportPending() => record.TrackedDownloadState
             .Equals("importPending", StringComparison.InvariantCultureIgnoreCase);
-
-        if (hasWarn() && (isImportBlocked() || isImportPending()))
+        bool isImportFailed() => record.TrackedDownloadState
+            .Equals("importFailed", StringComparison.InvariantCultureIgnoreCase);
+        bool isFailedLidarr() => instanceType is InstanceType.Lidarr &&
+                                 (record.Status.Equals("failed", StringComparison.InvariantCultureIgnoreCase) ||
+                                  record.Status.Equals("completed", StringComparison.InvariantCultureIgnoreCase)) &&
+                                 hasWarn();
+        
+        if (hasWarn() && (isImportBlocked() || isImportPending() || isImportFailed()) || isFailedLidarr())
         {
-            return _striker.StrikeAndCheckLimit(
+            if (HasIgnoredPatterns(record))
+            {
+                _logger.LogDebug("skip failed import check | contains ignored pattern | {name}", record.Title);
+                return false;
+            }
+            
+            return await _striker.StrikeAndCheckLimit(
                 record.DownloadId,
                 record.Title,
                 _queueCleanerConfig.ImportFailedMaxStrikes,
@@ -87,29 +116,33 @@ public abstract class ArrClient
         return false;
     }
     
-    public virtual async Task DeleteQueueItemAsync(ArrInstance arrInstance, QueueRecord queueRecord)
+    public virtual async Task DeleteQueueItemAsync(ArrInstance arrInstance, QueueRecord record, bool removeFromClient)
     {
-        Uri uri = new(arrInstance.Url, $"/api/v3/queue/{queueRecord.Id}?removeFromClient=true&blocklist=true&skipRedownload=true&changeCategory=false");
-        
-        using HttpRequestMessage request = new(HttpMethod.Delete, uri);
-        SetApiKey(request, arrInstance.ApiKey);
-
-        using HttpResponseMessage response = await _httpClient.SendAsync(request);
+        Uri uri = new(arrInstance.Url, GetQueueDeleteUrlPath(record.Id, removeFromClient));
 
         try
         {
-            response.EnsureSuccessStatusCode();
+            using HttpRequestMessage request = new(HttpMethod.Delete, uri);
+            SetApiKey(request, arrInstance.ApiKey);
+
+            using var _ = await ((ArrClient)Proxy).SendRequestAsync(request);
             
-            _logger.LogInformation("queue item deleted | {url} | {title}", arrInstance.Url, queueRecord.Title);
+            _logger.LogInformation(
+                removeFromClient
+                    ? "queue item deleted | {url} | {title}"
+                    : "queue item removed from arr | {url} | {title}",
+                arrInstance.Url,
+                record.Title
+            );
         }
         catch
         {
-            _logger.LogError("queue delete failed | {uri} | {title}", uri, queueRecord.Title);
+            _logger.LogError("queue delete failed | {uri} | {title}", uri, record.Title);
             throw;
         }
     }
 
-    public abstract Task RefreshItemsAsync(ArrInstance arrInstance, ArrConfig config, HashSet<SearchItem>? items);
+    public abstract Task RefreshItemsAsync(ArrInstance arrInstance, HashSet<SearchItem>? items);
 
     public virtual bool IsRecordValid(QueueRecord record)
     {
@@ -119,19 +152,53 @@ public abstract class ArrClient
             return false;
         }
 
-        if (record.DownloadId.Equals(record.Title, StringComparison.InvariantCultureIgnoreCase))
-        {
-            _logger.LogDebug("skip | item is not ready yet | {title}", record.Title);
-            return false;
-        }
-
         return true;
     }
     
     protected abstract string GetQueueUrlPath(int page);
+
+    protected abstract string GetQueueDeleteUrlPath(long recordId, bool removeFromClient);
     
     protected virtual void SetApiKey(HttpRequestMessage request, string apiKey)
     {
         request.Headers.Add("x-api-key", apiKey);
     }
+
+    [DryRunSafeguard]
+    protected virtual async Task<HttpResponseMessage> SendRequestAsync(HttpRequestMessage request)
+    {
+        HttpResponseMessage response = await _httpClient.SendAsync(request);
+        
+        response.EnsureSuccessStatusCode();
+        
+        return response;
+    }
+    
+    private bool HasIgnoredPatterns(QueueRecord record)
+    {
+        if (_queueCleanerConfig.ImportFailedIgnorePatterns?.Count is null or 0)
+        {
+            // no patterns are configured
+            return false;
+        }
+            
+        if (record.StatusMessages?.Count is null or 0)
+        {
+            // no status message found
+            return false;
+        }
+        
+        HashSet<string> messages = record.StatusMessages
+            .SelectMany(x => x.Messages ?? Enumerable.Empty<string>())
+            .ToHashSet();
+        record.StatusMessages.Select(x => x.Title)
+            .ToList()
+            .ForEach(x => messages.Add(x));
+        
+        return messages.Any(
+            m => _queueCleanerConfig.ImportFailedIgnorePatterns.Any(
+                p => !string.IsNullOrWhiteSpace(p.Trim()) && m.Contains(p, StringComparison.InvariantCultureIgnoreCase)
+            )
+        );
+    }
 }

code/Infrastructure/Verticals/Arr/ArrQueueIterator.cs

@@ -1,6 +1,7 @@
 using Common.Configuration;
 using Common.Configuration.Arr;
 using Domain.Models.Arr.Queue;
+using Infrastructure.Verticals.Arr.Interfaces;
 using Microsoft.Extensions.Logging;
 
 namespace Infrastructure.Verticals.Arr;
@@ -14,7 +15,7 @@ public sealed class ArrQueueIterator
         _logger = logger;
     }
     
-    public async Task Iterate(ArrClient arrClient, ArrInstance arrInstance, Func<IReadOnlyList<QueueRecord>, Task> action)
+    public async Task Iterate(IArrClient arrClient, ArrInstance arrInstance, Func<IReadOnlyList<QueueRecord>, Task> action)
     {
         const ushort maxPage = 100;
         ushort page = 1;

code/Infrastructure/Verticals/Arr/Interfaces/IArrClient.cs

@@ -0,0 +1,19 @@
+using Common.Configuration.Arr;
+using Domain.Enums;
+using Domain.Models.Arr;
+using Domain.Models.Arr.Queue;
+
+namespace Infrastructure.Verticals.Arr.Interfaces;
+
+public interface IArrClient
+{
+    Task<QueueListResponse> GetQueueItemsAsync(ArrInstance arrInstance, int page);
+
+    Task<bool> ShouldRemoveFromQueue(InstanceType instanceType, QueueRecord record, bool isPrivateDownload);
+
+    Task DeleteQueueItemAsync(ArrInstance arrInstance, QueueRecord record, bool removeFromClient);
+    
+    Task RefreshItemsAsync(ArrInstance arrInstance, HashSet<SearchItem>? items);
+    
+    bool IsRecordValid(QueueRecord record);
+}

code/Infrastructure/Verticals/Arr/Interfaces/ILidarrClient.cs

@@ -0,0 +1,5 @@
+namespace Infrastructure.Verticals.Arr.Interfaces;
+
+public interface ILidarrClient : IArrClient
+{
+}

code/Infrastructure/Verticals/Arr/Interfaces/IRadarrClient.cs

@@ -0,0 +1,5 @@
+namespace Infrastructure.Verticals.Arr.Interfaces;
+
+public interface IRadarrClient : IArrClient
+{
+}

code/Infrastructure/Verticals/Arr/Interfaces/ISonarrClient.cs

@@ -0,0 +1,5 @@
+namespace Infrastructure.Verticals.Arr.Interfaces;
+
+public interface ISonarrClient : IArrClient
+{
+}

code/Infrastructure/Verticals/Arr/LidarrClient.cs

@@ -0,0 +1,154 @@
+using System.Text;
+using Common.Configuration.Arr;
+using Common.Configuration.Logging;
+using Common.Configuration.QueueCleaner;
+using Domain.Models.Arr;
+using Domain.Models.Arr.Queue;
+using Domain.Models.Lidarr;
+using Infrastructure.Verticals.Arr.Interfaces;
+using Infrastructure.Verticals.ItemStriker;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
+
+namespace Infrastructure.Verticals.Arr;
+
+public class LidarrClient : ArrClient, ILidarrClient
+{
+    /// <inheritdoc/>
+    public LidarrClient()
+    {
+    }
+    
+    public LidarrClient(
+        ILogger<LidarrClient> logger,
+        IHttpClientFactory httpClientFactory,
+        IOptions<LoggingConfig> loggingConfig,
+        IOptions<QueueCleanerConfig> queueCleanerConfig,
+        IStriker striker
+    ) : base(logger, httpClientFactory, loggingConfig, queueCleanerConfig, striker)
+    {
+    }
+
+    protected override string GetQueueUrlPath(int page)
+    {
+        return $"/api/v1/queue?page={page}&pageSize=200&includeUnknownArtistItems=true&includeArtist=true&includeAlbum=true";
+    }
+
+    protected override string GetQueueDeleteUrlPath(long recordId, bool removeFromClient)
+    {
+        string path = $"/api/v1/queue/{recordId}?blocklist=true&skipRedownload=true&changeCategory=false";
+
+        path += removeFromClient ? "&removeFromClient=true" : "&removeFromClient=false";
+
+        return path;
+    }
+
+    public override async Task RefreshItemsAsync(ArrInstance arrInstance, HashSet<SearchItem>? items)
+    {
+        if (items?.Count is null or 0) return;
+
+        Uri uri = new(arrInstance.Url, "/api/v1/command");
+
+        foreach (var command in GetSearchCommands(items))
+        {
+            using HttpRequestMessage request = new(HttpMethod.Post, uri);
+            request.Content = new StringContent(
+                JsonConvert.SerializeObject(command, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }),
+                Encoding.UTF8,
+                "application/json"
+            );
+            SetApiKey(request, arrInstance.ApiKey);
+
+            string? logContext = await ComputeCommandLogContextAsync(arrInstance, command);
+
+            try
+            {
+                using var _ = await ((LidarrClient)Proxy).SendRequestAsync(request);
+                
+                _logger.LogInformation("{log}", GetSearchLog(arrInstance.Url, command, true, logContext));
+            }
+            catch
+            {
+                _logger.LogError("{log}", GetSearchLog(arrInstance.Url, command, false, logContext));
+                throw;
+            }
+        }
+    }
+
+    public override bool IsRecordValid(QueueRecord record)
+    {
+        if (record.ArtistId is 0 || record.AlbumId is 0)
+        {
+            _logger.LogDebug("skip | artist id and/or album id missing | {title}", record.Title);
+            return false;
+        }
+
+        return base.IsRecordValid(record);
+    }
+
+    private static string GetSearchLog(
+        Uri instanceUrl,
+        LidarrCommand command,
+        bool success,
+        string? logContext
+    )
+    {
+        string status = success ? "triggered" : "failed";
+
+        return $"album search {status} | {instanceUrl} | {logContext ?? $"albums: {string.Join(',', command.AlbumIds)}"}";
+    }
+
+    private async Task<string?> ComputeCommandLogContextAsync(ArrInstance arrInstance, LidarrCommand command)
+    {
+        try
+        {
+            if (!_loggingConfig.Enhanced) return null;
+
+            StringBuilder log = new();
+
+            var albums = await GetAlbumsAsync(arrInstance, command.AlbumIds);
+
+            if (albums?.Count is null or 0) return null;
+
+            var groups = albums
+                .GroupBy(x => x.Artist.Id)
+                .ToList();
+
+            foreach (var group in groups)
+            {
+                var first = group.First();
+
+                log.Append($"[{first.Artist.ArtistName} albums {string.Join(',', group.Select(x => x.Title).ToList())}]");
+            }
+
+            return log.ToString();
+        }
+        catch (Exception exception)
+        {
+            _logger.LogDebug(exception, "failed to compute log context");
+        }
+
+        return null;
+    }
+
+    private async Task<List<Album>?> GetAlbumsAsync(ArrInstance arrInstance, List<long> albumIds)
+    {
+        Uri uri = new(arrInstance.Url, $"api/v1/album?{string.Join('&', albumIds.Select(x => $"albumIds={x}"))}");
+        using HttpRequestMessage request = new(HttpMethod.Get, uri);
+        SetApiKey(request, arrInstance.ApiKey);
+
+        using var response = await _httpClient.SendAsync(request);
+        response.EnsureSuccessStatusCode();
+
+        string responseBody = await response.Content.ReadAsStringAsync();
+        return JsonConvert.DeserializeObject<List<Album>>(responseBody);
+    }
+
+    private List<LidarrCommand> GetSearchCommands(HashSet<SearchItem> items)
+    {
+        const string albumSearch = "AlbumSearch";
+
+        return [new LidarrCommand { Name = albumSearch, AlbumIds = items.Select(i => i.Id).ToList() }];
+    }
+}

code/Infrastructure/Verticals/Arr/RadarrClient.cs

@@ -5,22 +5,27 @@ using Common.Configuration.QueueCleaner;
 using Domain.Models.Arr;
 using Domain.Models.Arr.Queue;
 using Domain.Models.Radarr;
+using Infrastructure.Verticals.Arr.Interfaces;
 using Infrastructure.Verticals.ItemStriker;
-using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 
 namespace Infrastructure.Verticals.Arr;
 
-public sealed class RadarrClient : ArrClient
+public class RadarrClient : ArrClient, IRadarrClient
 {
+    /// <inheritdoc/>
+    public RadarrClient()
+    {
+    }
+    
     public RadarrClient(
         ILogger<ArrClient> logger,
         IHttpClientFactory httpClientFactory,
         IOptions<LoggingConfig> loggingConfig,
         IOptions<QueueCleanerConfig> queueCleanerConfig,
-        Striker striker
+        IStriker striker
     ) : base(logger, httpClientFactory, loggingConfig, queueCleanerConfig, striker)
     {
     }
@@ -30,7 +35,16 @@ public sealed class RadarrClient : ArrClient
         return $"/api/v3/queue?page={page}&pageSize=200&includeUnknownMovieItems=true&includeMovie=true";
     }
 
-    public override async Task RefreshItemsAsync(ArrInstance arrInstance, ArrConfig config, HashSet<SearchItem>? items)
+    protected override string GetQueueDeleteUrlPath(long recordId, bool removeFromClient)
+    {
+        string path = $"/api/v3/queue/{recordId}?blocklist=true&skipRedownload=true&changeCategory=false";
+        
+        path += removeFromClient ? "&removeFromClient=true" : "&removeFromClient=false";
+
+        return path;
+    }
+
+    public override async Task RefreshItemsAsync(ArrInstance arrInstance, HashSet<SearchItem>? items)
     {
         if (items?.Count is null or 0)
         {
@@ -54,12 +68,11 @@ public sealed class RadarrClient : ArrClient
         );
         SetApiKey(request, arrInstance.ApiKey);
 
-        using HttpResponseMessage response = await _httpClient.SendAsync(request);
         string? logContext = await ComputeCommandLogContextAsync(arrInstance, command);
 
         try
         {
-            response.EnsureSuccessStatusCode();
+            using var _ = await ((RadarrClient)Proxy).SendRequestAsync(request);
             
             _logger.LogInformation("{log}", GetSearchLog(arrInstance.Url, command, true, logContext));
         }
@@ -74,7 +87,7 @@ public sealed class RadarrClient : ArrClient
     {
         if (record.MovieId is 0)
         {
-            _logger.LogDebug("skip | item information missing | {title}", record.Title);
+            _logger.LogDebug("skip | movie id missing | {title}", record.Title);
             return false;
         }
         

code/Infrastructure/Verticals/Arr/SonarrClient.cs

@@ -5,32 +5,47 @@ using Common.Configuration.QueueCleaner;
 using Domain.Models.Arr;
 using Domain.Models.Arr.Queue;
 using Domain.Models.Sonarr;
+using Infrastructure.Verticals.Arr.Interfaces;
 using Infrastructure.Verticals.ItemStriker;
-using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
+using Series = Domain.Models.Sonarr.Series;
 
 namespace Infrastructure.Verticals.Arr;
 
-public sealed class SonarrClient : ArrClient
+public class SonarrClient : ArrClient, ISonarrClient
 {
+    /// <inheritdoc/>
+    public SonarrClient()
+    {
+    }
+    
     public SonarrClient(
         ILogger<SonarrClient> logger,
         IHttpClientFactory httpClientFactory,
         IOptions<LoggingConfig> loggingConfig,
         IOptions<QueueCleanerConfig> queueCleanerConfig,
-        Striker striker
+        IStriker striker
     ) : base(logger, httpClientFactory, loggingConfig, queueCleanerConfig, striker)
     {
     }
     
     protected override string GetQueueUrlPath(int page)
     {
-        return $"/api/v3/queue?page={page}&pageSize=200&includeUnknownSeriesItems=true&includeSeries=true";
+        return $"/api/v3/queue?page={page}&pageSize=200&includeUnknownSeriesItems=true&includeSeries=true&includeEpisode=true";
+    }
+    
+    protected override string GetQueueDeleteUrlPath(long recordId, bool removeFromClient)
+    {
+        string path = $"/api/v3/queue/{recordId}?blocklist=true&skipRedownload=true&changeCategory=false";
+
+        path += removeFromClient ? "&removeFromClient=true" : "&removeFromClient=false";
+
+        return path;
     }
 
-    public override async Task RefreshItemsAsync(ArrInstance arrInstance, ArrConfig config, HashSet<SearchItem>? items)
+    public override async Task RefreshItemsAsync(ArrInstance arrInstance, HashSet<SearchItem>? items)
     {
         if (items?.Count is null or 0)
         {
@@ -49,13 +64,12 @@ public sealed class SonarrClient : ArrClient
             );
             SetApiKey(request, arrInstance.ApiKey);
 
-            using HttpResponseMessage response = await _httpClient.SendAsync(request);
             string? logContext = await ComputeCommandLogContextAsync(arrInstance, command, command.SearchType);
 
             try
             {
-                response.EnsureSuccessStatusCode();
-            
+                using var _ = await ((SonarrClient)Proxy).SendRequestAsync(request);
+
                 _logger.LogInformation("{log}", GetSearchLog(command.SearchType, arrInstance.Url, command, true, logContext));
             }
             catch
@@ -70,7 +84,7 @@ public sealed class SonarrClient : ArrClient
     {
         if (record.EpisodeId is 0 || record.SeriesId is 0)
         {
-            _logger.LogDebug("skip | item information missing | {title}", record.Title);
+            _logger.LogDebug("skip | episode id and/or series id missing | {title}", record.Title);
             return false;
         }
 

code/Infrastructure/Verticals/ContentBlocker/BlocklistProvider.cs

@@ -1,8 +1,12 @@
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.Text.RegularExpressions;
+using Common.Configuration.Arr;
 using Common.Configuration.ContentBlocker;
+using Common.Helpers;
 using Domain.Enums;
+using Infrastructure.Helpers;
+using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
@@ -11,78 +15,94 @@ namespace Infrastructure.Verticals.ContentBlocker;
 public sealed class BlocklistProvider
 {
     private readonly ILogger<BlocklistProvider> _logger;
-    private readonly ContentBlockerConfig _config;
+    private readonly SonarrConfig _sonarrConfig;
+    private readonly RadarrConfig _radarrConfig;
+    private readonly LidarrConfig _lidarrConfig;
     private readonly HttpClient _httpClient;
-    
-    public BlocklistType BlocklistType { get; }
-
-    public ConcurrentBag<string> Patterns { get; } = [];
-
-    public ConcurrentBag<Regex> Regexes { get; } = [];
+    private readonly IMemoryCache _cache;
+    private bool _initialized;
 
     public BlocklistProvider(
         ILogger<BlocklistProvider> logger,
-        IOptions<ContentBlockerConfig> config,
-        IHttpClientFactory httpClientFactory)
+        IOptions<SonarrConfig> sonarrConfig,
+        IOptions<RadarrConfig> radarrConfig,
+        IOptions<LidarrConfig> lidarrConfig,
+        IMemoryCache cache,
+        IHttpClientFactory httpClientFactory
+    )
     {
         _logger = logger;
-        _config = config.Value;
-        _httpClient = httpClientFactory.CreateClient();
-        
-        _config.Validate();
-        
-        if (_config.Blacklist?.Enabled is true)
-        {
-            BlocklistType = BlocklistType.Blacklist;
-        }
-
-        if (_config.Whitelist?.Enabled is true)
-        {
-            BlocklistType = BlocklistType.Whitelist;
-        }
+        _sonarrConfig = sonarrConfig.Value;
+        _radarrConfig = radarrConfig.Value;
+        _lidarrConfig = lidarrConfig.Value;
+        _cache = cache;
+        _httpClient = httpClientFactory.CreateClient(Constants.HttpClientWithRetryName);
     }
 
-    public async Task LoadBlocklistAsync()
+    public async Task LoadBlocklistsAsync()
     {
-        if (Patterns.Count > 0 || Regexes.Count > 0)
+        if (_initialized)
         {
-            _logger.LogDebug("blocklist already loaded");
+            _logger.LogDebug("blocklists already loaded");
             return;
         }
         
         try
         {
-            await LoadPatternsAndRegexesAsync();
+            await LoadPatternsAndRegexesAsync(_sonarrConfig.Block.Type, _sonarrConfig.Block.Path, InstanceType.Sonarr);
+            await LoadPatternsAndRegexesAsync(_radarrConfig.Block.Type, _radarrConfig.Block.Path, InstanceType.Radarr);
+            await LoadPatternsAndRegexesAsync(_lidarrConfig.Block.Type, _lidarrConfig.Block.Path, InstanceType.Lidarr);
+            
+            _initialized = true;
         }
         catch
         {
-            _logger.LogError("failed to load {type}", BlocklistType.ToString());
+            _logger.LogError("failed to load blocklists");
             throw;
         }
     }
 
-    private async Task LoadPatternsAndRegexesAsync()
+    public BlocklistType GetBlocklistType(InstanceType instanceType)
     {
-        string[] patterns;
+        _cache.TryGetValue(CacheKeys.BlocklistType(instanceType), out BlocklistType? blocklistType);
+
+        return blocklistType ?? BlocklistType.Blacklist;
+    }
+    
+    public ConcurrentBag<string> GetPatterns(InstanceType instanceType)
+    {
+        _cache.TryGetValue(CacheKeys.BlocklistPatterns(instanceType), out ConcurrentBag<string>? patterns);
+
+        return patterns ?? [];
+    }
+
+    public ConcurrentBag<Regex> GetRegexes(InstanceType instanceType)
+    {
+        _cache.TryGetValue(CacheKeys.BlocklistRegexes(instanceType), out ConcurrentBag<Regex>? regexes);
         
-        if (BlocklistType is BlocklistType.Blacklist)
+        return regexes ?? [];
+    }
+
+    private async Task LoadPatternsAndRegexesAsync(BlocklistType blocklistType, string? blocklistPath, InstanceType instanceType)
+    {
+        if (string.IsNullOrEmpty(blocklistPath))
         {
-            patterns = await ReadContentAsync(_config.Blacklist.Path);
-        }
-        else
-        {
-            patterns = await ReadContentAsync(_config.Whitelist.Path);
+            return;
         }
         
+        string[] filePatterns = await ReadContentAsync(blocklistPath);
+        
         long startTime = Stopwatch.GetTimestamp();
         ParallelOptions options = new() { MaxDegreeOfParallelism = 5 };
         const string regexId = "regex:";
+        ConcurrentBag<string> patterns = [];
+        ConcurrentBag<Regex> regexes = [];
         
-        Parallel.ForEach(patterns, options, pattern =>
+        Parallel.ForEach(filePatterns, options, pattern =>
         {
             if (!pattern.StartsWith(regexId))
             {
-                Patterns.Add(pattern);
+                patterns.Add(pattern);
                 return;
             }
             
@@ -91,7 +111,7 @@ public sealed class BlocklistProvider
             try
             {
                 Regex regex = new(pattern, RegexOptions.Compiled);
-                Regexes.Add(regex);
+                regexes.Add(regex);
             }
             catch (ArgumentException)
             {
@@ -100,10 +120,14 @@ public sealed class BlocklistProvider
         });
 
         TimeSpan elapsed = Stopwatch.GetElapsedTime(startTime);
+
+        _cache.Set(CacheKeys.BlocklistType(instanceType), blocklistType);
+        _cache.Set(CacheKeys.BlocklistPatterns(instanceType), patterns);
+        _cache.Set(CacheKeys.BlocklistRegexes(instanceType), regexes);
         
-        _logger.LogDebug("loaded {count} patterns", Patterns.Count);
-        _logger.LogDebug("loaded {count} regexes", Regexes.Count);
-        _logger.LogDebug("blocklist loaded in {elapsed} ms", elapsed.TotalMilliseconds);
+        _logger.LogDebug("loaded {count} patterns", patterns.Count);
+        _logger.LogDebug("loaded {count} regexes", regexes.Count);
+        _logger.LogDebug("blocklist loaded in {elapsed} ms | {path}", elapsed.TotalMilliseconds, blocklistPath);
     }
     
     private async Task<string[]> ReadContentAsync(string path)

code/Infrastructure/Verticals/ContentBlocker/ContentBlocker.cs

@@ -1,47 +1,100 @@
-using Common.Configuration;
+using System.Collections.Concurrent;
+using System.Text.RegularExpressions;
 using Common.Configuration.Arr;
+using Common.Configuration.ContentBlocker;
+using Common.Configuration.DownloadClient;
 using Domain.Enums;
+using Domain.Models.Arr;
 using Domain.Models.Arr.Queue;
 using Infrastructure.Verticals.Arr;
+using Infrastructure.Verticals.Arr.Interfaces;
+using Infrastructure.Verticals.Context;
 using Infrastructure.Verticals.DownloadClient;
 using Infrastructure.Verticals.Jobs;
+using Infrastructure.Verticals.Notifications;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using Serilog.Context;
 
 namespace Infrastructure.Verticals.ContentBlocker;
 
 public sealed class ContentBlocker : GenericHandler
 {
+    private readonly ContentBlockerConfig _config;
     private readonly BlocklistProvider _blocklistProvider;
     
     public ContentBlocker(
         ILogger<ContentBlocker> logger,
+        IOptions<ContentBlockerConfig> config,
+        IOptions<DownloadClientConfig> downloadClientConfig,
         IOptions<SonarrConfig> sonarrConfig,
         IOptions<RadarrConfig> radarrConfig,
+        IOptions<LidarrConfig> lidarrConfig,
         SonarrClient sonarrClient,
         RadarrClient radarrClient,
+        LidarrClient lidarrClient,
         ArrQueueIterator arrArrQueueIterator,
         BlocklistProvider blocklistProvider,
-        DownloadServiceFactory downloadServiceFactory
-    ) : base(logger, sonarrConfig.Value, radarrConfig.Value, sonarrClient, radarrClient, arrArrQueueIterator, downloadServiceFactory)
+        DownloadServiceFactory downloadServiceFactory,
+        NotificationPublisher notifier
+    ) : base(
+        logger, downloadClientConfig,
+        sonarrConfig, radarrConfig, lidarrConfig,
+        sonarrClient, radarrClient, lidarrClient,
+        arrArrQueueIterator, downloadServiceFactory,
+        notifier
+    )
     {
+        _config = config.Value;
         _blocklistProvider = blocklistProvider;
     }
 
     public override async Task ExecuteAsync()
     {
-        await _blocklistProvider.LoadBlocklistAsync();
+        if (_downloadClientConfig.DownloadClient is Common.Enums.DownloadClient.None)
+        {
+            _logger.LogWarning("download client is set to none");
+            return;
+        }
+        
+        bool blocklistIsConfigured = _sonarrConfig.Enabled && !string.IsNullOrEmpty(_sonarrConfig.Block.Path) ||
+                                     _radarrConfig.Enabled && !string.IsNullOrEmpty(_radarrConfig.Block.Path) ||
+                                     _lidarrConfig.Enabled && !string.IsNullOrEmpty(_lidarrConfig.Block.Path);
+
+        if (!blocklistIsConfigured)
+        {
+            _logger.LogWarning("no blocklist is configured");
+            return;
+        }
+        
+        await _blocklistProvider.LoadBlocklistsAsync();
         await base.ExecuteAsync();
     }
 
     protected override async Task ProcessInstanceAsync(ArrInstance instance, InstanceType instanceType)
     {
-        ArrClient arrClient = GetClient(instanceType);
+        using var _ = LogContext.PushProperty("InstanceName", instanceType.ToString());
+
+        HashSet<SearchItem> itemsToBeRefreshed = [];
+        IArrClient arrClient = GetClient(instanceType);
+        BlocklistType blocklistType = _blocklistProvider.GetBlocklistType(instanceType);
+        ConcurrentBag<string> patterns = _blocklistProvider.GetPatterns(instanceType);
+        ConcurrentBag<Regex> regexes = _blocklistProvider.GetRegexes(instanceType);
+        
+        // push to context
+        ContextProvider.Set(nameof(ArrInstance) + nameof(ArrInstance.Url), instance.Url);
+        ContextProvider.Set(nameof(InstanceType), instanceType);
 
         await _arrArrQueueIterator.Iterate(arrClient, instance, async items =>
         {
-            foreach (QueueRecord record in items)
+            var groups = items
+                .GroupBy(x => x.DownloadId)
+                .ToList();
+            
+            foreach (var group in groups)
             {
+                QueueRecord record = group.First();
+                
                 if (record.Protocol is not "torrent")
                 {
                     continue;
@@ -53,9 +106,35 @@ public sealed class ContentBlocker : GenericHandler
                     continue;
                 }
                 
+                // push record to context
+                ContextProvider.Set(nameof(QueueRecord), record);
+                
                 _logger.LogDebug("searching unwanted files for {title}", record.Title);
-                await _downloadService.BlockUnwantedFilesAsync(record.DownloadId);
+
+                BlockFilesResult result = await _downloadService
+                    .BlockUnwantedFilesAsync(record.DownloadId, blocklistType, patterns, regexes);
+                
+                if (!result.ShouldRemove)
+                {
+                    continue;
+                }
+                
+                _logger.LogDebug("all files are marked as unwanted | {hash}", record.Title);
+                
+                itemsToBeRefreshed.Add(GetRecordSearchItem(instanceType, record, group.Count() > 1));
+
+                bool removeFromClient = true;
+                
+                if (result.IsPrivate && !_config.DeletePrivate)
+                {
+                    removeFromClient = false;
+                }
+                
+                await arrClient.DeleteQueueItemAsync(instance, record, removeFromClient);
+                await _notifier.NotifyQueueItemDeleted(removeFromClient, DeleteReason.AllFilesBlocked);
             }
         });
+        
+        await arrClient.RefreshItemsAsync(instance, itemsToBeRefreshed);
     }
 }

code/Infrastructure/Verticals/ContentBlocker/FilenameEvaluator.cs

@@ -1,52 +1,50 @@
-using Domain.Enums;
+using System.Collections.Concurrent;
+using System.Text.RegularExpressions;
+using Common.Configuration.ContentBlocker;
 using Microsoft.Extensions.Logging;
 
 namespace Infrastructure.Verticals.ContentBlocker;
 
-public sealed class FilenameEvaluator
+public class FilenameEvaluator : IFilenameEvaluator
 {
     private readonly ILogger<FilenameEvaluator> _logger;
-    private readonly BlocklistProvider _blocklistProvider;
     
-    public FilenameEvaluator(ILogger<FilenameEvaluator> logger, BlocklistProvider blocklistProvider)
+    public FilenameEvaluator(ILogger<FilenameEvaluator> logger)
     {
         _logger = logger;
-        _blocklistProvider = blocklistProvider;
     }
     
     // TODO create unit tests
-    public bool IsValid(string filename)
+    public bool IsValid(string filename, BlocklistType type, ConcurrentBag<string> patterns, ConcurrentBag<Regex> regexes)
     {
-        return IsValidAgainstPatterns(filename) && IsValidAgainstRegexes(filename);
+        return IsValidAgainstPatterns(filename, type, patterns) && IsValidAgainstRegexes(filename, type, regexes);
     }
 
-    private bool IsValidAgainstPatterns(string filename)
+    private static bool IsValidAgainstPatterns(string filename, BlocklistType type, ConcurrentBag<string> patterns)
     {
-        if (_blocklistProvider.Patterns.Count is 0)
+        if (patterns.Count is 0)
         {
             return true;
         }
 
-        return _blocklistProvider.BlocklistType switch
+        return type switch
         {
-            BlocklistType.Blacklist => !_blocklistProvider.Patterns.Any(pattern => MatchesPattern(filename, pattern)),
-            BlocklistType.Whitelist => _blocklistProvider.Patterns.Any(pattern => MatchesPattern(filename, pattern)),
-            _ => true
+            BlocklistType.Blacklist => !patterns.Any(pattern => MatchesPattern(filename, pattern)),
+            BlocklistType.Whitelist => patterns.Any(pattern => MatchesPattern(filename, pattern)),
         };
     }
 
-    private bool IsValidAgainstRegexes(string filename)
+    private static bool IsValidAgainstRegexes(string filename, BlocklistType type, ConcurrentBag<Regex> regexes)
     {
-        if (_blocklistProvider.Regexes.Count is 0)
+        if (regexes.Count is 0)
         {
             return true;
         }
         
-        return _blocklistProvider.BlocklistType switch
+        return type switch
         {
-            BlocklistType.Blacklist => !_blocklistProvider.Regexes.Any(regex => regex.IsMatch(filename)),
-            BlocklistType.Whitelist => _blocklistProvider.Regexes.Any(regex => regex.IsMatch(filename)),
-            _ => true
+            BlocklistType.Blacklist => !regexes.Any(regex => regex.IsMatch(filename)),
+            BlocklistType.Whitelist => regexes.Any(regex => regex.IsMatch(filename)),
         };
     }
     
@@ -76,6 +74,6 @@ public sealed class FilenameEvaluator
             );
         }
 
-        return filename == pattern;
+        return filename.Equals(pattern, StringComparison.InvariantCultureIgnoreCase);
     }
 }

code/Infrastructure/Verticals/ContentBlocker/IFilenameEvaluator.cs

@@ -0,0 +1,10 @@
+using System.Collections.Concurrent;
+using System.Text.RegularExpressions;
+using Common.Configuration.ContentBlocker;
+
+namespace Infrastructure.Verticals.ContentBlocker;
+
+public interface IFilenameEvaluator
+{
+    bool IsValid(string filename, BlocklistType type, ConcurrentBag<string> patterns, ConcurrentBag<Regex> regexes);
+}

code/Infrastructure/Verticals/Context/ContextProvider.cs

@@ -0,0 +1,24 @@
+using System.Collections.Immutable;
+
+namespace Infrastructure.Verticals.Context;
+
+public static class ContextProvider
+{
+    private static readonly AsyncLocal<ImmutableDictionary<string, object>> _asyncLocalDict = new();
+
+    public static void Set(string key, object value)
+    {
+        ImmutableDictionary<string, object> currentDict = _asyncLocalDict.Value ?? ImmutableDictionary<string, object>.Empty;
+        _asyncLocalDict.Value = currentDict.SetItem(key, value);
+    }
+
+    public static object? Get(string key)
+    {
+        return _asyncLocalDict.Value?.TryGetValue(key, out object? value) is true ? value : null;
+    }
+    
+    public static T Get<T>(string key) where T : class
+    {
+        return Get(key) as T ?? throw new Exception($"failed to get \"{key}\" from context");
+    }
+}

code/Infrastructure/Verticals/DownloadCleaner/DownloadCleaner.cs

@@ -0,0 +1,99 @@
+using Common.Configuration.Arr;
+using Common.Configuration.DownloadCleaner;
+using Common.Configuration.DownloadClient;
+using Domain.Enums;
+using Domain.Models.Arr.Queue;
+using Infrastructure.Verticals.Arr;
+using Infrastructure.Verticals.Arr.Interfaces;
+using Infrastructure.Verticals.DownloadClient;
+using Infrastructure.Verticals.Jobs;
+using Infrastructure.Verticals.Notifications;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Serilog.Context;
+
+namespace Infrastructure.Verticals.DownloadCleaner;
+
+public sealed class DownloadCleaner : GenericHandler
+{
+    private readonly DownloadCleanerConfig _config;
+    private readonly HashSet<string> _excludedHashes = [];
+    
+    public DownloadCleaner(
+        ILogger<DownloadCleaner> logger,
+        IOptions<DownloadCleanerConfig> config,
+        IOptions<DownloadClientConfig> downloadClientConfig,
+        IOptions<SonarrConfig> sonarrConfig,
+        IOptions<RadarrConfig> radarrConfig,
+        IOptions<LidarrConfig> lidarrConfig,
+        SonarrClient sonarrClient,
+        RadarrClient radarrClient,
+        LidarrClient lidarrClient,
+        ArrQueueIterator arrArrQueueIterator,
+        DownloadServiceFactory downloadServiceFactory,
+        NotificationPublisher notifier
+    ) : base(
+        logger, downloadClientConfig,
+        sonarrConfig, radarrConfig, lidarrConfig,
+        sonarrClient, radarrClient, lidarrClient,
+        arrArrQueueIterator, downloadServiceFactory,
+        notifier
+    )
+    {
+        _config = config.Value;
+        _config.Validate();
+    }
+    
+    public override async Task ExecuteAsync()
+    {
+        if (_config.Categories?.Count is null or 0)
+        {
+            _logger.LogWarning("no categories configured");
+            return;
+        }
+        
+        await _downloadService.LoginAsync();
+
+        List<object>? downloads = await _downloadService.GetAllDownloadsToBeCleaned(_config.Categories);
+
+        if (downloads?.Count is null or 0)
+        {
+            _logger.LogDebug("no downloads found in the download client");
+            return;
+        }
+
+        // wait for the downloads to appear in the arr queue
+        await Task.Delay(10 * 1000);
+
+        await ProcessArrConfigAsync(_sonarrConfig, InstanceType.Sonarr, true);
+        await ProcessArrConfigAsync(_radarrConfig, InstanceType.Radarr, true);
+        await ProcessArrConfigAsync(_lidarrConfig, InstanceType.Lidarr, true);
+        
+        await _downloadService.CleanDownloads(downloads, _config.Categories, _excludedHashes);
+    }
+
+    protected override async Task ProcessInstanceAsync(ArrInstance instance, InstanceType instanceType)
+    {
+        using var _ = LogContext.PushProperty("InstanceName", instanceType.ToString());
+        
+        IArrClient arrClient = GetClient(instanceType);
+        
+        await _arrArrQueueIterator.Iterate(arrClient, instance, async items =>
+        {
+            var groups = items
+                .Where(x => !string.IsNullOrEmpty(x.DownloadId))
+                .GroupBy(x => x.DownloadId)
+                .ToList();
+
+            foreach (QueueRecord record in groups.Select(group => group.First()))
+            {
+                _excludedHashes.Add(record.DownloadId.ToLowerInvariant());
+            }
+        });
+    }
+    
+    public override void Dispose()
+    {
+        _downloadService.Dispose();
+    }
+}

code/Infrastructure/Verticals/DownloadClient/BlockFilesResult.cs

@@ -0,0 +1,14 @@
+namespace Infrastructure.Verticals.DownloadClient;
+
+public sealed record BlockFilesResult
+{
+    /// <summary>
+    /// True if the download should be removed; otherwise false.
+    /// </summary>
+    public bool ShouldRemove { get; set; }
+    
+    /// <summary>
+    /// True if the download is private; otherwise false.
+    /// </summary>
+    public bool IsPrivate { get; set; }
+}

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

@@ -62,6 +62,26 @@ public sealed class DelugeClient
             await ListTorrentsExtended(new Dictionary<string, string> { { "hash", hash } });
         return torrents.FirstOrDefault();
     }
+    
+    public async Task<TorrentStatus?> GetTorrentStatus(string hash)
+    {
+        return await SendRequest<TorrentStatus?>(
+            "web.get_torrent_status",
+            hash,
+            new[] { "hash", "state", "name", "eta", "private", "total_done", "label", "seeding_time", "ratio" }
+        );
+    }
+    
+    public async Task<List<TorrentStatus>?> GetStatusForAllTorrents()
+    {
+        Dictionary<string, TorrentStatus>? downloads = await SendRequest<Dictionary<string, TorrentStatus>?>(
+            "core.get_torrents_status",
+            "",
+            new[] { "hash", "state", "name", "eta", "private", "total_done", "label", "seeding_time", "ratio" }
+        );
+        
+        return downloads?.Values.ToList();
+    }
 
     public async Task<DelugeContents?> GetTorrentFiles(string hash)
     {
@@ -78,6 +98,11 @@ public sealed class DelugeClient
         await SendRequest<DelugeResponse<object>>("core.set_torrent_options", hash, filePriorities);
     }
 
+    public async Task DeleteTorrents(List<string> hashes)
+    {
+        await SendRequest<DelugeResponse<object>>("core.remove_torrents", hashes, true);
+    }
+
     private async Task<String> PostJson(String json)
     {
         StringContent content = new StringContent(json);

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

@@ -1,25 +1,44 @@
+using System.Collections.Concurrent;
+using System.Text.RegularExpressions;
+using Common.Attributes;
+using Common.Configuration.ContentBlocker;
+using Common.Configuration.DownloadCleaner;
 using Common.Configuration.DownloadClient;
 using Common.Configuration.QueueCleaner;
+using Domain.Enums;
 using Domain.Models.Deluge.Response;
 using Infrastructure.Verticals.ContentBlocker;
+using Infrastructure.Verticals.Context;
 using Infrastructure.Verticals.ItemStriker;
+using Infrastructure.Verticals.Notifications;
+using MassTransit.Configuration;
+using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
 namespace Infrastructure.Verticals.DownloadClient.Deluge;
 
-public sealed class DelugeService : DownloadServiceBase
+public class DelugeService : DownloadService, IDelugeService
 {
     private readonly DelugeClient _client;
+
+    /// <inheritdoc/>
+    public DelugeService()
+    {
+    }
     
     public DelugeService(
         ILogger<DelugeService> logger,
         IOptions<DelugeConfig> config,
         IHttpClientFactory httpClientFactory,
         IOptions<QueueCleanerConfig> queueCleanerConfig,
-        FilenameEvaluator filenameEvaluator,
-        Striker striker
-    ) : base(logger, queueCleanerConfig, filenameEvaluator, striker)
+        IOptions<ContentBlockerConfig> contentBlockerConfig,
+        IOptions<DownloadCleanerConfig> downloadCleanerConfig,
+        IMemoryCache cache,
+        IFilenameEvaluator filenameEvaluator,
+        IStriker striker,
+        NotificationPublisher notifier
+    ) : base(logger, queueCleanerConfig, contentBlockerConfig, downloadCleanerConfig, cache, filenameEvaluator, striker, notifier)
     {
         config.Value.Validate();
         _client = new (config, httpClientFactory);
@@ -30,18 +49,20 @@ public sealed class DelugeService : DownloadServiceBase
         await _client.LoginAsync();
     }
 
-    public override async Task<bool> ShouldRemoveFromArrQueueAsync(string hash)
+    /// <inheritdoc/>
+    public override async Task<StalledResult> ShouldRemoveFromArrQueueAsync(string hash)
     {
         hash = hash.ToLowerInvariant();
         
         DelugeContents? contents = null;
+        StalledResult result = new();
 
-        TorrentStatus? status = await GetTorrentStatus(hash);
+        TorrentStatus? status = await _client.GetTorrentStatus(hash);
         
         if (status?.Hash is null)
         {
             _logger.LogDebug("failed to find torrent {hash} in the download client", hash);
-            return false;
+            return result;
         }
 
         try
@@ -63,19 +84,48 @@ public sealed class DelugeService : DownloadServiceBase
             }
         });
 
-        return shouldRemove || IsItemStuckAndShouldRemove(status);
+        if (shouldRemove)
+        {
+            result.DeleteReason = DeleteReason.AllFilesBlocked;
+        }
+        
+        result.ShouldRemove = shouldRemove || await IsItemStuckAndShouldRemove(status);
+        result.IsPrivate = status.Private;
+
+        if (!shouldRemove && result.ShouldRemove)
+        {
+            result.DeleteReason = DeleteReason.Stalled;
+        }
+        
+        return result;
     }
 
-    public override async Task BlockUnwantedFilesAsync(string hash)
+    /// <inheritdoc/>
+    public override async Task<BlockFilesResult> BlockUnwantedFilesAsync(
+        string hash,
+        BlocklistType blocklistType,
+        ConcurrentBag<string> patterns,
+        ConcurrentBag<Regex> regexes
+    )
     {
         hash = hash.ToLowerInvariant();
 
-        TorrentStatus? status = await GetTorrentStatus(hash);
+        TorrentStatus? status = await _client.GetTorrentStatus(hash);
+        BlockFilesResult result = new();
         
         if (status?.Hash is null)
         {
             _logger.LogDebug("failed to find torrent {hash} in the download client", hash);
-            return;
+            return result;
+        }
+
+        result.IsPrivate = status.Private;
+        
+        if (_contentBlockerConfig.IgnorePrivate && status.Private)
+        {
+            // ignore private trackers
+            _logger.LogDebug("skip files check | download is private | {name}", status.Name);
+            return result;
         }
         
         DelugeContents? contents = null;
@@ -91,18 +141,27 @@ public sealed class DelugeService : DownloadServiceBase
 
         if (contents is null)
         {
-            return;
+            return result;
         }
         
         Dictionary<int, int> priorities = [];
         bool hasPriorityUpdates = false;
+        long totalFiles = 0;
+        long totalUnwantedFiles = 0;
 
         ProcessFiles(contents.Contents, (name, file) =>
         {
+            totalFiles++;
             int priority = file.Priority;
 
-            if (file.Priority is not 0 && !_filenameEvaluator.IsValid(name))
+            if (file.Priority is 0)
             {
+                totalUnwantedFiles++;
+            }
+
+            if (file.Priority is not 0 && !_filenameEvaluator.IsValid(name, blocklistType, patterns, regexes))
+            {
+                totalUnwantedFiles++;
                 priority = 0;
                 hasPriorityUpdates = true;
                 _logger.LogInformation("unwanted file found | {file}", file.Path);
@@ -113,7 +172,7 @@ public sealed class DelugeService : DownloadServiceBase
 
         if (!hasPriorityUpdates)
         {
-            return;
+            return result;
         }
         
         _logger.LogDebug("changing priorities | torrent {hash}", hash);
@@ -123,11 +182,113 @@ public sealed class DelugeService : DownloadServiceBase
             .Select(x => x.Value)
             .ToList();
 
+        if (totalUnwantedFiles == totalFiles)
+        {
+            // Skip marking files as unwanted. The download will be removed completely.
+            result.ShouldRemove = true;
+            
+            return result;
+        }
+
+        await ((DelugeService)Proxy).ChangeFilesPriority(hash, sortedPriorities);
+
+        return result;
+    }
+
+    public override async Task<List<object>?> GetAllDownloadsToBeCleaned(List<Category> categories)
+    {
+        return (await _client.GetStatusForAllTorrents())
+            ?.Where(x => !string.IsNullOrEmpty(x.Hash))
+            .Where(x => x.State?.Equals("seeding", StringComparison.InvariantCultureIgnoreCase) is true)
+            .Where(x => categories.Any(cat => cat.Name.Equals(x.Label, StringComparison.InvariantCultureIgnoreCase)))
+            .Cast<object>()
+            .ToList();
+    }
+
+    /// <inheritdoc/>
+    public override async Task CleanDownloads(List<object> downloads, List<Category> categoriesToClean, HashSet<string> excludedHashes)
+    {
+        foreach (TorrentStatus download in downloads)
+        {
+            if (string.IsNullOrEmpty(download.Hash))
+            {
+                continue;
+            }
+            
+            Category? category = categoriesToClean
+                .FirstOrDefault(x => x.Name.Equals(download.Label, StringComparison.InvariantCultureIgnoreCase));
+
+            if (category is null)
+            {
+                continue;
+            }
+            
+            if (excludedHashes.Any(x => x.Equals(download.Hash, StringComparison.InvariantCultureIgnoreCase)))
+            {
+                _logger.LogDebug("skip | download is used by an arr | {name}", download.Name);
+                continue;
+            }
+
+            if (!_downloadCleanerConfig.DeletePrivate && download.Private)
+            {
+                _logger.LogDebug("skip | download is private | {name}", download.Name);
+                continue;
+            }
+            
+            ContextProvider.Set("downloadName", download.Name);
+            ContextProvider.Set("hash", download.Hash);
+            
+            TimeSpan seedingTime = TimeSpan.FromSeconds(download.SeedingTime);
+            SeedingCheckResult result = ShouldCleanDownload(download.Ratio, seedingTime, category);
+
+            if (!result.ShouldClean)
+            {
+                continue;
+            }
+            
+            await ((DelugeService)Proxy).DeleteDownload(download.Hash);
+
+            _logger.LogInformation(
+                "download cleaned | {reason} reached | {name}",
+                result.Reason is CleanReason.MaxRatioReached
+                    ? "MAX_RATIO & MIN_SEED_TIME"
+                    : "MAX_SEED_TIME",
+                download.Name
+            );
+            
+            await _notifier.NotifyDownloadCleaned(download.Ratio, seedingTime, category.Name, result.Reason);
+        }
+    }
+    
+    /// <inheritdoc/>
+    [DryRunSafeguard]
+    public override async Task DeleteDownload(string hash)
+    {
+        hash = hash.ToLowerInvariant();
+        
+        await _client.DeleteTorrents([hash]);
+    }
+    
+    [DryRunSafeguard]
+    protected virtual async Task ChangeFilesPriority(string hash, List<int> sortedPriorities)
+    {
         await _client.ChangeFilesPriority(hash, sortedPriorities);
     }
     
-    private bool IsItemStuckAndShouldRemove(TorrentStatus status)
+    private async Task<bool> IsItemStuckAndShouldRemove(TorrentStatus status)
     {
+        if (_queueCleanerConfig.StalledMaxStrikes is 0)
+        {
+            return false;
+        }
+        
+        if (_queueCleanerConfig.StalledIgnorePrivate && status.Private)
+        {
+            // ignore private trackers
+            _logger.LogDebug("skip stalled check | download is private | {name}", status.Name);
+            return false;
+        }
+        
         if (status.State is null || !status.State.Equals("Downloading", StringComparison.InvariantCultureIgnoreCase))
         {
             return false;
@@ -137,21 +298,19 @@ public sealed class DelugeService : DownloadServiceBase
         {
             return false;
         }
+        
+        ResetStrikesOnProgress(status.Hash!, status.TotalDone);
 
-        return StrikeAndCheckLimit(status.Hash!, status.Name!);
-    }
-
-    private async Task<TorrentStatus?> GetTorrentStatus(string hash)
-    {
-        return await _client.SendRequest<TorrentStatus?>(
-            "web.get_torrent_status",
-            hash,
-            new[] { "hash", "state", "name", "eta" }
-        );
+        return await StrikeAndCheckLimit(status.Hash!, status.Name!);
     }
     
-    private static void ProcessFiles(Dictionary<string, DelugeFileOrDirectory> contents, Action<string, DelugeFileOrDirectory> processFile)
+    private static void ProcessFiles(Dictionary<string, DelugeFileOrDirectory>? contents, Action<string, DelugeFileOrDirectory> processFile)
     {
+        if (contents is null)
+        {
+            return;
+        }
+        
         foreach (var (name, data) in contents)
         {
             switch (data.Type)

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

@@ -0,0 +1,5 @@
+namespace Infrastructure.Verticals.DownloadClient.Deluge;
+
+public interface IDelugeService : IDownloadService
+{
+}

code/Infrastructure/Verticals/DownloadClient/DownloadService.cs

@@ -0,0 +1,183 @@
+using System.Collections.Concurrent;
+using System.Text.RegularExpressions;
+using Common.Configuration.ContentBlocker;
+using Common.Configuration.DownloadCleaner;
+using Common.Configuration.QueueCleaner;
+using Common.Helpers;
+using Domain.Enums;
+using Domain.Models.Cache;
+using Infrastructure.Helpers;
+using Infrastructure.Interceptors;
+using Infrastructure.Verticals.ContentBlocker;
+using Infrastructure.Verticals.Context;
+using Infrastructure.Verticals.ItemStriker;
+using Infrastructure.Verticals.Notifications;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Infrastructure.Verticals.DownloadClient;
+
+public abstract class DownloadService : InterceptedService, IDownloadService
+{
+    protected readonly ILogger<DownloadService> _logger;
+    protected readonly QueueCleanerConfig _queueCleanerConfig;
+    protected readonly ContentBlockerConfig _contentBlockerConfig;
+    protected readonly DownloadCleanerConfig _downloadCleanerConfig;
+    protected readonly IMemoryCache _cache;
+    protected readonly IFilenameEvaluator _filenameEvaluator;
+    protected readonly IStriker _striker;
+    protected readonly MemoryCacheEntryOptions _cacheOptions;
+    protected readonly NotificationPublisher _notifier;
+
+    /// <summary>
+    /// Constructor to be used by interceptors.
+    /// </summary>
+    protected DownloadService()
+    {
+    }
+    
+    protected DownloadService(
+        ILogger<DownloadService> logger,
+        IOptions<QueueCleanerConfig> queueCleanerConfig,
+        IOptions<ContentBlockerConfig> contentBlockerConfig,
+        IOptions<DownloadCleanerConfig> downloadCleanerConfig,
+        IMemoryCache cache,
+        IFilenameEvaluator filenameEvaluator,
+        IStriker striker,
+        NotificationPublisher notifier)
+    {
+        _logger = logger;
+        _queueCleanerConfig = queueCleanerConfig.Value;
+        _contentBlockerConfig = contentBlockerConfig.Value;
+        _downloadCleanerConfig = downloadCleanerConfig.Value;
+        _cache = cache;
+        _filenameEvaluator = filenameEvaluator;
+        _striker = striker;
+        _notifier = notifier;
+        _cacheOptions = new MemoryCacheEntryOptions()
+            .SetSlidingExpiration(StaticConfiguration.TriggerValue + Constants.CacheLimitBuffer);
+    }
+
+    public abstract void Dispose();
+
+    public abstract Task LoginAsync();
+
+    public abstract Task<StalledResult> ShouldRemoveFromArrQueueAsync(string hash);
+
+    /// <inheritdoc/>
+    public abstract Task<BlockFilesResult> BlockUnwantedFilesAsync(
+        string hash,
+        BlocklistType blocklistType,
+        ConcurrentBag<string> patterns,
+        ConcurrentBag<Regex> regexes
+    );
+
+    /// <inheritdoc/>
+    public abstract Task DeleteDownload(string hash);
+
+    /// <inheritdoc/>
+    public abstract Task<List<object>?> GetAllDownloadsToBeCleaned(List<Category> categories);
+
+    /// <inheritdoc/>
+    public abstract Task CleanDownloads(List<object> downloads, List<Category> categoriesToClean, HashSet<string> excludedHashes);
+
+    protected void ResetStrikesOnProgress(string hash, long downloaded)
+    {
+        if (!_queueCleanerConfig.StalledResetStrikesOnProgress)
+        {
+            return;
+        }
+        
+        if (_cache.TryGetValue(CacheKeys.Item(hash), out CacheItem? cachedItem) && cachedItem is not null && downloaded > cachedItem.Downloaded)
+        {
+            // cache item found
+            _cache.Remove(CacheKeys.Strike(StrikeType.Stalled, hash));
+            _logger.LogDebug("resetting strikes for {hash} due to progress", hash);
+        }
+        
+        _cache.Set(CacheKeys.Item(hash), new CacheItem { Downloaded = downloaded }, _cacheOptions);
+    }
+
+    /// <summary>
+    /// Strikes an item and checks if the limit has been reached.
+    /// </summary>
+    /// <param name="hash">The torrent hash.</param>
+    /// <param name="itemName">The name or title of the item.</param>
+    /// <returns>True if the limit has been reached; otherwise, false.</returns>
+    protected async Task<bool> StrikeAndCheckLimit(string hash, string itemName)
+    {
+        return await _striker.StrikeAndCheckLimit(hash, itemName, _queueCleanerConfig.StalledMaxStrikes, StrikeType.Stalled);
+    }
+    
+    protected SeedingCheckResult ShouldCleanDownload(double ratio, TimeSpan seedingTime, Category category)
+    {
+        // check ratio
+        if (DownloadReachedRatio(ratio, seedingTime, category))
+        {
+            return new()
+            {
+                ShouldClean = true,
+                Reason = CleanReason.MaxRatioReached
+            };
+        }
+            
+        // check max seed time
+        if (DownloadReachedMaxSeedTime(seedingTime, category))
+        {
+            return new()
+            {
+                ShouldClean = true,
+                Reason = CleanReason.MaxSeedTimeReached
+            };
+        }
+
+        return new();
+    }
+    
+    private bool DownloadReachedRatio(double ratio, TimeSpan seedingTime, Category category)
+    {
+        if (category.MaxRatio < 0)
+        {
+            return false;
+        }
+        
+        string downloadName = ContextProvider.Get<string>("downloadName");
+        TimeSpan minSeedingTime = TimeSpan.FromHours(category.MinSeedTime);
+        
+        if (category.MinSeedTime > 0 && seedingTime < minSeedingTime)
+        {
+            _logger.LogDebug("skip | download has not reached MIN_SEED_TIME | {name}", downloadName);
+            return false;
+        }
+
+        if (ratio < category.MaxRatio)
+        {
+            _logger.LogDebug("skip | download has not reached MAX_RATIO | {name}", downloadName);
+            return false;
+        }
+        
+        // max ration is 0 or reached
+        return true;
+    }
+    
+    private bool DownloadReachedMaxSeedTime(TimeSpan seedingTime, Category category)
+    {
+        if (category.MaxSeedTime < 0)
+        {
+            return false;
+        }
+        
+        string downloadName = ContextProvider.Get<string>("downloadName");
+        TimeSpan maxSeedingTime = TimeSpan.FromHours(category.MaxSeedTime);
+        
+        if (category.MaxSeedTime > 0 && seedingTime < maxSeedingTime)
+        {
+            _logger.LogDebug("skip | download has not reached MAX_SEED_TIME | {name}", downloadName);
+            return false;
+        }
+
+        // max seed time is 0 or reached
+        return true;
+    }
+}

code/Infrastructure/Verticals/DownloadClient/DownloadServiceBase.cs

@@ -1,42 +0,0 @@
-using Common.Configuration.QueueCleaner;
-using Domain.Enums;
-using Infrastructure.Verticals.ContentBlocker;
-using Infrastructure.Verticals.ItemStriker;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-
-namespace Infrastructure.Verticals.DownloadClient;
-
-public abstract class DownloadServiceBase : IDownloadService
-{
-    protected readonly ILogger<DownloadServiceBase> _logger;
-    protected readonly QueueCleanerConfig _queueCleanerConfig;
-    protected readonly FilenameEvaluator _filenameEvaluator;
-    protected readonly Striker _striker;
-    
-    protected DownloadServiceBase(
-        ILogger<DownloadServiceBase> logger,
-        IOptions<QueueCleanerConfig> queueCleanerConfig,
-        FilenameEvaluator filenameEvaluator,
-        Striker striker
-    )
-    {
-        _logger = logger;
-        _queueCleanerConfig = queueCleanerConfig.Value;
-        _filenameEvaluator = filenameEvaluator;
-        _striker = striker;
-    }
-
-    public abstract void Dispose();
-
-    public abstract Task LoginAsync();
-
-    public abstract Task<bool> ShouldRemoveFromArrQueueAsync(string hash);
-
-    public abstract Task BlockUnwantedFilesAsync(string hash);
-
-    protected bool StrikeAndCheckLimit(string hash, string itemName)
-    {
-        return _striker.StrikeAndCheckLimit(hash, itemName, _queueCleanerConfig.StalledMaxStrikes, StrikeType.Stalled);
-    }
-}

code/Infrastructure/Verticals/DownloadClient/DownloadServiceFactory.cs

@@ -1,9 +1,7 @@
-using Common.Configuration;
-using Common.Configuration.DownloadClient;
+using Common.Configuration.DownloadClient;
 using Infrastructure.Verticals.DownloadClient.Deluge;
 using Infrastructure.Verticals.DownloadClient.QBittorrent;
 using Infrastructure.Verticals.DownloadClient.Transmission;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
@@ -12,24 +10,21 @@ namespace Infrastructure.Verticals.DownloadClient;
 public sealed class DownloadServiceFactory
 {
     private readonly IServiceProvider _serviceProvider;
-    private readonly Domain.Enums.DownloadClient _downloadClient;
+    private readonly Common.Enums.DownloadClient _downloadClient;
     
-    public DownloadServiceFactory(IServiceProvider serviceProvider, IConfiguration configuration)
+    public DownloadServiceFactory(IServiceProvider serviceProvider, IOptions<DownloadClientConfig> downloadClientConfig)
     {
         _serviceProvider = serviceProvider;
-        _downloadClient = (Domain.Enums.DownloadClient)Enum.Parse(
-            typeof(Domain.Enums.DownloadClient),
-            configuration[EnvironmentVariables.DownloadClient] ?? Domain.Enums.DownloadClient.QBittorrent.ToString(),
-            true
-        );
+        _downloadClient = downloadClientConfig.Value.DownloadClient;
     }
 
     public IDownloadService CreateDownloadClient() =>
         _downloadClient switch
         {
-            Domain.Enums.DownloadClient.QBittorrent => _serviceProvider.GetRequiredService<QBitService>(),
-            Domain.Enums.DownloadClient.Deluge => _serviceProvider.GetRequiredService<DelugeService>(),
-            Domain.Enums.DownloadClient.Transmission => _serviceProvider.GetRequiredService<TransmissionService>(),
+            Common.Enums.DownloadClient.QBittorrent => _serviceProvider.GetRequiredService<QBitService>(),
+            Common.Enums.DownloadClient.Deluge => _serviceProvider.GetRequiredService<DelugeService>(),
+            Common.Enums.DownloadClient.Transmission => _serviceProvider.GetRequiredService<TransmissionService>(),
+            Common.Enums.DownloadClient.None => _serviceProvider.GetRequiredService<DummyDownloadService>(),
             _ => throw new ArgumentOutOfRangeException()
         };
 }

code/Infrastructure/Verticals/DownloadClient/DummyDownloadService.cs

@@ -0,0 +1,59 @@
+using System.Collections.Concurrent;
+using System.Text.RegularExpressions;
+using Common.Configuration.ContentBlocker;
+using Common.Configuration.DownloadCleaner;
+using Common.Configuration.QueueCleaner;
+using Infrastructure.Verticals.ContentBlocker;
+using Infrastructure.Verticals.ItemStriker;
+using Infrastructure.Verticals.Notifications;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Infrastructure.Verticals.DownloadClient;
+
+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)
+    {
+    }
+
+    public override void Dispose()
+    {
+    }
+
+    public override Task LoginAsync()
+    {
+        return Task.CompletedTask;
+    }
+
+    public override Task<StalledResult> ShouldRemoveFromArrQueueAsync(string hash)
+    {
+        throw new NotImplementedException();
+    }
+
+    public override Task<BlockFilesResult> BlockUnwantedFilesAsync(string hash, BlocklistType blocklistType, ConcurrentBag<string> patterns, ConcurrentBag<Regex> regexes)
+    {
+        throw new NotImplementedException();
+    }
+
+    public override Task<List<object>?> GetAllDownloadsToBeCleaned(List<Category> categories)
+    {
+        throw new NotImplementedException();
+    }
+
+    public override Task CleanDownloads(List<object> downloads, List<Category> categoriesToClean, HashSet<string> excludedHashes)
+    {
+        throw new NotImplementedException();
+    }
+
+    public override Task DeleteDownload(string hash)
+    {
+        throw new NotImplementedException();
+    }
+}

code/Infrastructure/Verticals/DownloadClient/IDownloadService.cs

@@ -1,10 +1,53 @@
-namespace Infrastructure.Verticals.DownloadClient;
+using System.Collections.Concurrent;
+using System.Text.RegularExpressions;
+using Common.Configuration.ContentBlocker;
+using Common.Configuration.DownloadCleaner;
+using Infrastructure.Interceptors;
 
-public interface IDownloadService : IDisposable
+namespace Infrastructure.Verticals.DownloadClient;
+
+public interface IDownloadService : IDisposable, IDryRunService
 {
     public Task LoginAsync();
 
-    public Task<bool> ShouldRemoveFromArrQueueAsync(string hash);
+    /// <summary>
+    /// Checks whether the download should be removed from the *arr queue.
+    /// </summary>
+    /// <param name="hash">The download hash.</param>
+    public Task<StalledResult> ShouldRemoveFromArrQueueAsync(string hash);
 
-    public Task BlockUnwantedFilesAsync(string hash);
+    /// <summary>
+    /// Blocks unwanted files from being fully downloaded.
+    /// </summary>
+    /// <param name="hash">The torrent hash.</param>
+    /// <param name="blocklistType">The <see cref="BlocklistType"/>.</param>
+    /// <param name="patterns">The patterns to test the files against.</param>
+    /// <param name="regexes">The regexes to test the files against.</param>
+    /// <returns>True if all files have been blocked; otherwise false.</returns>
+    public Task<BlockFilesResult> BlockUnwantedFilesAsync(
+        string hash,
+        BlocklistType blocklistType,
+        ConcurrentBag<string> patterns,
+        ConcurrentBag<Regex> regexes
+    );
+
+    /// <summary>
+    /// Fetches all downloads.
+    /// </summary>
+    /// <param name="categories">The categories by which to filter the downloads.</param>
+    /// <returns>A list of downloads for the provided categories.</returns>
+    Task<List<object>?> GetAllDownloadsToBeCleaned(List<Category> categories);
+    
+    /// <summary>
+    /// Cleans the downloads.
+    /// </summary>
+    /// <param name="downloads"></param>
+    /// <param name="categoriesToClean">The categories that should be cleaned.</param>
+    /// <param name="excludedHashes">The hashes that should not be cleaned.</param>
+    public abstract Task CleanDownloads(List<object> downloads, List<Category> categoriesToClean, HashSet<string> excludedHashes);
+
+    /// <summary>
+    /// Deletes a download item.
+    /// </summary>
+    public Task DeleteDownload(string hash);
 }

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

@@ -0,0 +1,5 @@
+namespace Infrastructure.Verticals.DownloadClient.QBittorrent;
+
+public interface IQBitService : IDownloadService
+{
+}

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

@@ -1,29 +1,50 @@
-using Common.Configuration.DownloadClient;
+using System.Collections.Concurrent;
+using System.Text.RegularExpressions;
+using Common.Attributes;
+using Common.Configuration.ContentBlocker;
+using Common.Configuration.DownloadCleaner;
+using Common.Configuration.DownloadClient;
 using Common.Configuration.QueueCleaner;
+using Common.Helpers;
+using Domain.Enums;
 using Infrastructure.Verticals.ContentBlocker;
+using Infrastructure.Verticals.Context;
 using Infrastructure.Verticals.ItemStriker;
+using Infrastructure.Verticals.Notifications;
+using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using QBittorrent.Client;
+using Category = Common.Configuration.DownloadCleaner.Category;
 
 namespace Infrastructure.Verticals.DownloadClient.QBittorrent;
 
-public sealed class QBitService : DownloadServiceBase
+public class QBitService : DownloadService, IQBitService
 {
     private readonly QBitConfig _config;
     private readonly QBittorrentClient _client;
 
+    /// <inheritdoc/>
+    public QBitService()
+    {
+    }
+    
     public QBitService(
         ILogger<QBitService> logger,
+        IHttpClientFactory httpClientFactory,
         IOptions<QBitConfig> config,
         IOptions<QueueCleanerConfig> queueCleanerConfig,
-        FilenameEvaluator filenameEvaluator,
-        Striker striker
-    ) : base(logger, queueCleanerConfig, filenameEvaluator, striker)
+        IOptions<ContentBlockerConfig> contentBlockerConfig,
+        IOptions<DownloadCleanerConfig> downloadCleanerConfig,
+        IMemoryCache cache,
+        IFilenameEvaluator filenameEvaluator,
+        IStriker striker,
+        NotificationPublisher notifier
+    ) : base(logger, queueCleanerConfig, contentBlockerConfig, downloadCleanerConfig, cache, filenameEvaluator, striker, notifier)
     {
         _config = config.Value;
         _config.Validate();
-        _client = new(_config.Url);
+        _client = new(httpClientFactory.CreateClient(Constants.HttpClientWithRetryName), _config.Url);
     }
 
     public override async Task LoginAsync()
@@ -36,21 +57,37 @@ public sealed class QBitService : DownloadServiceBase
         await _client.LoginAsync(_config.Username, _config.Password);
     }
 
-    public override async Task<bool> ShouldRemoveFromArrQueueAsync(string hash)
+    /// <inheritdoc/>
+    public override async Task<StalledResult> ShouldRemoveFromArrQueueAsync(string hash)
     {
+        StalledResult result = new();
         TorrentInfo? torrent = (await _client.GetTorrentListAsync(new TorrentListQuery { Hashes = [hash] }))
             .FirstOrDefault();
 
         if (torrent is null)
         {
             _logger.LogDebug("failed to find torrent {hash} in the download client", hash);
-            return false;
+            return result;
         }
 
+        TorrentProperties? torrentProperties = await _client.GetTorrentPropertiesAsync(hash);
+
+        if (torrentProperties is null)
+        {
+            _logger.LogDebug("failed to find torrent properties {hash} in the download client", hash);
+            return result;
+        }
+
+        result.IsPrivate = torrentProperties.AdditionalData.TryGetValue("is_private", out var dictValue) &&
+                           bool.TryParse(dictValue?.ToString(), out bool boolValue)
+                           && boolValue;
+
         // if all files were blocked by qBittorrent
         if (torrent is { CompletionOn: not null, Downloaded: null or 0 })
         {
-            return true;
+            result.ShouldRemove = true;
+            result.DeleteReason = DeleteReason.AllFilesBlocked;
+            return result;
         }
 
         IReadOnlyList<TorrentContent>? files = await _client.GetTorrentContentsAsync(hash);
@@ -58,20 +95,70 @@ public sealed class QBitService : DownloadServiceBase
         // if all files are marked as skip
         if (files?.Count is > 0 && files.All(x => x.Priority is TorrentContentPriority.Skip))
         {
-            return true;
+            result.ShouldRemove = true;
+            result.DeleteReason = DeleteReason.AllFilesBlocked;
+            return result;
         }
 
-        return IsItemStuckAndShouldRemove(torrent);
+        result.ShouldRemove = await IsItemStuckAndShouldRemove(torrent, result.IsPrivate);
+
+        if (result.ShouldRemove)
+        {
+            result.DeleteReason = DeleteReason.Stalled;
+        }
+
+        return result;
     }
 
-    public override async Task BlockUnwantedFilesAsync(string hash)
+    /// <inheritdoc/>
+    public override async Task<BlockFilesResult> BlockUnwantedFilesAsync(
+        string hash,
+        BlocklistType blocklistType,
+        ConcurrentBag<string> patterns,
+        ConcurrentBag<Regex> regexes
+    )
     {
+        TorrentInfo? torrent = (await _client.GetTorrentListAsync(new TorrentListQuery { Hashes = [hash] }))
+            .FirstOrDefault();
+        BlockFilesResult result = new();
+
+        if (torrent is null)
+        {
+            _logger.LogDebug("failed to find torrent {hash} in the download client", hash);
+            return result;
+        }
+        
+        TorrentProperties? torrentProperties = await _client.GetTorrentPropertiesAsync(hash);
+
+        if (torrentProperties is null)
+        {
+            _logger.LogDebug("failed to find torrent properties {hash} in the download client", hash);
+            return result;
+        }
+
+        bool isPrivate = torrentProperties.AdditionalData.TryGetValue("is_private", out var dictValue) &&
+                         bool.TryParse(dictValue?.ToString(), out bool boolValue)
+                         && boolValue;
+
+        result.IsPrivate = isPrivate;
+
+        if (_contentBlockerConfig.IgnorePrivate && isPrivate)
+        {
+            // ignore private trackers
+            _logger.LogDebug("skip files check | download is private | {name}", torrent.Name);
+            return result;
+        }
+        
         IReadOnlyList<TorrentContent>? files = await _client.GetTorrentContentsAsync(hash);
 
         if (files is null)
         {
-            return;
+            return result;
         }
+
+        List<int> unwantedFiles = [];
+        long totalFiles = 0;
+        long totalUnwantedFiles = 0;
         
         foreach (TorrentContent file in files)
         {
@@ -80,14 +167,136 @@ public sealed class QBitService : DownloadServiceBase
                 continue;
             }
 
-            if (file.Priority is TorrentContentPriority.Skip || _filenameEvaluator.IsValid(file.Name))
+            totalFiles++;
+
+            if (file.Priority is TorrentContentPriority.Skip)
+            {
+                totalUnwantedFiles++;
+                continue;
+            }
+
+            if (_filenameEvaluator.IsValid(file.Name, blocklistType, patterns, regexes))
             {
                 continue;
             }
             
             _logger.LogInformation("unwanted file found | {file}", file.Name);
-            await _client.SetFilePriorityAsync(hash, file.Index.Value, TorrentContentPriority.Skip);
+            unwantedFiles.Add(file.Index.Value);
+            totalUnwantedFiles++;
         }
+
+        if (unwantedFiles.Count is 0)
+        {
+            return result;
+        }
+        
+        if (totalUnwantedFiles == totalFiles)
+        {
+            // Skip marking files as unwanted. The download will be removed completely.
+            result.ShouldRemove = true;
+            
+            return result;
+        }
+
+        foreach (int fileIndex in unwantedFiles)
+        {
+            await ((QBitService)Proxy).SkipFile(hash, fileIndex);
+        }
+        
+        return result;
+    }
+    
+    /// <inheritdoc/>
+    public override async Task<List<object>?> GetAllDownloadsToBeCleaned(List<Category> categories) =>
+        (await _client.GetTorrentListAsync(new()
+        {
+            Filter = TorrentListFilter.Seeding
+        }))
+        ?.Where(x => !string.IsNullOrEmpty(x.Hash))
+        .Where(x => categories.Any(cat => cat.Name.Equals(x.Category, StringComparison.InvariantCultureIgnoreCase)))
+        .Cast<object>()
+        .ToList();
+
+    /// <inheritdoc/>
+    public override async Task CleanDownloads(List<object> downloads, List<Category> categoriesToClean, HashSet<string> excludedHashes)
+    {
+        foreach (TorrentInfo download in downloads)
+        {
+            if (string.IsNullOrEmpty(download.Hash))
+            {
+                continue;
+            }
+            
+            Category? category = categoriesToClean
+                .FirstOrDefault(x => download.Category.Equals(x.Name, StringComparison.InvariantCultureIgnoreCase));
+            
+            if (category is null)
+            {
+                continue;
+            }
+            
+            if (excludedHashes.Any(x => x.Equals(download.Hash, StringComparison.InvariantCultureIgnoreCase)))
+            {
+                _logger.LogDebug("skip | download is used by an arr | {name}", download.Name);
+                continue;
+            }
+            
+            if (!_downloadCleanerConfig.DeletePrivate)
+            {
+                TorrentProperties? torrentProperties = await _client.GetTorrentPropertiesAsync(download.Hash);
+
+                if (torrentProperties is null)
+                {
+                    _logger.LogDebug("failed to find torrent properties in the download client | {name}", download.Name);
+                    return;
+                }
+                
+                bool isPrivate = torrentProperties.AdditionalData.TryGetValue("is_private", out var dictValue) &&
+                                 bool.TryParse(dictValue?.ToString(), out bool boolValue)
+                                 && boolValue;
+
+                if (isPrivate)
+                {
+                    _logger.LogDebug("skip | download is private | {name}", download.Name);
+                    continue;
+                }
+            }
+            
+            ContextProvider.Set("downloadName", download.Name);
+            ContextProvider.Set("hash", download.Hash);
+
+            SeedingCheckResult result = ShouldCleanDownload(download.Ratio, download.SeedingTime ?? TimeSpan.Zero, category);
+
+            if (!result.ShouldClean)
+            {
+                continue;
+            }
+
+            await ((QBitService)Proxy).DeleteDownload(download.Hash);
+
+            _logger.LogInformation(
+                "download cleaned | {reason} reached | {name}",
+                result.Reason is CleanReason.MaxRatioReached
+                    ? "MAX_RATIO & MIN_SEED_TIME"
+                    : "MAX_SEED_TIME",
+                download.Name
+            );
+            
+            await _notifier.NotifyDownloadCleaned(download.Ratio, download.SeedingTime ?? TimeSpan.Zero, category.Name, result.Reason);
+        }
+    }
+
+    /// <inheritdoc/>
+    [DryRunSafeguard]
+    public override async Task DeleteDownload(string hash)
+    {
+        await _client.DeleteAsync(hash, deleteDownloadedData: true);
+    }
+    
+    [DryRunSafeguard]
+    protected virtual async Task SkipFile(string hash, int fileIndex)
+    {
+        await _client.SetFilePriorityAsync(hash, fileIndex, TorrentContentPriority.Skip);
     }
 
     public override void Dispose()
@@ -95,8 +304,20 @@ public sealed class QBitService : DownloadServiceBase
         _client.Dispose();
     }
     
-    private bool IsItemStuckAndShouldRemove(TorrentInfo torrent)
+    private async Task<bool> IsItemStuckAndShouldRemove(TorrentInfo torrent, bool isPrivate)
     {
+        if (_queueCleanerConfig.StalledMaxStrikes is 0)
+        {
+            return false;
+        }
+        
+        if (_queueCleanerConfig.StalledIgnorePrivate && isPrivate)
+        {
+            // ignore private trackers
+            _logger.LogDebug("skip stalled check | download is private | {name}", torrent.Name);
+            return false;
+        }
+        
         if (torrent.State is not TorrentState.StalledDownload and not TorrentState.FetchingMetadata
             and not TorrentState.ForcedFetchingMetadata)
         {
@@ -104,6 +325,8 @@ public sealed class QBitService : DownloadServiceBase
             return false;
         }
 
-        return StrikeAndCheckLimit(torrent.Hash, torrent.Name);
+        ResetStrikesOnProgress(torrent.Hash, torrent.Downloaded ?? 0);
+
+        return await StrikeAndCheckLimit(torrent.Hash, torrent.Name);
     }
 }

code/Infrastructure/Verticals/DownloadClient/SeedingCheckResult.cs

@@ -0,0 +1,9 @@
+using Domain.Enums;
+
+namespace Infrastructure.Verticals.DownloadClient;
+
+public sealed record SeedingCheckResult
+{
+    public bool ShouldClean { get; set; }
+    public CleanReason Reason { get; set; }    
+}

code/Infrastructure/Verticals/DownloadClient/StalledResult.cs

@@ -0,0 +1,18 @@
+using Domain.Enums;
+
+namespace Infrastructure.Verticals.DownloadClient;
+
+public sealed record StalledResult
+{
+    /// <summary>
+    /// True if the download should be removed; otherwise false.
+    /// </summary>
+    public bool ShouldRemove { get; set; }
+    
+    public DeleteReason DeleteReason { get; set; }
+    
+    /// <summary>
+    /// True if the download is private; otherwise false.
+    /// </summary>
+    public bool IsPrivate { get; set; }
+}

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

@@ -0,0 +1,5 @@
+namespace Infrastructure.Verticals.DownloadClient.Transmission;
+
+public interface ITransmissionService : IDownloadService
+{
+}

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

@@ -1,7 +1,17 @@
-using Common.Configuration.DownloadClient;
+using System.Collections.Concurrent;
+using System.Text.RegularExpressions;
+using Common.Attributes;
+using Common.Configuration.ContentBlocker;
+using Common.Configuration.DownloadCleaner;
+using Common.Configuration.DownloadClient;
 using Common.Configuration.QueueCleaner;
+using Common.Helpers;
+using Domain.Enums;
 using Infrastructure.Verticals.ContentBlocker;
+using Infrastructure.Verticals.Context;
 using Infrastructure.Verticals.ItemStriker;
+using Infrastructure.Verticals.Notifications;
+using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Transmission.API.RPC;
@@ -10,23 +20,34 @@ using Transmission.API.RPC.Entity;
 
 namespace Infrastructure.Verticals.DownloadClient.Transmission;
 
-public sealed class TransmissionService : DownloadServiceBase
+public class TransmissionService : DownloadService, ITransmissionService
 {
     private readonly TransmissionConfig _config;
     private readonly Client _client;
     private TorrentInfo[]? _torrentsCache;
 
+    /// <inheritdoc/>
+    public TransmissionService()
+    {
+    }
+    
     public TransmissionService(
+        IHttpClientFactory httpClientFactory,
         ILogger<TransmissionService> logger,
         IOptions<TransmissionConfig> config,
         IOptions<QueueCleanerConfig> queueCleanerConfig,
-        FilenameEvaluator filenameEvaluator,
-        Striker striker
-    ) : base(logger, queueCleanerConfig, filenameEvaluator, striker)
+        IOptions<ContentBlockerConfig> contentBlockerConfig,
+        IOptions<DownloadCleanerConfig> downloadCleanerConfig,
+        IMemoryCache cache,
+        IFilenameEvaluator filenameEvaluator,
+        IStriker striker,
+        NotificationPublisher notifier
+    ) : base(logger, queueCleanerConfig, contentBlockerConfig, downloadCleanerConfig, cache, filenameEvaluator, striker, notifier)
     {
         _config = config.Value;
         _config.Validate();
         _client = new(
+            httpClientFactory.CreateClient(Constants.HttpClientWithRetryName),
             new Uri(_config.Url, "/transmission/rpc").ToString(),
             login: _config.Username,
             password: _config.Password
@@ -38,17 +59,20 @@ public sealed class TransmissionService : DownloadServiceBase
         await _client.GetSessionInformationAsync();
     }
 
-    public override async Task<bool> ShouldRemoveFromArrQueueAsync(string hash)
+    /// <inheritdoc/>
+    public override async Task<StalledResult> ShouldRemoveFromArrQueueAsync(string hash)
     {
+        StalledResult result = new();
         TorrentInfo? torrent = await GetTorrentAsync(hash);
 
         if (torrent is null)
         {
             _logger.LogDebug("failed to find torrent {hash} in the download client", hash);
-            return false;
+            return result;
         }
         
         bool shouldRemove = torrent.FileStats?.Length > 0;
+        result.IsPrivate = torrent.IsPrivate ?? false;
 
         foreach (TransmissionTorrentFileStats? stats in torrent.FileStats ?? [])
         {
@@ -64,21 +88,52 @@ public sealed class TransmissionService : DownloadServiceBase
                 shouldRemove = false;
             }
         }
+        
+        if (shouldRemove)
+        {
+            result.DeleteReason = DeleteReason.AllFilesBlocked;
+        }
 
-        // remove if all files are unwanted
-        return shouldRemove || IsItemStuckAndShouldRemove(torrent);
+        // remove if all files are unwanted or download is stuck
+        result.ShouldRemove = shouldRemove || await IsItemStuckAndShouldRemove(torrent);
+
+        if (!shouldRemove && result.ShouldRemove)
+        {
+            result.DeleteReason = DeleteReason.Stalled;
+        }
+        
+        return result;
     }
 
-    public override async Task BlockUnwantedFilesAsync(string hash)
+    /// <inheritdoc/>
+    public override async Task<BlockFilesResult> BlockUnwantedFilesAsync(
+        string hash,
+        BlocklistType blocklistType,
+        ConcurrentBag<string> patterns,
+        ConcurrentBag<Regex> regexes
+    )
     {
         TorrentInfo? torrent = await GetTorrentAsync(hash);
+        BlockFilesResult result = new();
 
         if (torrent?.FileStats is null || torrent.Files is null)
         {
-            return;
+            return result;
+        }
+
+        bool isPrivate = torrent.IsPrivate ?? false;
+        result.IsPrivate = isPrivate;
+        
+        if (_contentBlockerConfig.IgnorePrivate && isPrivate)
+        {
+            // ignore private trackers
+            _logger.LogDebug("skip files check | download is private | {name}", torrent.Name);
+            return result;
         }
 
         List<long> unwantedFiles = [];
+        long totalFiles = 0;
+        long totalUnwantedFiles = 0;
         
         for (int i = 0; i < torrent.Files.Length; i++)
         {
@@ -86,36 +141,193 @@ public sealed class TransmissionService : DownloadServiceBase
             {
                 continue;
             }
+
+            totalFiles++;
             
-            if (!torrent.FileStats[i].Wanted.Value || _filenameEvaluator.IsValid(torrent.Files[i].Name))
+            if (!torrent.FileStats[i].Wanted.Value)
+            {
+                totalUnwantedFiles++;
+                continue;
+            }
+
+            if (_filenameEvaluator.IsValid(torrent.Files[i].Name, blocklistType, patterns, regexes))
             {
                 continue;
             }
             
             _logger.LogInformation("unwanted file found | {file}", torrent.Files[i].Name);
             unwantedFiles.Add(i);
+            totalUnwantedFiles++;
         }
 
         if (unwantedFiles.Count is 0)
         {
-            return;
+            return result;
+        }
+
+        if (totalUnwantedFiles == totalFiles)
+        {
+            // Skip marking files as unwanted. The download will be removed completely.
+            result.ShouldRemove = true;
+            
+            return result;
         }
         
         _logger.LogDebug("changing priorities | torrent {hash}", hash);
         
-        await _client.TorrentSetAsync(new TorrentSettings
+        await ((TransmissionService)Proxy).SetUnwantedFiles(torrent.Id, unwantedFiles.ToArray());
+
+        return result;
+    }
+
+    /// <inheritdoc/>
+    public override async Task<List<object>?> GetAllDownloadsToBeCleaned(List<Category> categories)
+    {
+        string[] fields = [
+            TorrentFields.FILES,
+            TorrentFields.FILE_STATS,
+            TorrentFields.HASH_STRING,
+            TorrentFields.ID,
+            TorrentFields.ETA,
+            TorrentFields.NAME,
+            TorrentFields.STATUS,
+            TorrentFields.IS_PRIVATE,
+            TorrentFields.DOWNLOADED_EVER,
+            TorrentFields.DOWNLOAD_DIR,
+            TorrentFields.SECONDS_SEEDING,
+            TorrentFields.UPLOAD_RATIO
+        ];
+            
+        return (await _client.TorrentGetAsync(fields))
+            ?.Torrents
+            ?.Where(x => !string.IsNullOrEmpty(x.HashString))
+            .Where(x => x.Status is 5 or 6)
+            .Where(x => categories
+                .Any(cat =>
+                {
+                    if (x.DownloadDir is null)
+                    {
+                        return false;
+                    }
+                    
+                    return Path.GetFileName(Path.TrimEndingDirectorySeparator(x.DownloadDir))
+                        .Equals(cat.Name, StringComparison.InvariantCultureIgnoreCase);
+                })
+            )
+            .Cast<object>()
+            .ToList();
+    }
+
+    /// <inheritdoc/>
+    public override async Task CleanDownloads(List<object> downloads, List<Category> categoriesToClean, HashSet<string> excludedHashes)
+    {
+        foreach (TorrentInfo download in downloads)
         {
-            Ids = [ torrent.Id ],
-            FilesUnwanted = unwantedFiles.ToArray(),
-        });
+            if (string.IsNullOrEmpty(download.HashString))
+            {
+                continue;
+            }
+            
+            Category? category = categoriesToClean
+                .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;
+            }
+
+            if (excludedHashes.Any(x => x.Equals(download.HashString, StringComparison.InvariantCultureIgnoreCase)))
+            {
+                _logger.LogDebug("skip | download is used by an arr | {name}", download.Name);
+                continue;
+            }
+
+            if (!_downloadCleanerConfig.DeletePrivate && download.IsPrivate is true)
+            {
+                _logger.LogDebug("skip | download is private | {name}", download.Name);
+                continue;
+            }
+            
+            ContextProvider.Set("downloadName", download.Name);
+            ContextProvider.Set("hash", download.HashString);
+
+            TimeSpan seedingTime = TimeSpan.FromSeconds(download.SecondsSeeding ?? 0);
+            SeedingCheckResult result = ShouldCleanDownload(download.uploadRatio ?? 0, seedingTime, category);
+            
+            if (!result.ShouldClean)
+            {
+                continue;
+            }
+
+            await ((TransmissionService)Proxy).RemoveDownloadAsync(download.Id);
+
+            _logger.LogInformation(
+                "download cleaned | {reason} reached | {name}",
+                result.Reason is CleanReason.MaxRatioReached
+                    ? "MAX_RATIO & MIN_SEED_TIME"
+                    : "MAX_SEED_TIME",
+                download.Name
+            );
+
+            await _notifier.NotifyDownloadCleaned(download.uploadRatio ?? 0, seedingTime, category.Name, result.Reason);
+        }
+    }
+    
+    public override async Task DeleteDownload(string hash)
+    {
+        TorrentInfo? torrent = await GetTorrentAsync(hash);
+
+        if (torrent is null)
+        {
+            return;
+        }
+
+        await _client.TorrentRemoveAsync([torrent.Id], true);
     }
 
     public override void Dispose()
     {
     }
     
-    private bool IsItemStuckAndShouldRemove(TorrentInfo torrent)
+    [DryRunSafeguard]
+    protected virtual async Task RemoveDownloadAsync(long downloadId)
     {
+        await _client.TorrentRemoveAsync([downloadId], true);
+    }
+    
+    [DryRunSafeguard]
+    protected virtual async Task SetUnwantedFiles(long downloadId, long[] unwantedFiles)
+    {
+        await _client.TorrentSetAsync(new TorrentSettings
+        {
+            Ids = [downloadId],
+            FilesUnwanted = unwantedFiles,
+        });
+    }
+    
+    private async Task<bool> IsItemStuckAndShouldRemove(TorrentInfo torrent)
+    {
+        if (_queueCleanerConfig.StalledMaxStrikes is 0)
+        {
+            return false;
+        }
+        
+        if (_queueCleanerConfig.StalledIgnorePrivate && (torrent.IsPrivate ?? false))
+        {
+            // ignore private trackers
+            _logger.LogDebug("skip stalled check | download is private | {name}", torrent.Name);
+            return false;
+        }
+        
         if (torrent.Status is not 4)
         {
             // not in downloading state
@@ -126,8 +338,10 @@ public sealed class TransmissionService : DownloadServiceBase
         {
             return false;
         }
+        
+        ResetStrikesOnProgress(torrent.HashString!, torrent.DownloadedEver ?? 0);
 
-        return StrikeAndCheckLimit(torrent.HashString!, torrent.Name!);
+        return await StrikeAndCheckLimit(torrent.HashString!, torrent.Name!);
     }
 
     private async Task<TorrentInfo?> GetTorrentAsync(string hash)
@@ -144,7 +358,9 @@ public sealed class TransmissionService : DownloadServiceBase
                 TorrentFields.ID,
                 TorrentFields.ETA,
                 TorrentFields.NAME,
-                TorrentFields.STATUS
+                TorrentFields.STATUS,
+                TorrentFields.IS_PRIVATE,
+                TorrentFields.DOWNLOADED_EVER
             ];
             
             // refresh cache

code/Infrastructure/Verticals/ItemStriker/IStriker.cs

@@ -0,0 +1,8 @@
+using Domain.Enums;
+
+namespace Infrastructure.Verticals.ItemStriker;
+
+public interface IStriker
+{
+    Task<bool> StrikeAndCheckLimit(string hash, string itemName, ushort maxStrikes, StrikeType strikeType);
+}