fixed readme

.github/ISSUE_TEMPLATE/1-bug.yml

@@ -14,7 +14,7 @@ body:
       options:
         - label: Reviewed the documentation.
           required: true
-        - label: Ensured I am using ghcr.io/cleanuparr/cleanuparr docker repository.
+        - label: Ensured I am using ghcr.io/Cleanuparr/Cleanuparr docker repository.
           required: true
         - label: Ensured I am using the latest version.
           required: true

.github/ISSUE_TEMPLATE/3-help.yml

@@ -14,7 +14,7 @@ body:
       options:
         - label: Reviewed the documentation.
           required: true
-        - label: Ensured I am using ghcr.io/cleanuparr/cleanuparr docker repository.
+        - label: Ensured I am using ghcr.io/Cleanuparr/Cleanuparr docker repository.
           required: true
         - label: Ensured I am using the latest version.
           required: true

.github/workflows/build-docker.yml

@@ -29,8 +29,6 @@ jobs:
           githubHeadRef=${{ env.githubHeadRef }}
           latestDockerTag=""
           versionDockerTag=""
-          majorVersionDockerTag=""
-          minorVersionDockerTag=""
           version="0.0.1"
 
           if [[ "$githubRef" =~ ^"refs/tags/" ]]; then
@@ -38,12 +36,6 @@ jobs:
             latestDockerTag="latest"
             versionDockerTag=${branch#v}
             version=${branch#v}
-            
-            # Extract major and minor versions for additional tags
-            if [[ "$versionDockerTag" =~ ^([0-9]+)\.([0-9]+)\.([0-9]+) ]]; then
-              majorVersionDockerTag="${BASH_REMATCH[1]}"
-              minorVersionDockerTag="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}"
-            fi
           else
             # Determine if this run is for the main branch or another branch
             if [[ -z "$githubHeadRef" ]]; then
@@ -61,16 +53,11 @@ jobs:
           githubTags=""
 
           if [ -n "$latestDockerTag" ]; then
-            githubTags="$githubTags,ghcr.io/cleanuparr/cleanuparr:$latestDockerTag"
+            githubTags="$githubTags,ghcr.io/cleanuparr:$latestDockerTag"
           fi
+
           if [ -n "$versionDockerTag" ]; then
-            githubTags="$githubTags,ghcr.io/cleanuparr/cleanuparr:$versionDockerTag"
-          fi
-          if [ -n "$minorVersionDockerTag" ]; then
-            githubTags="$githubTags,ghcr.io/cleanuparr/cleanuparr:$minorVersionDockerTag"
-          fi
-          if [ -n "$majorVersionDockerTag" ]; then
-            githubTags="$githubTags,ghcr.io/cleanuparr/cleanuparr:$majorVersionDockerTag"
+            githubTags="$githubTags,ghcr.io/cleanuparr:$versionDockerTag"
           fi
 
           # set env vars
@@ -126,7 +113,7 @@ jobs:
             version=${{ env.versionDockerTag }}
           build-args: |
             VERSION=${{ env.version }}
-            PACKAGES_USERNAME=${{ secrets.PACKAGES_USERNAME }}
+            PACKAGES_USERNAME=${{ env.PACKAGES_USERNAME }}
             PACKAGES_PAT=${{ env.PACKAGES_PAT }}
           outputs: |
             type=image

.github/workflows/build-executable.yml

@@ -101,6 +101,28 @@ jobs:
       - name: Build osx-arm64
         run: dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime osx-arm64 --self-contained -o artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-osx-arm64 /p:PublishSingleFile=true /p:Version=${{ env.appVersion }} /p:DebugSymbols=false
 
+      - name: Create sample configuration files
+        run: |
+          # Create a sample appsettings.json for each platform
+          cat > sample-config.json << 'EOF'
+          {
+            "Logging": {
+              "LogLevel": {
+                "Default": "Information",
+                "Microsoft.AspNetCore": "Warning"
+              }
+            },
+            "AllowedHosts": "*"
+          }
+          EOF
+          
+          # Copy to each build directory
+          cp sample-config.json artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-win-amd64/appsettings.json
+          cp sample-config.json artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-linux-amd64/appsettings.json
+          cp sample-config.json artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-linux-arm64/appsettings.json
+          cp sample-config.json artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-osx-amd64/appsettings.json
+          cp sample-config.json artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-osx-arm64/appsettings.json
+
       - name: Zip win-x64
         run: |
           cd ./artifacts
@@ -134,4 +156,22 @@ jobs:
             ./artifacts/*.zip
           retention-days: 30
 
-      # Removed individual release step - handled by main release workflow
+      - name: Release
+        if: startsWith(github.ref, 'refs/tags/')
+        id: release
+        uses: softprops/action-gh-release@v2
+        with:
+          name: ${{ env.releaseVersion }}
+          tag_name: ${{ env.releaseVersion }}
+          repository: ${{ env.githubRepository }}
+          token: ${{ env.REPO_READONLY_PAT }}
+          make_latest: true
+          fail_on_unmatched_files: true
+          target_commitish: main
+          generate_release_notes: true
+          files: |
+            ./artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-win-amd64.zip
+            ./artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-linux-amd64.zip
+            ./artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-linux-arm64.zip
+            ./artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-osx-amd64.zip
+            ./artifacts/${{ env.githubRepositoryName }}-${{ env.appVersion }}-osx-arm64.zip

.github/workflows/build-macos-arm-installer.yml

@@ -363,4 +363,14 @@ jobs:
           path: '${{ env.pkgName }}'
           retention-days: 30
 
-      # Removed individual release step - handled by main release workflow 
+      - name: Release
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: softprops/action-gh-release@v2
+        with:
+          name: ${{ env.releaseVersion }}
+          tag_name: ${{ env.releaseVersion }}
+          repository: ${{ env.githubRepository }}
+          token: ${{ env.REPO_READONLY_PAT }}
+          make_latest: true
+          files: |
+            ${{ env.pkgName }} 

.github/workflows/build-macos-intel-installer.yml

@@ -363,4 +363,14 @@ jobs:
           path: '${{ env.pkgName }}'
           retention-days: 30
 
-      # Removed individual release step - handled by main release workflow 
+      - name: Release
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: softprops/action-gh-release@v2
+        with:
+          name: ${{ env.releaseVersion }}
+          tag_name: ${{ env.releaseVersion }}
+          repository: ${{ env.githubRepository }}
+          token: ${{ env.REPO_READONLY_PAT }}
+          make_latest: true
+          files: |
+            ${{ env.pkgName }} 

.github/workflows/build-windows-installer.yml

@@ -88,6 +88,19 @@ jobs:
         run: |
           dotnet publish code/backend/${{ env.executableName }}/${{ env.executableName }}.csproj -c Release --runtime win-x64 --self-contained -o dist /p:PublishSingleFile=true /p:Version=${{ env.appVersion }} /p:DebugType=None /p:DebugSymbols=false
 
+      - name: Create sample configuration
+        shell: pwsh
+        run: |
+          # Create config directory
+          New-Item -ItemType Directory -Force -Path "config"
+          
+          $config = @{
+            "HTTP_PORTS" = 11011
+            "BASE_PATH" = "/"
+          }
+          
+          $config | ConvertTo-Json | Out-File -FilePath "config/cleanuparr.json" -Encoding UTF8
+
       - name: Setup Inno Setup
         shell: pwsh
         run: |
@@ -145,4 +158,14 @@ jobs:
           path: installer/${{ env.installerName }}
           retention-days: 30
 
-      # Removed individual release step - handled by main release workflow 
+      - name: Release
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: softprops/action-gh-release@v2
+        with:
+          name: ${{ env.releaseVersion }}
+          tag_name: ${{ env.releaseVersion }}
+          repository: ${{ env.githubRepository }}
+          token: ${{ env.REPO_READONLY_PAT }}
+          make_latest: true
+          files: |
+            installer/${{ env.installerName }} 

.github/workflows/cloudflare-pages.yml

@@ -1,36 +0,0 @@
-name: Deploy to Cloudflare Pages
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - 'Cloudflare/**'
-      - 'blacklist'
-      - 'blacklist_permissive'
-      - 'whitelist'
-      - 'whitelist_with_subtitles'
-  workflow_dispatch:
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    name: Deploy to Cloudflare Pages
-    
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      
-      - name: Copy root static files to Cloudflare static directory
-        run: |
-          cp blacklist Cloudflare/static/
-          cp blacklist_permissive Cloudflare/static/
-          cp whitelist Cloudflare/static/
-          cp whitelist_with_subtitles Cloudflare/static/
-      
-      - name: Deploy to Cloudflare Pages
-        uses: cloudflare/wrangler-action@v3
-        with:
-          apiToken: ${{ secrets.CLOUDFLARE_PAGES_TOKEN }}
-          workingDirectory: "Cloudflare"
-          command: pages deploy . --project-name=cleanuparr

.github/workflows/docs.yml

@@ -2,9 +2,9 @@ name: Deploy Docusaurus to GitHub Pages
 
 on:
   push:
-    tags:
-      - "v*.*.*"
-  workflow_dispatch: {}
+    branches: [main]
+    paths:
+      - 'docs/**'
 
 permissions:
   contents: read

.github/workflows/release.yml

@@ -55,7 +55,7 @@ jobs:
   # Build portable executables
   build-executables:
     needs: validate
-    uses: ./.github/workflows/build-executable.yml
+    uses: ./.github/workflows/build_executable.yml
     secrets: inherit
 
   # Build Windows installer
@@ -106,12 +106,12 @@ jobs:
       - name: Create release
         uses: softprops/action-gh-release@v2
         with:
-          name: ${{ needs.validate.outputs.release_version }}
+          name: Cleanuparr ${{ needs.validate.outputs.release_version }}
           tag_name: ${{ needs.validate.outputs.release_version }}
           token: ${{ env.REPO_READONLY_PAT }}
           make_latest: true
-          target_commitish: main
           generate_release_notes: true
+          prerelease: ${{ contains(needs.validate.outputs.app_version, '-') }}
           files: |
             ./artifacts/**/*.zip
             ./artifacts/**/*.pkg

Cloudflare/_headers

@@ -1,3 +0,0 @@
-# Cache static files for 5 minutes
-/static/*
-  Cache-Control: public, max-age=300, s-maxage=300

Cloudflare/static/known_malware_file_name_patterns

@@ -1,2 +0,0 @@
-thepirateheaven.org
-RARBG.work

README.md

@@ -12,71 +12,34 @@ Cleanuparr was created primarily to address malicious files, such as `*.lnk` or
 > **Features:**
 > - Strike system to mark bad downloads.
 > - Remove and block downloads that reached a maximum number of strikes.
-> - Remove and block downloads that are **failing to be imported** by the arrs.
-> - Remove and block downloads that are **stalled** or in **metadata downloading** state.
-> - Remove and block downloads that have a **low download speed** or **high estimated completion time**.
-> - Remove and block downloads blocked by qBittorrent or by Cleanuparr's **Malware Blocker**.
-> - Remove and block known malware based on patterns found by the community.
+> - Remove and block downloads that are **failing to be imported** by the arrs. [configuration](https://cleanuparr.github.io/cleanuparr/docs/configuration/queue-cleaner/import-failed)
+> - Remove and block downloads that are **stalled** or in **metadata downloading** state. [configuration](https://cleanuparr.github.io/cleanuparr/docs/configuration/queue-cleaner/stalled)
+> - Remove and block downloads that have a **low download speed** or **high estimated completion time**. [configuration](https://cleanuparr.github.io/cleanuparr/docs/configuration/queue-cleaner/slow)
+> - Remove and block downloads blocked by qBittorrent or by Cleanuparr's **Content Blocker**. [configuration](https://cleanuparr.github.io/cleanuparr/docs/configuration/content-blocker/general)
 > - Automatically trigger a search for downloads removed from the arrs.
-> - Clean up downloads that have been **seeding** for a certain amount of time.
-> - Remove downloads that are **orphaned**/have no **hardlinks**/are not referenced by the arrs anymore (with [cross-seed](https://www.cross-seed.org/) support).
-> - Notify on strike or download removal.
+> - Clean up downloads that have been **seeding** for a certain amount of time. [configuration](https://cleanuparr.github.io/cleanuparr/docs/configuration/download-cleaner/seeding)
+> - Remove downloads that are **orphaned**/have no **hardlinks**/are not referenced by the arrs anymore (with [cross-seed](https://www.cross-seed.org/) support). [configuration](https://cleanuparr.github.io/cleanuparr/docs/configuration/download-cleaner/hardlinks)
+> - Notify on strike or download removal. [configuration](https://cleanuparr.github.io/cleanuparr/docs/category/notifications)
 > - Ignore certain torrent hashes, categories, tags or trackers from being processed by Cleanuparr.
 
-## 🎯 Supported Applications
+Cleanuparr 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.
 
-### *Arr Applications
-- **Sonarr**
-- **Radarr**
-- **Lidarr**
-- **Readarr**
-- **Whisparr**
+## Quick Start
 
-### Download Clients
-- **qBittorrent**
-- **Transmission**
-- **Deluge**
-- **µTorrent**
+> [!NOTE]
+>
+> 1. **Docker (Recommended)**  
+> Pull the Docker image from `ghcr.io/Cleanuparr/Cleanuparr:latest`.
+>
+> 2. **Unraid (for Unraid users)**  
+> Use the Unraid Community App.
+>
+> 3. **Manual Installation (if you're not using Docker)**  
+> Go to [Windows](#windows), [Linux](#linux) or [MacOS](#macos).
 
-### Platforms
-- **Docker**
-- **Windows**
-- **macOS**
-- **Linux**
-- **Unraid**
+# Docs
 
-## 🚀 Quick Start
-
-```bash
-docker run -d --name cleanuparr \
-  --restart unless-stopped \
-  -p 11011:11011 \
-  -v /path/to/config:/config \
-  -e PORT=11011 \
-  -e PUID=1000 \
-  -e PGID=1000 \
-  -e TZ=Etc/UTC \
-  ghcr.io/cleanuparr/cleanuparr:latest
-```
-
-For Docker Compose, health checks, and other installation methods, see the [Complete Installation Guide](https://cleanuparr.github.io/Cleanuparr/docs/installation/detailed).
-
-### 🌐 Access the Web Interface
-
-After installation, open your browser and navigate to:
-```
-http://localhost:11011
-```
-
-**Next Steps:** Check out the [📖 Complete Documentation](https://cleanuparr.github.io/Cleanuparr/) for detailed configuration guides and setup instructions.
-
-## 📖 Documentation & Support
-
-- **📚 [Complete Documentation](https://cleanuparr.github.io/Cleanuparr/)** - Installation guides, configuration, and troubleshooting
-- **⚙️ [Configuration Guide](https://cleanuparr.github.io/Cleanuparr/docs/category/configuration)** - Set up download clients, *arr apps, and features
-- **🔧 [Setup Scenarios](https://cleanuparr.github.io/Cleanuparr/docs/category/setup-scenarios)** - Common use cases and examples
-- **💬 [Discord Community](https://discord.gg/SCtMCgtsc4)** - Get help and discuss with other users
-- **🔗 [GitHub Releases](https://github.com/Cleanuparr/Cleanuparr/releases)** - Download binaries and view changelog
+Docs can be found [here](https://Cleanuparr.github.io/Cleanuparr/).
 
 # <img style="vertical-align: middle;" width="24px" src="./Logo/256.png" alt="Cleanuparr"> <span style="vertical-align: middle;">Cleanuparr</span> <img src="https://raw.githubusercontent.com/FortAwesome/Font-Awesome/6.x/svgs/solid/x.svg" height="24px" width="30px" style="vertical-align: middle;"> <span style="vertical-align: middle;">Huntarr</span> <img style="vertical-align: middle;" width="24px" src="https://github.com/plexguide/Huntarr.io/blob/main/frontend/static/logo/512.png?raw=true" alt Huntarr></img>
 

blacklist

@@ -1,27 +1,12 @@
 *(sample).*
-*sample.avchd
-*sample.avi
-*sample.mkv
-*sample.mov
-*sample.mp4
-*sample.webm
-*sample.wmv
-*.000
-*.001
-*.002
-*.004
 *.0xe
+*.001
 *.73k
 *.73p
 *.7z
-*.7z.001
-*.7z.002
 *.89k
 *.89z
 *.8ck
-*.a00
-*.a01
-*.a02
 *.a7r
 *.ac
 *.acc
@@ -37,11 +22,8 @@
 *.ahk
 *.ai
 *.aif
-*.ain
 *.air
 *.alz
-*.ana
-*.apex
 *.api
 *.apk
 *.app
@@ -49,28 +31,15 @@
 *.applescript
 *.application
 *.appx
-*.apz
-*.ar
 *.arc
-*.archiver
-*.arduboy
-*.arh
-*.ari
 *.arj
-*.ark
 *.arscript
 *.asb
-*.asice
 *.asp
 *.aspx
 *.aspx-exe
 *.atmx
-*.ayt
 *.azw2
-*.b1
-*.b6z
-*.b64
-*.ba
 *.ba_
 *.bak
 *.bas
@@ -78,48 +47,26 @@
 *.bat
 *.bdjo
 *.bdmv
-*.bdoc
 *.beam
-*.bh
 *.bin
 *.bmp
 *.bms
-*.bndl
 *.bns
-*.boo
 *.bsa
 *.btm
-*.bundle
-*.bz
 *.bz2
-*.bza
-*.bzabw
-*.bzip
-*.bzip2
 *.c
-*.c00
-*.c01
-*.c02
-*.c10
 *.cab
 *.caction
-*.car
-*.cb7
-*.cba
-*.cbr
-*.cbt
-*.cbz
 *.cci
 *.cda
 *.cdb
-*.cdz
 *.cel
 *.celx
 *.cfs
 *.cgi
 *.cheat
 *.chm
-*.cit
 *.ckpt
 *.cla
 *.class
@@ -129,15 +76,9 @@
 *.coffee
 *.com
 *.command
-*.comppkg.hauptwerk.rar
-*.comppkg_hauptwerk_rar
-*.conda
 *.conf
 *.config
-*.cp9
-*.cpgz
 *.cpl
-*.cpt
 *.crt
 *.cs
 *.csh
@@ -145,27 +86,17 @@
 *.csproj
 *.css
 *.csv
-*.ctx
-*.ctz
 *.cue
 *.cur
-*.cxarchive
 *.cyw
-*.czip
 *.daemon
-*.daf
-*.dar
 *.dat
 *.data-00000-of-00001
 *.db
-*.dd
 *.deamon
 *.deb
 *.dek
-*.dgc
-*.dist
 *.diz
-*.dl_
 *.dld
 *.dll
 *.dmc
@@ -182,27 +113,19 @@
 *.dw
 *.dword
 *.dxl
-*.dz
 *.e_e
 *.ear
 *.ebacmd
 *.ebm
 *.ebs
 *.ebs2
-*.ecar
 *.ecf
-*.ecs
-*.ecsbx
-*.edz
-*.efw
-*.egg
 *.eham
 *.elf
 *.elf-so
 *.email
 *.emu
 *.epk
-*.epi
 *.es
 *.esh
 *.etc
@@ -218,62 +141,36 @@
 *.exz
 *.ezs
 *.ezt
-*.f
-*.f3z
 *.fas
 *.fba
-*.fcx
 *.fky
 *.flac
 *.flatpak
 *.flv
-*.fp8
 *.fpi
 *.frs
 *.fxp
-*.fzpz
 *.gadget
-*.gar
 *.gat
-*.gca
 *.gif
 *.gifv
 *.gm9
-*.gmz
 *.gpe
 *.gpu
 *.gs
 *.gz
-*.gz2
-*.gza
-*.gzi
-*.gzip
 *.h5
-*.ha
 *.ham
-*.hbc
-*.hbc2
-*.hbe
 *.hex
-*.hki
-*.hki1
-*.hki2
-*.hki3
 *.hlp
 *.hms
 *.hpf
-*.hpk
-*.hpkg
 *.hta
 *.hta-psh
 *.htaccess
 *.htm
 *.html
-*.htmi
-*.hyp
-*.iadproj
 *.icd
-*.ice
 *.icns
 *.ico
 *.idx
@@ -286,27 +183,17 @@
 *.ins
 *.ipa
 *.ipf
-*.ipg
 *.ipk
 *.ipsw
 *.iqylink
-*.ish
 *.iso
 *.isp
 *.isu
-*.isx
 *.ita
-*.ize
 *.izh
 *.izma ace
-*.j
 *.jar
-*.jar.pack
 *.java
-*.jex
-*.jgz
-*.jhh
-*.jic
 *.jpeg
 *.jpg
 *.js
@@ -315,51 +202,27 @@
 *.jse
 *.jsf
 *.json
-*.jsonlz4
 *.jsp
 *.jsx
-*.kextraction
-*.kgb
 *.kix
 *.ksh
-*.ksp
-*.kwgt
 *.kx
-*.kz
-*.layout
-*.lbr
 *.lck
 *.ldb
-*.lemon
-*.lha
-*.lhzd
 *.lib
-*.libzip
 *.link
 *.lnk
 *.lo
 *.lock
 *.log
 *.loop-vbs
-*.lpkg
-*.lqr
 *.ls
-*.lz
-*.lz4
-*.lzh
-*.lzm
-*.lzma
-*.lzo
-*.lzr
-*.lzx
 *.m3u
 *.m4a
 *.mac
 *.macho
 *.mamc
 *.manifest
-*.mar
-*.mbz
 *.mcr
 *.md
 *.mda
@@ -370,29 +233,22 @@
 *.mdt
 *.mel
 *.mem
-*.memo
 *.meta
 *.mgm
 *.mhm
 *.mht
 *.mhtml
 *.mid
-*.mint
 *.mio
 *.mlappinstall
-*.mlproj
 *.mlx
 *.mm
 *.mobileconfig
 *.model
 *.moo
-*.mou
-*.movpkg
-*.mozlz4
 *.mp3
 *.mpa
 *.mpk
-*.mpkg
 *.mpls
 *.mrc
 *.mrp
@@ -411,79 +267,41 @@
 *.msp
 *.mst
 *.msu
-*.mxc
 *.mxe
-*.mzp
 *.n
-*.nar
 *.ncl
 *.net
-*.nex
 *.nexe
 *.nfo
-*.npk
 *.nrg
 *.num
-*.nz
 *.nzb.bz2
 *.nzb.gz
 *.nzbs
-*.oar
 *.ocx
-*.odlgz
 *.odt
-*.opk
 *.ore
-*.osf
 *.ost
 *.osx
 *.osx-app
 *.otm
 *.out
 *.ova
-*.oz
 *.p
-*.p01
-*.p19
-*.p7z
-*.pa
-*.pack.gz
-*.package
-*.pae
 *.paf
 *.pak
-*.paq6
-*.paq7
-*.paq8
-*.paq8f
-*.paq8l
-*.paq8p
-*.par
-*.par2
-*.pax
 *.pb
-*.pbi
 *.pcd
-*.pcv
 *.pdb
 *.pdf
 *.pea
 *.perl
-*.pet
 *.pex
-*.pf
 *.phar
 *.php
 *.php5
 *.pif
-*.pim
-*.pima
-*.pit
-*.piz
 *.pkg
-*.pkg.tar.xz
-*.pkg.tar.zst
-*.pkz
 *.pl
 *.plsc
 *.plx
@@ -501,7 +319,6 @@
 *.pptx
 *.prc
 *.prg
-*.prs
 *.ps
 *.ps1
 *.ps1xml
@@ -517,16 +334,9 @@
 *.psh-reflection
 *.psm1
 *.pst
-*.psz
 *.pt
-*.pup
-*.puz
 *.pvd
-*.pvmp
-*.pvmz
-*.pwa
 *.pwc
-*.pxl
 *.pxo
 *.py
 *.pyc
@@ -534,20 +344,8 @@
 *.pyo
 *.python
 *.pyz
-*.q
-*.qda
 *.qit
 *.qpx
-*.r0
-*.r00
-*.r01
-*.r02
-*.r03
-*.r04
-*.r1
-*.r2
-*.r21
-*.r30
 *.ram
 *.rar
 *.raw
@@ -558,35 +356,22 @@
 *.reg
 *.resources
 *.resx
-*.rev
 *.rfs
 *.rfu
 *.rgs
-*.rk
 *.rm
-*.rnc
 *.rox
-*.rp9
 *.rpg
 *.rpj
 *.rpm
-*.rss
 *.ruby
 *.run
 *.rxe
-*.rz
-*.s00
-*.s01
-*.s02
-*.s09
 *.s2a
-*.s7z
 *.sample
 *.sapk
-*.sar
 *.savedmodel
 *.sbs
-*.sbx
 *.sca
 *.scar
 *.scb
@@ -596,86 +381,42 @@
 *.scr
 *.script
 *.sct
-*.sdc
-*.sdn
-*.sdoc
-*.sdocx
-*.sea
 *.seed
-*.sen
 *.server
 *.service
-*.sfg
-*.sfm
-*.sfs
 *.sfv
-*.sfx
 *.sh
-*.shar
 *.shb
 *.shell
-*.shk
 *.shortcut
-*.shr
 *.shs
 *.shtml
-*.sifz
-*.sipa
 *.sit
 *.sitx
 *.sk
 *.sldm
 *.sln
 *.smm
-*.smpf
 *.snap
-*.snagitstamps
-*.snappy
-*.snb
 *.snd
-*.snz
-*.spa
-*.spd
-*.spl
-*.spm
 *.spr
-*.spt
 *.sql
-*.sqf
 *.sqx
-*.sqz
 *.srec
-*.srep
 *.srt
 *.ssm
-*.stg
-*.stkdoodlz
-*.stproj
 *.sts
 *.sub
 *.svg
 *.swf
-*.sy_
 *.sys
 *.tar
-*.tar.bz2
 *.tar.gz
-*.tar.gz2
-*.tar.lz
-*.tar.lzma
-*.tar.xz
-*.tar.z
-*.tar.zip
-*.taz
 *.tbl
 *.tbz
-*.tbz2
 *.tcp
-*.tcx
 *.text
 *.tf
-*.tg
-*.tgs
 *.tgz
 *.thm
 *.thmx
@@ -684,35 +425,19 @@
 *.tif
 *.tiff
 *.tipa
-*.tlz
-*.tlzma
 *.tmp
 *.tms
 *.toast
 *.torrent
 *.tpk
-*.tpsr
-*.trs
 *.txt
-*.tx_
-*.txz
-*.tz
-*.tzst
 *.u3p
-*.ubz
-*.uc2
 *.udf
-*.ufdr
-*.ufs.uzip
-*.uha
 *.upk
 *.upx
 *.url
-*.uue
 *.uvm
 *.uw8
-*.uzed
-*.uzip
 *.vb
 *.vba
 *.vba-exe
@@ -724,46 +449,26 @@
 *.vbscript 
 *.vcd
 *.vdo
-*.vem
 *.vexe
-*.vfs
 *.vhd
 *.vhdx
-*.vib
-*.vip
 *.vlx
 *.vm
-*.vmcz
 *.vmdk
-*.vms
 *.vob
 *.vocab
-*.voca
-*.vpk
 *.vpm
-*.vrpackage
-*.vsi
-*.vwi
 *.vxp
-*.wa
-*.wacz
-*.waff
 *.war
-*.wastickers
 *.wav
 *.wbk
 *.wcm
-*.wdz
 *.webm
-*.whl
-*.wick
 *.widget
 *.wim
 *.wiz
-*.wlb
 *.wma
 *.workflow
-*.wot
 *.wpk
 *.wpl
 *.wpm
@@ -772,26 +477,14 @@
 *.wsc
 *.wsf
 *.wsh
-*.wux
 *.x86
 *.x86_64
 *.xaml
 *.xap
-*.xapk
-*.xar
 *.xbap
 *.xbe
-*.xcf.bz2
-*.xcf.gz
-*.xcf.xz
-*.xcfbz2
-*.xcfgz
-*.xcfxz
 *.xex
-*.xez
-*.xfp
 *.xig
-*.xip
 *.xla
 *.xlam
 *.xll
@@ -804,47 +497,24 @@
 *.xltb
 *.xltm
 *.xlw
-*.xmcdz
 *.xml
-*.xoj
-*.xopp
 *.xqt
 *.xrt
-*.xx
 *.xys
 *.xz
-*.xzm
-*.y
-*.yc
 *.ygh
-*.yz1
 *.z
-*.z00
-*.z01
-*.z02
-*.z03
-*.z04
-*.zabw
-*.zap
-*.zed
-*.zfsendtotarget
-*.zhelp
-*.zi
-*.zi_
-*.zim
 *.zip
 *.zipx
-*.zix
-*.zl
 *.zl9
 *.zoo
-*.zpaq
-*.zpi
-*.zsplit
-*.zst
-*.zw
-*.zwi
-*.zz
+*sample.avchd
+*sample.avi
+*sample.mkv
+*sample.mov
+*sample.mp4
+*sample.webm
+*sample.wmv
 Trailer.*
 VOSTFR
 api

blacklist_permissive

@@ -1,410 +1,53 @@
-*.000
 *.001
-*.002
-*.004
-*.7z
-*.7z.001
-*.7z.002
-*.a00
-*.a01
-*.a02
-*.ace
-*.ain
-*.alz
-*.ana
-*.apex
 *.apk
-*.apz
-*.ar
-*.arc
-*.archiver
-*.arduboy
-*.arh
-*.ari
 *.arj
-*.ark
-*.asice
-*.ayt
-*.b1
-*.b6z
-*.b64
-*.ba
 *.bat
-*.bdoc
-*.bh
 *.bin
 *.bmp
-*.bndl
-*.boo
-*.bundle
-*.bz
-*.bz2
-*.bza
-*.bzabw
-*.bzip
-*.bzip2
-*.c00
-*.c01
-*.c02
-*.c10
-*.car
-*.cb7
-*.cba
-*.cbr
-*.cbt
-*.cbz
-*.cdz
-*.cit
 *.cmd
 *.com
-*.comppkg.hauptwerk.rar
-*.comppkg_hauptwerk_rar
-*.conda
-*.cp9
-*.cpgz
-*.cpt
-*.ctx
-*.ctz
-*.cxarchive
-*.czip
-*.daf
-*.dar
 *.db
-*.dd
-*.deb
-*.dgc
-*.dist
 *.diz
-*.dl_
 *.dll
 *.dmg
-*.dz
-*.ecar
-*.ecs
-*.ecsbx
-*.edz
-*.efw
-*.egg
-*.epi
 *.etc
 *.exe
-*.f
-*.f3z
-*.fcx
-*.fp8
-*.fzpz
-*.gar
-*.gca
 *.gif
-*.gmz
-*.gz
-*.gz2
-*.gza
-*.gzi
-*.gzip
-*.ha
-*.hbc
-*.hbc2
-*.hbe
-*.hki
-*.hki1
-*.hki2
-*.hki3
-*.hpk
-*.hpkg
 *.htm
 *.html
-*.htmi
-*.hyp
-*.iadproj
-*.ice
 *.ico
 *.ini
-*.ipg
-*.ipk
-*.ish
 *.iso
-*.isx
-*.ita
-*.ize
-*.j
 *.jar
-*.jar.pack
-*.jex
-*.jgz
-*.jhh
-*.jic
 *.jpg
 *.js
-*.jsonlz4
-*.kextraction
-*.kgb
-*.ksp
-*.kwgt
-*.kz
-*.layout
-*.lbr
-*.lemon
-*.lha
-*.lhzd
-*.libzip
 *.link
 *.lnk
-*.lpkg
-*.lqr
-*.lz
-*.lz4
-*.lzh
-*.lzm
-*.lzma
-*.lzo
-*.lzr
-*.lzx
-*.mar
-*.mbz
-*.md
-*.memo
-*.mint
-*.mlproj
-*.mou
-*.movpkg
-*.mozlz4
-*.mpkg
 *.msi
-*.mxc
-*.mzp
-*.nar
-*.nex
 *.nfo
-*.npk
-*.nz
-*.oar
-*.odlgz
-*.opk
-*.osf
-*.oz
-*.p01
-*.p19
-*.p7z
-*.pa
-*.pack.gz
-*.package
-*.pae
-*.pak
-*.paq6
-*.paq7
-*.paq8
-*.paq8f
-*.paq8l
-*.paq8p
-*.par
-*.par2
-*.pax
-*.pbi
-*.pcv
-*.pea
 *.perl
-*.pet
-*.pf
 *.php
-*.pim
-*.pima
-*.pit
-*.piz
-*.pkg
-*.pkg.tar.xz
-*.pkg.tar.zst
-*.pkz
 *.pl
 *.png
-*.prs
 *.ps1
 *.psc1
 *.psd1
 *.psm1
-*.psz
-*.pup
-*.puz
-*.pvmp
-*.pvmz
-*.pwa
-*.pxl
 *.py
 *.pyd
-*.q
-*.qda
-*.r0
-*.r00
-*.r01
-*.r02
-*.r03
-*.r04
-*.r1
-*.r2
-*.r21
-*.r30
-*.rar
 *.rb
 *.readme
 *.reg
-*.rev
-*.rk
-*.rnc
-*.rp9
-*.rpm
-*.rss
 *.run
-*.rz
-*.s00
-*.s01
-*.s02
-*.s09
-*.s7z
-*.sar
-*.sbx
 *.scr
-*.sdc
-*.sdn
-*.sdoc
-*.sdocx
-*.sea
-*.sen
-*.sfg
-*.sfm
-*.sfs
-*.sfx
 *.sh
-*.shar
-*.shk
-*.shr
-*.sifz
-*.sipa
-*.sit
-*.sitx
-*.smpf
-*.snagitstamps
-*.snappy
-*.snb
-*.snz
-*.spa
-*.spd
-*.spl
-*.spm
-*.spt
 *.sql
-*.sqf
-*.sqx
-*.sqz
-*.srep
-*.stg
-*.stkdoodlz
-*.stproj
-*.sy_
-*.tar.bz2
-*.tar.gz
-*.tar.gz2
-*.tar.lz
-*.tar.lzma
-*.tar.xz
-*.tar.z
-*.tar.zip
-*.taz
-*.tbz
-*.tbz2
-*.tcx
 *.text
-*.tg
-*.tgs
-*.tgz
 *.thumb
-*.tlz
-*.tlzma
 *.torrent
-*.tpsr
-*.trs
 *.txt
-*.tx_
-*.txz
-*.tz
-*.tzst
-*.ubz
-*.uc2
-*.ufdr
-*.ufs.uzip
-*.uha
 *.url
-*.uue
-*.uvm
-*.uzed
-*.uzip
 *.vbs
-*.vem
-*.vfs
-*.vib
-*.vip
-*.vmcz
-*.vms
-*.voca
-*.vpk
-*.vrpackage
-*.vsi
-*.vwi
-*.wa
-*.wacz
-*.waff
-*.war
-*.wastickers
-*.wdz
-*.whl
-*.wick
-*.wlb
-*.wot
 *.wsf
-*.wux
-*.xapk
-*.xar
-*.xcf.bz2
-*.xcf.gz
-*.xcf.xz
-*.xcfbz2
-*.xcfgz
-*.xcfxz
-*.xez
-*.xfp
-*.xip
 *.xml
-*.xmcdz
-*.xoj
-*.xopp
-*.xx
-*.xz
-*.xzm
-*.y
-*.yc
-*.yz1
-*.z
-*.z00
-*.z01
-*.z02
-*.z03
-*.z04
-*.zabw
-*.zap
-*.zed
-*.zfsendtotarget
-*.zhelp
-*.zi
-*.zi_
-*.zim
-*.zip
-*.zipx
-*.zix
-*.zl
-*.zoo
-*.zpaq
-*.zpi
-*.zsplit
-*.zst
-*.zw
-*.zwi
-*.zz
+*.zipx

code/Dockerfile

@@ -45,7 +45,6 @@ FROM mcr.microsoft.com/dotnet/aspnet:9.0-bookworm-slim
 
 # Install required packages for user management and timezone support
 RUN apt-get update && apt-get install -y \
-    curl \
     tzdata \
     gosu \
     && rm -rf /var/lib/apt/lists/*

code/backend/Cleanuparr.Api/Controllers/EventsController.cs

@@ -87,6 +87,10 @@ public class EventsController : ControllerBase
             .Take(pageSize)
             .ToListAsync();
 
+        events = events
+            .OrderBy(e => e.Timestamp)
+            .ToList();
+
         // Return paginated result
         var result = new PaginatedResult<AppEvent>
         {

code/backend/Cleanuparr.Api/Controllers/HealthController.cs

@@ -1,125 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-
-namespace Cleanuparr.Api.Controllers;
-
-/// <summary>
-/// Health check endpoints for Docker and Kubernetes
-/// </summary>
-[ApiController]
-[Route("[controller]")]
-public class HealthController : ControllerBase
-{
-    private readonly HealthCheckService _healthCheckService;
-    private readonly ILogger<HealthController> _logger;
-
-    public HealthController(HealthCheckService healthCheckService, ILogger<HealthController> logger)
-    {
-        _healthCheckService = healthCheckService;
-        _logger = logger;
-    }
-
-    /// <summary>
-    /// Basic liveness probe - checks if the application is running
-    /// Used by Docker HEALTHCHECK and Kubernetes liveness probes
-    /// </summary>
-    [HttpGet]
-    [Route("/health")]
-    public async Task<IActionResult> GetHealth()
-    {
-        try
-        {
-            var result = await _healthCheckService.CheckHealthAsync(
-                registration => registration.Tags.Contains("liveness"));
-            
-            return result.Status == HealthStatus.Healthy 
-                ? Ok(new { status = "healthy", timestamp = DateTime.UtcNow })
-                : StatusCode(503, new { status = "unhealthy", timestamp = DateTime.UtcNow });
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Health check failed");
-            return StatusCode(503, new { status = "unhealthy", error = "Health check failed", timestamp = DateTime.UtcNow });
-        }
-    }
-
-    /// <summary>
-    /// Readiness probe - checks if the application is ready to serve traffic
-    /// Used by Kubernetes readiness probes
-    /// </summary>
-    [HttpGet]
-    [Route("/health/ready")]
-    public async Task<IActionResult> GetReadiness()
-    {
-        try
-        {
-            var result = await _healthCheckService.CheckHealthAsync(
-                registration => registration.Tags.Contains("readiness"));
-            
-            if (result.Status == HealthStatus.Healthy)
-            {
-                return Ok(new { status = "ready", timestamp = DateTime.UtcNow });
-            }
-            
-            // For readiness, we consider degraded as not ready
-            return StatusCode(503, new { 
-                status = "not_ready", 
-                timestamp = DateTime.UtcNow,
-                details = result.Entries.Where(e => e.Value.Status != HealthStatus.Healthy)
-                    .ToDictionary(e => e.Key, e => new { 
-                        status = e.Value.Status.ToString().ToLowerInvariant(),
-                        description = e.Value.Description 
-                    })
-            });
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Readiness check failed");
-            return StatusCode(503, new { status = "not_ready", error = "Readiness check failed", timestamp = DateTime.UtcNow });
-        }
-    }
-
-    /// <summary>
-    /// Detailed health status - for monitoring and debugging
-    /// </summary>
-    [HttpGet]
-    [Route("/health/detailed")]
-    public async Task<IActionResult> GetDetailedHealth()
-    {
-        try
-        {
-            var result = await _healthCheckService.CheckHealthAsync();
-            
-            var response = new
-            {
-                status = result.Status.ToString().ToLowerInvariant(),
-                timestamp = DateTime.UtcNow,
-                totalDuration = result.TotalDuration.TotalMilliseconds,
-                entries = result.Entries.ToDictionary(
-                    e => e.Key,
-                    e => new
-                    {
-                        status = e.Value.Status.ToString().ToLowerInvariant(),
-                        description = e.Value.Description,
-                        duration = e.Value.Duration.TotalMilliseconds,
-                        tags = e.Value.Tags,
-                        data = e.Value.Data,
-                        exception = e.Value.Exception?.Message
-                    })
-            };
-
-            return result.Status == HealthStatus.Healthy 
-                ? Ok(response)
-                : StatusCode(503, response);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Detailed health check failed");
-            return StatusCode(503, new { 
-                status = "unhealthy", 
-                error = "Detailed health check failed", 
-                timestamp = DateTime.UtcNow 
-            });
-        }
-    }
-} 

code/backend/Cleanuparr.Api/Controllers/JobsController.cs

@@ -1,6 +1,6 @@
 using Cleanuparr.Api.Models;
 using Cleanuparr.Infrastructure.Models;
-using Cleanuparr.Infrastructure.Services.Interfaces;
+using Infrastructure.Services.Interfaces;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Cleanuparr.Api.Controllers;

code/backend/Cleanuparr.Api/Controllers/StatusController.cs

@@ -52,10 +52,6 @@ public class StatusController : ControllerBase
                 .Include(x => x.Instances)
                 .AsNoTracking()
                 .FirstAsync(x => x.Type == InstanceType.Lidarr);
-            var readarrConfig = await _dataContext.ArrConfigs
-                .Include(x => x.Instances)
-                .AsNoTracking()
-                .FirstAsync(x => x.Type == InstanceType.Readarr);
             
             var status = new
             {
@@ -84,10 +80,6 @@ public class StatusController : ControllerBase
                     Lidarr = new
                     {
                         InstanceCount = lidarrConfig.Instances.Count
-                    },
-                    Readarr = new
-                    {
-                        InstanceCount = readarrConfig.Instances.Count
                     }
                 }
             };

code/backend/Cleanuparr.Api/DependencyInjection/ApiDI.cs

@@ -40,6 +40,9 @@ public static class ApiDI
         // Add health status broadcaster
         services.AddHostedService<HealthStatusBroadcaster>();
         
+        // Add logging initializer service
+        services.AddHostedService<LoggingInitializer>();
+        
         services.AddSwaggerGen(options =>
         {
             options.SwaggerDoc("v1", new OpenApiInfo
@@ -139,38 +142,6 @@ public static class ApiDI
         // Map SignalR hubs
         app.MapHub<HealthStatusHub>("/api/hubs/health");
         app.MapHub<AppHub>("/api/hubs/app");
-        
-        app.MapGet("/manifest.webmanifest", (HttpContext context) =>
-        {
-            var basePath = context.Request.PathBase.HasValue
-                ? context.Request.PathBase.Value
-                : "/";
-
-            var manifest = new
-            {
-                name = "Cleanuparr",
-                short_name = "Cleanuparr",
-                start_url = basePath,
-                display = "standalone",
-                background_color = "#ffffff",
-                theme_color = "#ffffff",
-                icons = new[]
-                {
-                    new {
-                        src = "assets/icons/icon-192x192.png",
-                        sizes = "192x192",
-                        type = "image/png"
-                    },
-                    new {
-                        src = "assets/icons/icon-512x512.png",
-                        sizes = "512x512",
-                        type = "image/png"
-                    }
-                }
-            };
-
-            return Results.Json(manifest, contentType: "application/manifest+json");
-        });
 
         return app;
     }

code/backend/Cleanuparr.Api/DependencyInjection/LoggingDI.cs

@@ -1,5 +1,10 @@
-using Cleanuparr.Infrastructure.Logging;
+using Cleanuparr.Domain.Enums;
+using Cleanuparr.Infrastructure.Models;
+using Cleanuparr.Shared.Helpers;
 using Serilog;
+using Serilog.Events;
+using Serilog.Templates;
+using Serilog.Templates.Themes;
 
 namespace Cleanuparr.Api.DependencyInjection;
 
@@ -7,10 +12,82 @@ public static class LoggingDI
 {
     public static ILoggingBuilder AddLogging(this ILoggingBuilder builder)
     {
-        Log.Logger = LoggingConfigManager
-            .CreateLoggerConfiguration()
-            .CreateLogger();
+        Log.Logger = GetDefaultLoggerConfiguration().CreateLogger();
         
         return builder.ClearProviders().AddSerilog();
     }
+
+    public static LoggerConfiguration GetDefaultLoggerConfiguration()
+    {
+        LoggerConfiguration logConfig = new();
+        const string categoryTemplate = "{#if Category is not null} {Concat('[',Category,']'),CAT_PAD}{#end}";
+        const string jobNameTemplate = "{#if JobName is not null} {Concat('[',JobName,']'),JOB_PAD}{#end}";
+
+        const string consoleOutputTemplate = $"[{{@t:yyyy-MM-dd HH:mm:ss.fff}} {{@l:u3}}]{jobNameTemplate}{categoryTemplate} {{@m}}\n{{@x}}";
+        const string fileOutputTemplate = $"{{@t:yyyy-MM-dd HH:mm:ss.fff zzz}} [{{@l:u3}}]{jobNameTemplate}{categoryTemplate} {{@m:lj}}\n{{@x}}";
+
+        // Determine job name padding
+        List<string> jobNames = [nameof(JobType.QueueCleaner), nameof(JobType.ContentBlocker), nameof(JobType.DownloadCleaner)];
+        int jobPadding = jobNames.Max(x => x.Length) + 2;
+
+        // Determine instance name padding
+        List<string> categoryNames = [
+            InstanceType.Sonarr.ToString(),
+            InstanceType.Radarr.ToString(),
+            InstanceType.Lidarr.ToString(),
+            InstanceType.Readarr.ToString(),
+            InstanceType.Whisparr.ToString(),
+            "SYSTEM"
+        ];
+        int catPadding = categoryNames.Max(x => x.Length) + 2;
+
+        // Apply padding values to templates
+        string consoleTemplate = consoleOutputTemplate
+            .Replace("JOB_PAD", jobPadding.ToString())
+            .Replace("CAT_PAD", catPadding.ToString());
+
+        string fileTemplate = fileOutputTemplate
+            .Replace("JOB_PAD", jobPadding.ToString())
+            .Replace("CAT_PAD", catPadding.ToString());
+
+        // Configure base logger with dynamic level control
+        logConfig
+            .MinimumLevel.Is(LogEventLevel.Information)
+            .Enrich.FromLogContext()
+            .WriteTo.Console(new ExpressionTemplate(consoleTemplate, theme: TemplateTheme.Literate));
+        
+        // Create the logs directory
+        string logsPath = Path.Combine(ConfigurationPathProvider.GetConfigPath(), "logs");
+        if (!Directory.Exists(logsPath))
+        {
+            try
+            {
+                Directory.CreateDirectory(logsPath);
+            }
+            catch (Exception exception)
+            {
+                throw new Exception($"Failed to create log directory | {logsPath}", exception);
+            }
+        }
+
+        // Add main log file
+        logConfig.WriteTo.File(
+            path: Path.Combine(logsPath, "cleanuparr-.txt"),
+            formatter: new ExpressionTemplate(fileTemplate),
+            fileSizeLimitBytes: 10L * 1024 * 1024,
+            rollingInterval: RollingInterval.Day,
+            rollOnFileSizeLimit: true,
+            shared: true
+        );
+
+        logConfig
+            .MinimumLevel.Override("MassTransit", LogEventLevel.Warning)
+            .MinimumLevel.Override("Microsoft.Hosting.Lifetime", LogEventLevel.Information)
+            .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
+            .MinimumLevel.Override("Quartz", LogEventLevel.Warning)
+            .MinimumLevel.Override("System.Net.Http.HttpClient", LogEventLevel.Error)
+            .Enrich.WithProperty("ApplicationName", "Cleanuparr");
+
+        return logConfig;
+    }
 }

code/backend/Cleanuparr.Api/DependencyInjection/MainDI.cs

@@ -1,13 +1,11 @@
 using System.Text.Json.Serialization;
-using Cleanuparr.Domain.Entities.Arr;
-using Cleanuparr.Infrastructure.Features.DownloadHunter.Consumers;
 using Cleanuparr.Infrastructure.Features.DownloadRemover.Consumers;
 using Cleanuparr.Infrastructure.Features.Notifications.Consumers;
-using Cleanuparr.Infrastructure.Features.Notifications.Models;
 using Cleanuparr.Infrastructure.Health;
 using Cleanuparr.Infrastructure.Http;
 using Cleanuparr.Infrastructure.Http.DynamicHttpClientSystem;
 using Data.Models.Arr;
+using Infrastructure.Verticals.Notifications.Models;
 using MassTransit;
 using Microsoft.Extensions.Caching.Memory;
 
@@ -17,26 +15,22 @@ public static class MainDI
 {
     public static IServiceCollection AddInfrastructure(this IServiceCollection services, IConfiguration configuration) =>
         services
+            .AddLogging(builder => builder.ClearProviders().AddConsole())
             .AddHttpClients(configuration)
             .AddSingleton<MemoryCache>()
             .AddSingleton<IMemoryCache>(serviceProvider => serviceProvider.GetRequiredService<MemoryCache>())
             .AddServices()
             .AddHealthServices()
             .AddQuartzServices(configuration)
-            .AddNotifications()
+            .AddNotifications(configuration)
             .AddMassTransit(config =>
             {
-                config.DisableUsageTelemetry();
-                
                 config.AddConsumer<DownloadRemoverConsumer<SearchItem>>();
-                config.AddConsumer<DownloadRemoverConsumer<SeriesSearchItem>>();
-                config.AddConsumer<DownloadHunterConsumer<SearchItem>>();
-                config.AddConsumer<DownloadHunterConsumer<SeriesSearchItem>>();
+                config.AddConsumer<DownloadRemoverConsumer<SonarrSearchItem>>();
                 
                 config.AddConsumer<NotificationConsumer<FailedImportStrikeNotification>>();
                 config.AddConsumer<NotificationConsumer<StalledStrikeNotification>>();
-                config.AddConsumer<NotificationConsumer<SlowSpeedStrikeNotification>>();
-                config.AddConsumer<NotificationConsumer<SlowTimeStrikeNotification>>();
+                config.AddConsumer<NotificationConsumer<SlowStrikeNotification>>();
                 config.AddConsumer<NotificationConsumer<QueueItemDeletedNotification>>();
                 config.AddConsumer<NotificationConsumer<DownloadCleanedNotification>>();
                 config.AddConsumer<NotificationConsumer<CategoryChangedNotification>>();
@@ -54,15 +48,7 @@ public static class MainDI
                     cfg.ReceiveEndpoint("download-remover-queue", e =>
                     {
                         e.ConfigureConsumer<DownloadRemoverConsumer<SearchItem>>(context);
-                        e.ConfigureConsumer<DownloadRemoverConsumer<SeriesSearchItem>>(context);
-                        e.ConcurrentMessageLimit = 2;
-                        e.PrefetchCount = 2;
-                    });
-                    
-                    cfg.ReceiveEndpoint("download-hunter-queue", e =>
-                    {
-                        e.ConfigureConsumer<DownloadHunterConsumer<SearchItem>>(context);
-                        e.ConfigureConsumer<DownloadHunterConsumer<SeriesSearchItem>>(context);
+                        e.ConfigureConsumer<DownloadRemoverConsumer<SonarrSearchItem>>(context);
                         e.ConcurrentMessageLimit = 1;
                         e.PrefetchCount = 1;
                     });
@@ -71,8 +57,7 @@ public static class MainDI
                     {
                         e.ConfigureConsumer<NotificationConsumer<FailedImportStrikeNotification>>(context);
                         e.ConfigureConsumer<NotificationConsumer<StalledStrikeNotification>>(context);
-                        e.ConfigureConsumer<NotificationConsumer<SlowSpeedStrikeNotification>>(context);
-                        e.ConfigureConsumer<NotificationConsumer<SlowTimeStrikeNotification>>(context);
+                        e.ConfigureConsumer<NotificationConsumer<SlowStrikeNotification>>(context);
                         e.ConfigureConsumer<NotificationConsumer<QueueItemDeletedNotification>>(context);
                         e.ConfigureConsumer<NotificationConsumer<DownloadCleanedNotification>>(context);
                         e.ConfigureConsumer<NotificationConsumer<CategoryChangedNotification>>(context);
@@ -98,17 +83,9 @@ public static class MainDI
     /// </summary>
     private static IServiceCollection AddHealthServices(this IServiceCollection services) =>
         services
-            // Register the existing health check service for download clients
+            // Register the health check service
             .AddSingleton<IHealthCheckService, HealthCheckService>()
             
             // Register the background service for periodic health checks
-            .AddHostedService<HealthCheckBackgroundService>()
-            
-            // Add ASP.NET Core health checks
-            .AddHealthChecks()
-                .AddCheck<ApplicationHealthCheck>("application", tags: ["liveness"])
-                .AddCheck<DatabaseHealthCheck>("database", tags: ["readiness"])
-                .AddCheck<FileSystemHealthCheck>("filesystem", tags: ["readiness"])
-                .AddCheck<DownloadClientsHealthCheck>("download_clients", tags: ["readiness"])
-            .Services;
+            .AddHostedService<HealthCheckBackgroundService>();
 }

code/backend/Cleanuparr.Api/DependencyInjection/NotificationsDI.cs

@@ -1,20 +1,20 @@
 using Cleanuparr.Infrastructure.Features.Notifications;
 using Cleanuparr.Infrastructure.Features.Notifications.Apprise;
 using Cleanuparr.Infrastructure.Features.Notifications.Notifiarr;
-using Cleanuparr.Infrastructure.Features.Notifications.Ntfy;
+using Infrastructure.Verticals.Notifications;
 
 namespace Cleanuparr.Api.DependencyInjection;
 
 public static class NotificationsDI
 {
-    public static IServiceCollection AddNotifications(this IServiceCollection services) =>
+    public static IServiceCollection AddNotifications(this IServiceCollection services, IConfiguration configuration) =>
         services
-            .AddScoped<INotifiarrProxy, NotifiarrProxy>()
-            .AddScoped<IAppriseProxy, AppriseProxy>()
-            .AddScoped<INtfyProxy, NtfyProxy>()
-            .AddScoped<INotificationConfigurationService, NotificationConfigurationService>()
-            .AddScoped<INotificationProviderFactory, NotificationProviderFactory>()
-            .AddScoped<NotificationProviderFactory>()
-            .AddScoped<INotificationPublisher, NotificationPublisher>()
-            .AddScoped<NotificationService>();
+            // Notification configs are now managed through ConfigManager
+            .AddTransient<INotifiarrProxy, NotifiarrProxy>()
+            .AddTransient<INotificationProvider, NotifiarrProvider>()
+            .AddTransient<IAppriseProxy, AppriseProxy>()
+            .AddTransient<INotificationProvider, AppriseProvider>()
+            .AddTransient<INotificationPublisher, NotificationPublisher>()
+            .AddTransient<INotificationFactory, NotificationFactory>()
+            .AddTransient<NotificationService>();
 }

code/backend/Cleanuparr.Api/DependencyInjection/ServicesDI.cs

@@ -1,24 +1,20 @@
-using Cleanuparr.Application.Features.BlacklistSync;
+using Cleanuparr.Application.Features.ContentBlocker;
 using Cleanuparr.Application.Features.DownloadCleaner;
-using Cleanuparr.Application.Features.DownloadClient;
-using Cleanuparr.Application.Features.MalwareBlocker;
 using Cleanuparr.Application.Features.QueueCleaner;
 using Cleanuparr.Infrastructure.Events;
 using Cleanuparr.Infrastructure.Features.Arr;
+using Cleanuparr.Infrastructure.Features.ContentBlocker;
 using Cleanuparr.Infrastructure.Features.DownloadClient;
-using Cleanuparr.Infrastructure.Features.DownloadHunter;
-using Cleanuparr.Infrastructure.Features.DownloadHunter.Interfaces;
 using Cleanuparr.Infrastructure.Features.DownloadRemover;
 using Cleanuparr.Infrastructure.Features.DownloadRemover.Interfaces;
 using Cleanuparr.Infrastructure.Features.Files;
 using Cleanuparr.Infrastructure.Features.ItemStriker;
-using Cleanuparr.Infrastructure.Features.MalwareBlocker;
 using Cleanuparr.Infrastructure.Features.Security;
-using Cleanuparr.Infrastructure.Helpers;
 using Cleanuparr.Infrastructure.Interceptors;
 using Cleanuparr.Infrastructure.Services;
-using Cleanuparr.Infrastructure.Services.Interfaces;
 using Cleanuparr.Persistence;
+using Infrastructure.Interceptors;
+using Infrastructure.Services.Interfaces;
 using Infrastructure.Verticals.Files;
 
 namespace Cleanuparr.Api.DependencyInjection;
@@ -27,34 +23,31 @@ public static class ServicesDI
 {
     public static IServiceCollection AddServices(this IServiceCollection services) =>
         services
-            .AddScoped<IEncryptionService, AesEncryptionService>()
-            .AddScoped<SensitiveDataJsonConverter>()
-            .AddScoped<EventsContext>()
-            .AddScoped<DataContext>()
-            .AddScoped<EventPublisher>()
+            .AddSingleton<IEncryptionService, AesEncryptionService>()
+            .AddTransient<SensitiveDataJsonConverter>()
+            .AddTransient<EventsContext>()
+            .AddTransient<DataContext>()
+            .AddTransient<EventPublisher>()
             .AddHostedService<EventCleanupService>()
-            .AddScoped<IDryRunInterceptor, DryRunInterceptor>()
-            .AddScoped<CertificateValidationService>()
-            .AddScoped<SonarrClient>()
-            .AddScoped<RadarrClient>()
-            .AddScoped<LidarrClient>()
-            .AddScoped<ReadarrClient>()
-            .AddScoped<WhisparrClient>()
-            .AddScoped<ArrClientFactory>()
-            .AddScoped<QueueCleaner>()
-            .AddScoped<BlacklistSynchronizer>()
-            .AddScoped<MalwareBlocker>()
-            .AddScoped<DownloadCleaner>()
-            .AddScoped<IQueueItemRemover, QueueItemRemover>()
-            .AddScoped<IDownloadHunter, DownloadHunter>()
-            .AddScoped<IFilenameEvaluator, FilenameEvaluator>()
-            .AddScoped<IHardLinkFileService, HardLinkFileService>()
-            .AddScoped<UnixHardLinkFileService>()
-            .AddScoped<WindowsHardLinkFileService>()
-            .AddScoped<ArrQueueIterator>()
-            .AddScoped<DownloadServiceFactory>()
-            .AddScoped<IStriker, Striker>()
-            .AddScoped<FileReader>()
+            // API services
             .AddSingleton<IJobManagementService, JobManagementService>()
+            // Core services
+            .AddTransient<IDryRunInterceptor, DryRunInterceptor>()
+            .AddTransient<CertificateValidationService>()
+            .AddTransient<SonarrClient>()
+            .AddTransient<RadarrClient>()
+            .AddTransient<LidarrClient>()
+            .AddTransient<ArrClientFactory>()
+            .AddTransient<QueueCleaner>()
+            .AddTransient<ContentBlocker>()
+            .AddTransient<DownloadCleaner>()
+            .AddTransient<IQueueItemRemover, QueueItemRemover>()
+            .AddTransient<IFilenameEvaluator, FilenameEvaluator>()
+            .AddTransient<IHardLinkFileService, HardLinkFileService>()
+            .AddTransient<UnixHardLinkFileService>()
+            .AddTransient<WindowsHardLinkFileService>()
+            .AddTransient<ArrQueueIterator>()
+            .AddTransient<DownloadServiceFactory>()
+            .AddTransient<IStriker, Striker>()
             .AddSingleton<BlocklistProvider>();
 }

code/backend/Cleanuparr.Api/HealthCheckResponseWriter.cs

@@ -1,28 +0,0 @@
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using System.Text;
-
-namespace Cleanuparr.Api;
-
-/// <summary>
-/// Custom health check response writers for different formats
-/// </summary>
-public static class HealthCheckResponseWriter
-{
-    /// <summary>
-    /// Writes a minimal plain text response suitable for Docker health checks
-    /// </summary>
-    public static async Task WriteMinimalPlaintext(HttpContext context, HealthReport report)
-    {
-        context.Response.ContentType = "text/plain";
-        
-        var status = report.Status switch
-        {
-            HealthStatus.Healthy => "healthy",
-            HealthStatus.Degraded => "degraded", 
-            HealthStatus.Unhealthy => "unhealthy",
-            _ => "unknown"
-        };
-
-        await context.Response.WriteAsync(status, Encoding.UTF8);
-    }
-} 

code/backend/Cleanuparr.Api/HostExtensions.cs

@@ -6,7 +6,7 @@ namespace Cleanuparr.Api;
 
 public static class HostExtensions
 {
-    public static async Task<IHost> InitAsync(this WebApplication app)
+    public static async Task<IHost> Init(this WebApplication app)
     {
         ILogger<Program> logger = app.Services.GetRequiredService<ILogger<Program>>();
 
@@ -20,25 +20,19 @@ public static class HostExtensions
         
         logger.LogInformation("timezone: {tz}", TimeZoneInfo.Local.DisplayName);
         
-        return app;
-    }
-
-    public static async Task<WebApplicationBuilder> InitAsync(this WebApplicationBuilder builder)
-    {
-        // Apply events db migrations
-        await using var eventsContext = EventsContext.CreateStaticInstance();
+        // Apply db migrations
+        var eventsContext = app.Services.GetRequiredService<EventsContext>();
         if ((await eventsContext.Database.GetPendingMigrationsAsync()).Any())
         {
             await eventsContext.Database.MigrateAsync();
         }
 
-        // Apply data db migrations
-        await using var configContext = DataContext.CreateStaticInstance();
+        var configContext = app.Services.GetRequiredService<DataContext>();
         if ((await configContext.Database.GetPendingMigrationsAsync()).Any())
         {
             await configContext.Database.MigrateAsync();
         }
         
-        return builder;
+        return app;
     }
 }

code/backend/Cleanuparr.Api/Jobs/BackgroundJobManager.cs

@@ -1,17 +1,13 @@
-using Cleanuparr.Application.Features.BlacklistSync;
+using Cleanuparr.Application.Features.ContentBlocker;
 using Cleanuparr.Application.Features.DownloadCleaner;
-using Cleanuparr.Application.Features.DownloadClient;
-using Cleanuparr.Application.Features.MalwareBlocker;
 using Cleanuparr.Application.Features.QueueCleaner;
 using Cleanuparr.Domain.Exceptions;
 using Cleanuparr.Infrastructure.Features.Jobs;
 using Cleanuparr.Persistence;
 using Cleanuparr.Persistence.Models.Configuration;
+using Cleanuparr.Persistence.Models.Configuration.ContentBlocker;
 using Cleanuparr.Persistence.Models.Configuration.DownloadCleaner;
-using Cleanuparr.Persistence.Models.Configuration.MalwareBlocker;
 using Cleanuparr.Persistence.Models.Configuration.QueueCleaner;
-using Cleanuparr.Persistence.Models.Configuration.General;
-using Cleanuparr.Persistence.Models.Configuration.BlacklistSync;
 using Cleanuparr.Shared.Helpers;
 using Microsoft.EntityFrameworkCore;
 using Quartz;
@@ -26,18 +22,18 @@ namespace Cleanuparr.Api.Jobs;
 public class BackgroundJobManager : IHostedService
 {
     private readonly ISchedulerFactory _schedulerFactory;
-    private readonly IServiceScopeFactory _scopeFactory;
+    private readonly DataContext _dataContext;
     private readonly ILogger<BackgroundJobManager> _logger;
     private IScheduler? _scheduler;
 
     public BackgroundJobManager(
         ISchedulerFactory schedulerFactory,
-        IServiceScopeFactory scopeFactory,
+        DataContext dataContext,
         ILogger<BackgroundJobManager> logger
     )
     {
         _schedulerFactory = schedulerFactory;
-        _scopeFactory = scopeFactory;
+        _dataContext = dataContext;
         _logger = logger;
     }
 
@@ -49,12 +45,12 @@ public class BackgroundJobManager : IHostedService
     {
         try
         {
-            _logger.LogDebug("Starting BackgroundJobManager");
+            _logger.LogInformation("Starting BackgroundJobManager");
             _scheduler = await _schedulerFactory.GetScheduler(cancellationToken);
         
             await InitializeJobsFromConfiguration(cancellationToken);
         
-            _logger.LogDebug("BackgroundJobManager started");
+            _logger.LogInformation("BackgroundJobManager started");
         }
         catch (Exception ex)
         {
@@ -68,15 +64,15 @@ public class BackgroundJobManager : IHostedService
     /// </summary>
     public async Task StopAsync(CancellationToken cancellationToken)
     {
-        _logger.LogDebug("Stopping BackgroundJobManager");
+        _logger.LogInformation("Stopping BackgroundJobManager");
         
         if (_scheduler != null)
         {
-            // Don't shut down the scheduler as it's managed by QuartzHostedService
+            // Don't shutdown the scheduler as it's managed by QuartzHostedService
             await _scheduler.Standby(cancellationToken);
         }
         
-        _logger.LogDebug("BackgroundJobManager stopped");
+        _logger.LogInformation("BackgroundJobManager stopped");
     }
     
     /// <summary>
@@ -90,28 +86,21 @@ public class BackgroundJobManager : IHostedService
             throw new InvalidOperationException("Scheduler not initialized");
         }
         
-        await using var scope = _scopeFactory.CreateAsyncScope();
-        await using var dataContext = scope.ServiceProvider.GetRequiredService<DataContext>();
-        
         // Get configurations from db
-        QueueCleanerConfig queueCleanerConfig = await dataContext.QueueCleanerConfigs
+        QueueCleanerConfig queueCleanerConfig = await _dataContext.QueueCleanerConfigs
             .AsNoTracking()
             .FirstAsync(cancellationToken);
-        ContentBlockerConfig malwareBlockerConfig = await dataContext.ContentBlockerConfigs
+        ContentBlockerConfig contentBlockerConfig = await _dataContext.ContentBlockerConfigs
             .AsNoTracking()
             .FirstAsync(cancellationToken);
-        DownloadCleanerConfig downloadCleanerConfig = await dataContext.DownloadCleanerConfigs
-            .AsNoTracking()
-            .FirstAsync(cancellationToken);
-        BlacklistSyncConfig blacklistSyncConfig = await dataContext.BlacklistSyncConfigs
+        DownloadCleanerConfig downloadCleanerConfig = await _dataContext.DownloadCleanerConfigs
             .AsNoTracking()
             .FirstAsync(cancellationToken);
         
         // Always register jobs, regardless of enabled status
         await RegisterQueueCleanerJob(queueCleanerConfig, cancellationToken);
-        await RegisterMalwareBlockerJob(malwareBlockerConfig, cancellationToken);
+        await RegisterContentBlockerJob(contentBlockerConfig, cancellationToken);
         await RegisterDownloadCleanerJob(downloadCleanerConfig, cancellationToken);
-        await RegisterBlacklistSyncJob(blacklistSyncConfig, cancellationToken);
     }
     
     /// <summary>
@@ -127,24 +116,24 @@ public class BackgroundJobManager : IHostedService
         // Only add triggers if the job is enabled
         if (config.Enabled)
         {
-            await AddTriggersForJob<QueueCleaner>(config.CronExpression, cancellationToken);
+            await AddTriggersForJob<QueueCleaner>(config, config.CronExpression, cancellationToken);
         }
     }
     
     /// <summary>
     /// Registers the QueueCleaner job and optionally adds triggers based on configuration.
     /// </summary>
-    public async Task RegisterMalwareBlockerJob(
+    public async Task RegisterContentBlockerJob(
         ContentBlockerConfig config, 
         CancellationToken cancellationToken = default)
     {
         // Always register the job definition
-        await AddJobWithoutTrigger<MalwareBlocker>(cancellationToken);
+        await AddJobWithoutTrigger<ContentBlocker>(cancellationToken);
         
         // Only add triggers if the job is enabled
         if (config.Enabled)
         {
-            await AddTriggersForJob<MalwareBlocker>(config.CronExpression, cancellationToken);
+            await AddTriggersForJob<ContentBlocker>(config, config.CronExpression, cancellationToken);
         }
     }
     
@@ -159,21 +148,7 @@ public class BackgroundJobManager : IHostedService
         // Only add triggers if the job is enabled
         if (config.Enabled)
         {
-            await AddTriggersForJob<DownloadCleaner>(config.CronExpression, cancellationToken);
-        }
-    }
-
-    /// <summary>
-    /// Registers the BlacklistSync job and optionally adds triggers based on general configuration.
-    /// </summary>
-    public async Task RegisterBlacklistSyncJob(BlacklistSyncConfig config, CancellationToken cancellationToken = default)
-    {
-        // Always register the job definition
-        await AddJobWithoutTrigger<BlacklistSynchronizer>(cancellationToken);
-
-        if (config.Enabled)
-        {
-            await AddTriggersForJob<BlacklistSynchronizer>(config.CronExpression, cancellationToken);
+            await AddTriggersForJob<DownloadCleaner>(config, config.CronExpression, cancellationToken);
         }
     }
     
@@ -181,9 +156,10 @@ public class BackgroundJobManager : IHostedService
     /// Helper method to add triggers for an existing job.
     /// </summary>
     private async Task AddTriggersForJob<T>(
+        IJobConfig config,
         string cronExpression,
         CancellationToken cancellationToken = default) 
-        where T : IHandler
+        where T : GenericHandler
     {
         if (_scheduler == null)
         {
@@ -199,7 +175,7 @@ public class BackgroundJobManager : IHostedService
             IOperableTrigger triggerObj = (IOperableTrigger)TriggerBuilder.Create()
                 .WithIdentity("ValidationTrigger")
                 .StartNow()
-                .WithCronSchedule(cronExpression, x => x.WithMisfireHandlingInstructionDoNothing())
+                .WithCronSchedule(cronExpression)
                 .Build();
 
             IReadOnlyList<DateTimeOffset> nextFireTimes = TriggerUtils.ComputeFireTimes(triggerObj, null, 2);
@@ -210,7 +186,7 @@ public class BackgroundJobManager : IHostedService
                 throw new ValidationException($"{cronExpression} should have a fire time of maximum {Constants.TriggerMaxLimit.TotalHours} hours");
             }
             
-            if (typeof(T) != typeof(MalwareBlocker) && triggerValue < Constants.TriggerMinLimit)
+            if (typeof(T) != typeof(ContentBlocker) && triggerValue < Constants.TriggerMinLimit)
             {
                 throw new ValidationException($"{cronExpression} should have a fire time of minimum {Constants.TriggerMinLimit.TotalSeconds} seconds");
             }
@@ -221,26 +197,26 @@ public class BackgroundJobManager : IHostedService
             }
         }
         
-        // Create main cron trigger with consistent naming (matches JobManagementService)
+        // Create cron trigger
         var trigger = TriggerBuilder.Create()
             .WithIdentity($"{typeName}-trigger")
             .ForJob(jobKey)
             .WithCronSchedule(cronExpression, x => x.WithMisfireHandlingInstructionDoNothing())
+            .StartNow()
             .Build();
         
-        // Schedule the main trigger
-        await _scheduler.ScheduleJob(trigger, cancellationToken);
-        
-        // Trigger immediate execution for startup using a one-time trigger
+        // Create startup trigger to run immediately
         var startupTrigger = TriggerBuilder.Create()
-            .WithIdentity($"{typeName}-startup-{DateTimeOffset.UtcNow.Ticks}")
+            .WithIdentity($"{typeName}-startup-trigger")
             .ForJob(jobKey)
             .StartNow()
             .Build();
         
+        // Schedule job with both triggers
+        await _scheduler.ScheduleJob(trigger, cancellationToken);
         await _scheduler.ScheduleJob(startupTrigger, cancellationToken);
         
-        _logger.LogInformation("Added trigger for job {name} with cron expression {CronExpression} and immediate startup execution", 
+        _logger.LogInformation("Added triggers for job {name} with cron expression {CronExpression}", 
             typeName, cronExpression);
     }
     
@@ -248,7 +224,7 @@ public class BackgroundJobManager : IHostedService
     /// Helper method to add a job without a trigger (for chained jobs).
     /// </summary>
     private async Task AddJobWithoutTrigger<T>(CancellationToken cancellationToken = default) 
-        where T : IHandler
+        where T : GenericHandler
     {
         if (_scheduler == null)
         {
@@ -274,6 +250,6 @@ public class BackgroundJobManager : IHostedService
         // Add job to scheduler
         await _scheduler.AddJob(jobDetail, true, cancellationToken);
         
-        _logger.LogDebug("Registered job {name} without trigger", typeName);
+        _logger.LogInformation("Registered job {name} without trigger", typeName);
     }
 }

code/backend/Cleanuparr.Api/Jobs/GenericJob.cs

@@ -9,12 +9,12 @@ public sealed class GenericJob<T> : IJob
     where T : IHandler
 {
     private readonly ILogger<GenericJob<T>> _logger;
-    private readonly IServiceScopeFactory _scopeFactory;
-    
-    public GenericJob(ILogger<GenericJob<T>> logger, IServiceScopeFactory scopeFactory)
+    private readonly T _handler;
+
+    public GenericJob(ILogger<GenericJob<T>> logger, T handler)
     {
         _logger = logger;
-        _scopeFactory = scopeFactory;
+        _handler = handler;
     }
     
     public async Task Execute(IJobExecutionContext context)
@@ -23,9 +23,7 @@ public sealed class GenericJob<T> : IJob
         
         try
         {
-            await using var scope = _scopeFactory.CreateAsyncScope();
-            var handler = scope.ServiceProvider.GetRequiredService<T>();
-            await handler.ExecuteAsync();
+            await _handler.ExecuteAsync();
         }
         catch (Exception ex)
         {

code/backend/Cleanuparr.Api/Models/NotificationProviders/CreateAppriseProviderDto.cs

@@ -1,10 +0,0 @@
-namespace Cleanuparr.Api.Models.NotificationProviders;
-
-public sealed record CreateAppriseProviderDto : CreateNotificationProviderBaseDto
-{
-    public string Url { get; init; } = string.Empty;
-    
-    public string Key { get; init; } = string.Empty;
-    
-    public string Tags { get; init; } = string.Empty;
-}

code/backend/Cleanuparr.Api/Models/NotificationProviders/CreateNotifiarrProviderDto.cs

@@ -1,8 +0,0 @@
-namespace Cleanuparr.Api.Models.NotificationProviders;
-
-public sealed record CreateNotifiarrProviderDto : CreateNotificationProviderBaseDto
-{
-    public string ApiKey { get; init; } = string.Empty;
-    
-    public string ChannelId { get; init; } = string.Empty;
-}

code/backend/Cleanuparr.Api/Models/NotificationProviders/CreateNotificationProviderBaseDto.cs

@@ -1,20 +0,0 @@
-namespace Cleanuparr.Api.Models.NotificationProviders;
-
-public abstract record CreateNotificationProviderBaseDto
-{
-    public string Name { get; init; } = string.Empty;
-    
-    public bool IsEnabled { get; init; } = true;
-    
-    public bool OnFailedImportStrike { get; init; }
-    
-    public bool OnStalledStrike { get; init; }
-    
-    public bool OnSlowStrike { get; init; }
-    
-    public bool OnQueueItemDeleted { get; init; }
-    
-    public bool OnDownloadCleaned { get; init; }
-    
-    public bool OnCategoryChanged { get; init; }
-}

code/backend/Cleanuparr.Api/Models/NotificationProviders/CreateNtfyProviderDto.cs

@@ -1,22 +0,0 @@
-using Cleanuparr.Domain.Enums;
-
-namespace Cleanuparr.Api.Models.NotificationProviders;
-
-public sealed record CreateNtfyProviderDto : CreateNotificationProviderBaseDto
-{
-    public string ServerUrl { get; init; } = string.Empty;
-
-    public List<string> Topics { get; init; } = [];
-    
-    public NtfyAuthenticationType AuthenticationType { get; init; } = NtfyAuthenticationType.None;
-    
-    public string Username { get; init; } = string.Empty;
-    
-    public string Password { get; init; } = string.Empty;
-    
-    public string AccessToken { get; init; } = string.Empty;
-    
-    public NtfyPriority Priority { get; init; } = NtfyPriority.Default;
-
-    public List<string> Tags { get; init; } = [];
-}

code/backend/Cleanuparr.Api/Models/NotificationProviders/TestAppriseProviderDto.cs

@@ -1,10 +0,0 @@
-namespace Cleanuparr.Api.Models.NotificationProviders;
-
-public sealed record TestAppriseProviderDto
-{
-    public string Url { get; init; } = string.Empty;
-    
-    public string Key { get; init; } = string.Empty;
-    
-    public string Tags { get; init; } = string.Empty;
-}

code/backend/Cleanuparr.Api/Models/NotificationProviders/TestNotifiarrProviderDto.cs

@@ -1,8 +0,0 @@
-namespace Cleanuparr.Api.Models.NotificationProviders;
-
-public sealed record TestNotifiarrProviderDto
-{
-    public string ApiKey { get; init; } = string.Empty;
-    
-    public string ChannelId { get; init; } = string.Empty;
-}

code/backend/Cleanuparr.Api/Models/NotificationProviders/TestNtfyProviderDto.cs

@@ -1,22 +0,0 @@
-using Cleanuparr.Domain.Enums;
-
-namespace Cleanuparr.Api.Models.NotificationProviders;
-
-public sealed record TestNtfyProviderDto
-{
-    public string ServerUrl { get; init; } = string.Empty;
-
-    public List<string> Topics { get; init; } = [];
-    
-    public NtfyAuthenticationType AuthenticationType { get; init; } = NtfyAuthenticationType.None;
-    
-    public string Username { get; init; } = string.Empty;
-    
-    public string Password { get; init; } = string.Empty;
-    
-    public string AccessToken { get; init; } = string.Empty;
-    
-    public NtfyPriority Priority { get; init; } = NtfyPriority.Default;
-
-    public List<string> Tags { get; init; } = [];
-}

code/backend/Cleanuparr.Api/Models/NotificationProviders/UpdateAppriseProviderDto.cs

@@ -1,10 +0,0 @@
-namespace Cleanuparr.Api.Models.NotificationProviders;
-
-public sealed record UpdateAppriseProviderDto : CreateNotificationProviderBaseDto
-{
-    public string Url { get; init; } = string.Empty;
-    
-    public string Key { get; init; } = string.Empty;
-    
-    public string Tags { get; init; } = string.Empty;
-}

code/backend/Cleanuparr.Api/Models/NotificationProviders/UpdateNotifiarrProviderDto.cs

@@ -1,8 +0,0 @@
-namespace Cleanuparr.Api.Models.NotificationProviders;
-
-public sealed record UpdateNotifiarrProviderDto : CreateNotificationProviderBaseDto
-{
-    public string ApiKey { get; init; } = string.Empty;
-    
-    public string ChannelId { get; init; } = string.Empty;
-}

code/backend/Cleanuparr.Api/Models/NotificationProviders/UpdateNtfyProviderDto.cs

@@ -1,22 +0,0 @@
-using Cleanuparr.Domain.Enums;
-
-namespace Cleanuparr.Api.Models.NotificationProviders;
-
-public sealed record UpdateNtfyProviderDto : CreateNotificationProviderBaseDto
-{
-    public string ServerUrl { get; init; } = string.Empty;
-
-    public List<string> Topics { get; init; } = [];
-    
-    public NtfyAuthenticationType AuthenticationType { get; init; } = NtfyAuthenticationType.None;
-    
-    public string Username { get; init; } = string.Empty;
-    
-    public string Password { get; init; } = string.Empty;
-    
-    public string AccessToken { get; init; } = string.Empty;
-    
-    public NtfyPriority Priority { get; init; } = NtfyPriority.Default;
-
-    public List<string> Tags { get; init; } = [];
-}

code/backend/Cleanuparr.Api/Models/UpdateDownloadCleanerConfigDto.cs

@@ -29,8 +29,6 @@ public class UpdateDownloadCleanerConfigDto
     public string UnlinkedIgnoredRootDir { get; set; } = string.Empty;
     
     public List<string> UnlinkedCategories { get; set; } = [];
-
-    public List<string> IgnoredDownloads { get; set; } = [];
 }
 
 public class CleanCategoryDto

code/backend/Cleanuparr.Api/Program.cs

@@ -2,18 +2,12 @@ using System.Runtime.InteropServices;
 using System.Text.Json.Serialization;
 using Cleanuparr.Api;
 using Cleanuparr.Api.DependencyInjection;
-using Cleanuparr.Infrastructure.Hubs;
 using Cleanuparr.Infrastructure.Logging;
 using Cleanuparr.Shared.Helpers;
-using Microsoft.AspNetCore.Diagnostics.HealthChecks;
-using Microsoft.AspNetCore.SignalR;
 using Serilog;
 
 var builder = WebApplication.CreateBuilder(args);
 
-await builder.InitAsync();
-builder.Logging.AddLogging();
-
 // Fix paths for single-file deployment on macOS
 if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
 {
@@ -72,6 +66,14 @@ builder.Services.AddCors(options =>
     });
 });
 
+// Register services needed for logging first
+builder.Services
+    .AddTransient<LoggingConfigManager>()
+    .AddSingleton<SignalRLogSink>();
+
+// Add logging with proper service provider
+builder.Logging.AddLogging();
+
 if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
 {
     builder.Host.UseWindowsService(options =>
@@ -126,27 +128,25 @@ if (basePath is not null)
 logger.LogInformation("Server configuration: PORT={port}, BASE_PATH={basePath}", port, basePath ?? "/");
 
 // Initialize the host
-await app.InitAsync();
+await app.Init();
 
-// Configure the app hub for SignalR
-var appHub = app.Services.GetRequiredService<IHubContext<AppHub>>();
-SignalRLogSink.Instance.SetAppHubContext(appHub);
+// Get LoggingConfigManager (will be created if not already registered)
+var configManager = app.Services.GetRequiredService<LoggingConfigManager>();
+        
+// Get the dynamic level switch for controlling log levels
+var levelSwitch = configManager.GetLevelSwitch();
+            
+// Get the SignalRLogSink instance
+var signalRSink = app.Services.GetRequiredService<SignalRLogSink>();
 
-// Configure health check endpoints before the API configuration
-app.MapHealthChecks("/health", new HealthCheckOptions
-{
-    Predicate = registration => registration.Tags.Contains("liveness"),
-    ResponseWriter = HealthCheckResponseWriter.WriteMinimalPlaintext
-});
+var logConfig = LoggingDI.GetDefaultLoggerConfiguration();
+logConfig.MinimumLevel.ControlledBy(levelSwitch);
+        
+// Add to Serilog pipeline
+logConfig.WriteTo.Sink(signalRSink);
 
-app.MapHealthChecks("/health/ready", new HealthCheckOptions
-{
-    Predicate = registration => registration.Tags.Contains("readiness"),
-    ResponseWriter = HealthCheckResponseWriter.WriteMinimalPlaintext
-});
+Log.Logger = logConfig.CreateLogger();
 
 app.ConfigureApi();
 
-await app.RunAsync();
-
-await Log.CloseAndFlushAsync();
+await app.RunAsync();

code/backend/Cleanuparr.Application/Features/Arr/Dtos/UpdateReadarrConfigDto.cs

@@ -1,9 +0,0 @@
-namespace Cleanuparr.Application.Features.Arr.Dtos;
-
-/// <summary>
-/// DTO for updating Readarr configuration basic settings (instances managed separately)
-/// </summary>
-public record UpdateReadarrConfigDto
-{
-    public short FailedImportMaxStrikes { get; init; } = -1;
-} 

code/backend/Cleanuparr.Application/Features/Arr/Dtos/UpdateWhisparrConfigDto.cs

@@ -1,9 +0,0 @@
-namespace Cleanuparr.Application.Features.Arr.Dtos;
-
-/// <summary>
-/// DTO for updating Whisparr configuration basic settings (instances managed separately)
-/// </summary>
-public record UpdateWhisparrConfigDto
-{
-    public short FailedImportMaxStrikes { get; init; } = -1;
-} 

code/backend/Cleanuparr.Application/Features/BlacklistSync/BlacklistSynchronizer.cs

@@ -1,162 +0,0 @@
-using System.Security.Cryptography;
-using System.Text;
-using Cleanuparr.Domain.Enums;
-using Cleanuparr.Infrastructure.Features.DownloadClient;
-using Cleanuparr.Infrastructure.Features.DownloadClient.QBittorrent;
-using Cleanuparr.Infrastructure.Features.Jobs;
-using Cleanuparr.Infrastructure.Helpers;
-using Cleanuparr.Infrastructure.Interceptors;
-using Cleanuparr.Persistence;
-using Cleanuparr.Persistence.Models.Configuration;
-using Cleanuparr.Persistence.Models.Configuration.BlacklistSync;
-using Cleanuparr.Persistence.Models.State;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-
-namespace Cleanuparr.Application.Features.BlacklistSync;
-
-public sealed class BlacklistSynchronizer : IHandler
-{
-    private readonly ILogger<BlacklistSynchronizer> _logger;
-    private readonly DataContext _dataContext;
-    private readonly DownloadServiceFactory _downloadServiceFactory;
-    private readonly FileReader _fileReader;
-    private readonly IDryRunInterceptor _dryRunInterceptor;
-    
-    public BlacklistSynchronizer(
-        ILogger<BlacklistSynchronizer> logger,
-        DataContext dataContext,
-        DownloadServiceFactory downloadServiceFactory,
-        FileReader fileReader,
-        IDryRunInterceptor dryRunInterceptor
-    )
-    {
-        _logger = logger;
-        _dataContext = dataContext;
-        _downloadServiceFactory = downloadServiceFactory;
-        _fileReader = fileReader;
-        _dryRunInterceptor = dryRunInterceptor;
-    }
-
-    public async Task ExecuteAsync()
-    {
-        BlacklistSyncConfig config = await _dataContext.BlacklistSyncConfigs
-            .AsNoTracking()
-            .FirstAsync();
-        
-        if (!config.Enabled)
-        {
-            _logger.LogDebug("Blacklist sync is disabled");
-            return;
-        }
-
-        if (string.IsNullOrWhiteSpace(config.BlacklistPath))
-        {
-            _logger.LogWarning("Blacklist sync path is not configured");
-            return;
-        }
-        
-        string[] patterns = await _fileReader.ReadContentAsync(config.BlacklistPath);
-        string excludedFileNames = string.Join('\n', patterns.Where(p => !string.IsNullOrWhiteSpace(p)));
-
-        string currentHash = ComputeHash(excludedFileNames);
-        
-    await _dryRunInterceptor.InterceptAsync(SyncBlacklist, currentHash, excludedFileNames);
-        await _dryRunInterceptor.InterceptAsync(RemoveOldSyncDataAsync, currentHash);
-
-        _logger.LogDebug("Blacklist synchronization completed");
-    }
-
-    private async Task SyncBlacklist(string currentHash, string excludedFileNames)
-    {
-        List<DownloadClientConfig> qBittorrentClients = await _dataContext.DownloadClients
-            .AsNoTracking()
-            .Where(c => c.Enabled && c.TypeName == DownloadClientTypeName.qBittorrent)
-            .ToListAsync();
-        
-        if (qBittorrentClients.Count is 0)
-        {
-            _logger.LogDebug("No enabled qBittorrent clients found for blacklist sync");
-            return;
-        }
-
-        _logger.LogDebug("Starting blacklist synchronization for {Count} qBittorrent clients", qBittorrentClients.Count);
-
-        // Pull existing sync history for this hash
-        var alreadySynced = await _dataContext.BlacklistSyncHistory
-            .AsNoTracking()
-            .Where(s => s.Hash == currentHash)
-            .Select(x => x.DownloadClientId)
-            .ToListAsync();
-
-        // Only update clients not present in history for current hash
-        foreach (var clientConfig in qBittorrentClients)
-        {
-            try
-            {
-                if (alreadySynced.Contains(clientConfig.Id))
-                {
-                    _logger.LogDebug("Client {ClientName} already synced for current blacklist, skipping", clientConfig.Name);
-                    continue;
-                }
-                
-                var downloadService = _downloadServiceFactory.GetDownloadService(clientConfig);
-                if (downloadService is not QBitService qBitService)
-                {
-                    _logger.LogError("Expected QBitService but got {ServiceType} for client {ClientName}", downloadService.GetType().Name, clientConfig.Name);
-                    continue;
-                }
-
-                try
-                {
-                    await qBitService.LoginAsync();
-                    await qBitService.UpdateBlacklistAsync(excludedFileNames);
-                    
-                    _logger.LogDebug("Successfully updated blacklist for qBittorrent client {ClientName}", clientConfig.Name);
-
-                    // Insert history row marking this client as synced for current hash
-                    _dataContext.BlacklistSyncHistory.Add(new BlacklistSyncHistory
-                    {
-                        Hash = currentHash,
-                        DownloadClientId = clientConfig.Id
-                    });
-                    await _dataContext.SaveChangesAsync();
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Failed to update blacklist for qBittorrent client {ClientName}", clientConfig.Name);
-                }
-                finally
-                {
-                    qBitService.Dispose();
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Failed to create download service for client {ClientName}", clientConfig.Name);
-            }
-        }
-    }
-
-    private static string ComputeHash(string excludedFileNames)
-    {
-        using var sha = SHA256.Create();
-        byte[] bytes = Encoding.UTF8.GetBytes(excludedFileNames);
-        byte[] hash = sha.ComputeHash(bytes);
-        return Convert.ToHexString(hash).ToLowerInvariant();
-    }
-
-    private async Task RemoveOldSyncDataAsync(string currentHash)
-    {
-        try
-        {
-            await _dataContext.BlacklistSyncHistory
-                .Where(s => s.Hash != currentHash)
-                .ExecuteDeleteAsync();
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning(ex, "Failed to cleanup old blacklist sync history");
-        }
-    }
-}

code/backend/Cleanuparr.Application/Features/ContentBlocker/ContentBlocker.cs

@@ -1,31 +1,31 @@
-using Cleanuparr.Domain.Entities.Arr.Queue;
-using Cleanuparr.Domain.Enums;
+using Cleanuparr.Domain.Enums;
 using Cleanuparr.Infrastructure.Events;
 using Cleanuparr.Infrastructure.Features.Arr;
 using Cleanuparr.Infrastructure.Features.Arr.Interfaces;
+using Cleanuparr.Infrastructure.Features.ContentBlocker;
 using Cleanuparr.Infrastructure.Features.Context;
 using Cleanuparr.Infrastructure.Features.DownloadClient;
 using Cleanuparr.Infrastructure.Features.Jobs;
-using Cleanuparr.Infrastructure.Features.MalwareBlocker;
 using Cleanuparr.Infrastructure.Helpers;
 using Cleanuparr.Persistence;
 using Cleanuparr.Persistence.Models.Configuration;
 using Cleanuparr.Persistence.Models.Configuration.Arr;
+using Cleanuparr.Persistence.Models.Configuration.ContentBlocker;
 using Cleanuparr.Persistence.Models.Configuration.General;
-using Cleanuparr.Persistence.Models.Configuration.MalwareBlocker;
+using Data.Models.Arr.Queue;
 using MassTransit;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
 using LogContext = Serilog.Context.LogContext;
 
-namespace Cleanuparr.Application.Features.MalwareBlocker;
+namespace Cleanuparr.Application.Features.ContentBlocker;
 
-public sealed class MalwareBlocker : GenericHandler
+public sealed class ContentBlocker : GenericHandler
 {
     private readonly BlocklistProvider _blocklistProvider;
 
-    public MalwareBlocker(
-        ILogger<MalwareBlocker> logger,
+    public ContentBlocker(
+        ILogger<ContentBlocker> logger,
         DataContext dataContext,
         IMemoryCache cache,
         IBus messageBus,
@@ -52,7 +52,7 @@ public sealed class MalwareBlocker : GenericHandler
         
         var config = ContextProvider.Get<ContentBlockerConfig>();
         
-        if (!config.Sonarr.Enabled && !config.Radarr.Enabled && !config.Lidarr.Enabled && !config.Readarr.Enabled && !config.Whisparr.Enabled)
+        if (!config.Sonarr.Enabled && !config.Radarr.Enabled && !config.Lidarr.Enabled)
         {
             _logger.LogWarning("No blocklists are enabled");
             return;
@@ -63,39 +63,26 @@ public sealed class MalwareBlocker : GenericHandler
         var sonarrConfig = ContextProvider.Get<ArrConfig>(nameof(InstanceType.Sonarr));
         var radarrConfig = ContextProvider.Get<ArrConfig>(nameof(InstanceType.Radarr));
         var lidarrConfig = ContextProvider.Get<ArrConfig>(nameof(InstanceType.Lidarr));
-        var readarrConfig = ContextProvider.Get<ArrConfig>(nameof(InstanceType.Readarr));
-        var whisparrConfig = ContextProvider.Get<ArrConfig>(nameof(InstanceType.Whisparr));
 
-        if (config.Sonarr.Enabled || config.DeleteKnownMalware)
+        if (config.Sonarr.Enabled)
         {
             await ProcessArrConfigAsync(sonarrConfig, InstanceType.Sonarr);
         }
         
-        if (config.Radarr.Enabled || config.DeleteKnownMalware)
+        if (config.Radarr.Enabled)
         {
             await ProcessArrConfigAsync(radarrConfig, InstanceType.Radarr);
         }
         
-        if (config.Lidarr.Enabled || config.DeleteKnownMalware)
+        if (config.Lidarr.Enabled)
         {
             await ProcessArrConfigAsync(lidarrConfig, InstanceType.Lidarr);
         }
-        
-        if (config.Readarr.Enabled || config.DeleteKnownMalware)
-        {
-            await ProcessArrConfigAsync(readarrConfig, InstanceType.Readarr);
-        }
-        
-        if (config.Whisparr.Enabled || config.DeleteKnownMalware)
-        {
-            await ProcessArrConfigAsync(whisparrConfig, InstanceType.Whisparr);
-        }
     }
 
     protected override async Task ProcessInstanceAsync(ArrInstance instance, InstanceType instanceType)
     {
-        List<string> ignoredDownloads = ContextProvider.Get<GeneralConfig>(nameof(GeneralConfig)).IgnoredDownloads;
-        ignoredDownloads.AddRange(ContextProvider.Get<ContentBlockerConfig>().IgnoredDownloads);
+        IReadOnlyList<string> ignoredDownloads = ContextProvider.Get<GeneralConfig>().IgnoredDownloads;
 
         using var _ = LogContext.PushProperty(LogProperties.Category, instanceType.ToString());
         
@@ -184,10 +171,6 @@ public sealed class MalwareBlocker : GenericHandler
                             _logger.LogWarning("Download not found in any torrent client | {title}", record.Title);
                         }
                     }
-                    else
-                    {
-                        _logger.LogDebug("No torrent clients enabled");
-                    }
                 }
 
                 if (!result.ShouldRemove)
@@ -211,7 +194,7 @@ public sealed class MalwareBlocker : GenericHandler
                     record,
                     group.Count() > 1,
                     removeFromClient,
-                    result.DeleteReason
+                    DeleteReason.AllFilesBlocked
                 );
             }
         });

code/backend/Cleanuparr.Application/Features/DownloadCleaner/DownloadCleaner.cs

@@ -1,4 +1,3 @@
-using Cleanuparr.Domain.Entities.Arr.Queue;
 using Cleanuparr.Domain.Enums;
 using Cleanuparr.Infrastructure.Events;
 using Cleanuparr.Infrastructure.Features.Arr;
@@ -11,6 +10,7 @@ using Cleanuparr.Persistence;
 using Cleanuparr.Persistence.Models.Configuration.Arr;
 using Cleanuparr.Persistence.Models.Configuration.DownloadCleaner;
 using Cleanuparr.Persistence.Models.Configuration.General;
+using Data.Models.Arr.Queue;
 using MassTransit;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
@@ -59,11 +59,10 @@ public sealed class DownloadCleaner : GenericHandler
             return;
         }
         
-        List<string> ignoredDownloads = ContextProvider.Get<GeneralConfig>(nameof(GeneralConfig)).IgnoredDownloads;
-        ignoredDownloads.AddRange(ContextProvider.Get<DownloadCleanerConfig>().IgnoredDownloads);
-        
-        var downloadServiceToDownloadsMap = new Dictionary<IDownloadService, List<object>>();
+        IReadOnlyList<string> ignoredDownloads = ContextProvider.Get<GeneralConfig>(nameof(GeneralConfig)).IgnoredDownloads;
         
+        // Process each client separately
+        var allDownloads = new List<object>();
         foreach (var downloadService in downloadServices)
         {
             try
@@ -72,24 +71,24 @@ public sealed class DownloadCleaner : GenericHandler
                 var clientDownloads = await downloadService.GetSeedingDownloads();
                 if (clientDownloads?.Count > 0)
                 {
-                    downloadServiceToDownloadsMap[downloadService] = clientDownloads;
+                    allDownloads.AddRange(clientDownloads);
                 }
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Failed to get seeding downloads from download client {clientName}", downloadService.ClientConfig.Name);
+                _logger.LogError(ex, "Failed to get seeding downloads from download client");
             }
         }
 
-        if (downloadServiceToDownloadsMap.Count == 0)
+        if (allDownloads.Count == 0)
         {
             _logger.LogDebug("no seeding downloads found");
             return;
         }
         
-        var totalDownloads = downloadServiceToDownloadsMap.Values.Sum(x => x.Count);
-        _logger.LogTrace("found {count} seeding downloads across {clientCount} clients", totalDownloads, downloadServiceToDownloadsMap.Count);
+        _logger.LogTrace("found {count} seeding downloads", allDownloads.Count);
         
+        // List<object>? downloadsToChangeCategory = null;
         List<Tuple<IDownloadService, List<object>>> downloadServiceWithDownloads = [];
 
         if (isUnlinkedEnabled)
@@ -103,23 +102,24 @@ public sealed class DownloadCleaner : GenericHandler
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError(ex, "Failed to create category for download client {clientName}", downloadService.ClientConfig.Name);
+                    _logger.LogError(ex, "Failed to create category for download client");
                 }
             }
             
-            foreach (var (downloadService, clientDownloads) in downloadServiceToDownloadsMap)
+            // Get downloads to change category
+            foreach (var downloadService in downloadServices)
             {
                 try
                 {
-                    var downloadsToChangeCategory = downloadService.FilterDownloadsToChangeCategoryAsync(clientDownloads, config.UnlinkedCategories);
-                    if (downloadsToChangeCategory?.Count > 0)
+                    var clientDownloads = downloadService.FilterDownloadsToChangeCategoryAsync(allDownloads, config.UnlinkedCategories);
+                    if (clientDownloads?.Count > 0)
                     {
-                        downloadServiceWithDownloads.Add(Tuple.Create(downloadService, downloadsToChangeCategory));
+                        downloadServiceWithDownloads.Add(Tuple.Create(downloadService, clientDownloads));
                     }
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError(ex, "Failed to filter downloads for category change for download client {clientName}", downloadService.ClientConfig.Name);
+                    _logger.LogError(ex, "Failed to filter downloads for category change");
                 }
             }
         }
@@ -130,9 +130,7 @@ public sealed class DownloadCleaner : GenericHandler
         await ProcessArrConfigAsync(ContextProvider.Get<ArrConfig>(nameof(InstanceType.Sonarr)), InstanceType.Sonarr, true);
         await ProcessArrConfigAsync(ContextProvider.Get<ArrConfig>(nameof(InstanceType.Radarr)), InstanceType.Radarr, true);
         await ProcessArrConfigAsync(ContextProvider.Get<ArrConfig>(nameof(InstanceType.Lidarr)), InstanceType.Lidarr, true);
-        await ProcessArrConfigAsync(ContextProvider.Get<ArrConfig>(nameof(InstanceType.Readarr)), InstanceType.Readarr, true);
-        await ProcessArrConfigAsync(ContextProvider.Get<ArrConfig>(nameof(InstanceType.Whisparr)), InstanceType.Whisparr, true);
-        
+
         if (isUnlinkedEnabled && downloadServiceWithDownloads.Count > 0)
         {
             _logger.LogInformation("Found {count} potential downloads to change category", downloadServiceWithDownloads.Sum(x => x.Item2.Count));
@@ -158,15 +156,16 @@ public sealed class DownloadCleaner : GenericHandler
             return;
         }
         
+        // Get downloads to clean
         downloadServiceWithDownloads = [];
-        foreach (var (downloadService, clientDownloads) in downloadServiceToDownloadsMap)
+        foreach (var downloadService in downloadServices)
         {
             try
             {
-                var downloadsToClean = downloadService.FilterDownloadsToBeCleanedAsync(clientDownloads, config.Categories);
-                if (downloadsToClean?.Count > 0)
+                var clientDownloads = downloadService.FilterDownloadsToBeCleanedAsync(allDownloads, config.Categories);
+                if (clientDownloads?.Count > 0)
                 {
-                    downloadServiceWithDownloads.Add(Tuple.Create(downloadService, downloadsToClean));
+                    downloadServiceWithDownloads.Add(Tuple.Create(downloadService, clientDownloads));
                 }
             }
             catch (Exception ex)
@@ -175,6 +174,9 @@ public sealed class DownloadCleaner : GenericHandler
             }
         }
         
+        // release unused objects
+        allDownloads = null;
+
         _logger.LogInformation("found {count} potential downloads to clean", downloadServiceWithDownloads.Sum(x => x.Item2.Count));
         
         // Process cleaning for each client

code/backend/Cleanuparr.Application/Features/QueueCleaner/QueueCleaner.cs

@@ -1,4 +1,3 @@
-using Cleanuparr.Domain.Entities.Arr.Queue;
 using Cleanuparr.Domain.Enums;
 using Cleanuparr.Infrastructure.Events;
 using Cleanuparr.Infrastructure.Features.Arr;
@@ -12,6 +11,7 @@ using Cleanuparr.Persistence.Models.Configuration;
 using Cleanuparr.Persistence.Models.Configuration.Arr;
 using Cleanuparr.Persistence.Models.Configuration.General;
 using Cleanuparr.Persistence.Models.Configuration.QueueCleaner;
+using Data.Models.Arr.Queue;
 using MassTransit;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
@@ -42,20 +42,15 @@ public sealed class QueueCleaner : GenericHandler
         var sonarrConfig = ContextProvider.Get<ArrConfig>(nameof(InstanceType.Sonarr));
         var radarrConfig = ContextProvider.Get<ArrConfig>(nameof(InstanceType.Radarr));
         var lidarrConfig = ContextProvider.Get<ArrConfig>(nameof(InstanceType.Lidarr));
-        var readarrConfig = ContextProvider.Get<ArrConfig>(nameof(InstanceType.Readarr));
-        var whisparrConfig = ContextProvider.Get<ArrConfig>(nameof(InstanceType.Whisparr));
         
         await ProcessArrConfigAsync(sonarrConfig, InstanceType.Sonarr);
         await ProcessArrConfigAsync(radarrConfig, InstanceType.Radarr);
         await ProcessArrConfigAsync(lidarrConfig, InstanceType.Lidarr);
-        await ProcessArrConfigAsync(readarrConfig, InstanceType.Readarr);
-        await ProcessArrConfigAsync(whisparrConfig, InstanceType.Whisparr);
     }
 
     protected override async Task ProcessInstanceAsync(ArrInstance instance, InstanceType instanceType)
     {
-        List<string> ignoredDownloads = ContextProvider.Get<GeneralConfig>(nameof(GeneralConfig)).IgnoredDownloads;
-        ignoredDownloads.AddRange(ContextProvider.Get<QueueCleanerConfig>().IgnoredDownloads);
+        IReadOnlyList<string> ignoredDownloads = ContextProvider.Get<GeneralConfig>().IgnoredDownloads;
         
         using var _ = LogContext.PushProperty(LogProperties.Category, instanceType.ToString());
         
@@ -108,7 +103,7 @@ public sealed class QueueCleaner : GenericHandler
 
                 DownloadCheckResult downloadCheckResult = new();
 
-                if (record.Protocol.Contains("torrent", StringComparison.InvariantCultureIgnoreCase))
+                if (record.Protocol is "torrent")
                 {
                     var torrentClients = downloadServices
                         .Where(x => x.ClientConfig.Type is DownloadClientType.Torrent)
@@ -142,16 +137,12 @@ public sealed class QueueCleaner : GenericHandler
                             _logger.LogWarning("Download not found in any torrent client | {title}", record.Title);
                         }
                     }
-                    else
-                    {
-                        _logger.LogDebug("No torrent clients enabled");
-                    }
                 }
                 
                 var config = ContextProvider.Get<QueueCleanerConfig>();
                 
                 // failed import check
-                bool shouldRemoveFromArr = await arrClient.ShouldRemoveFromQueue(instanceType, record, downloadCheckResult.IsPrivate, instance.ArrConfig.FailedImportMaxStrikes);
+                bool shouldRemoveFromArr = await arrClient.ShouldRemoveFromQueue(instanceType, record, downloadCheckResult.IsPrivate, config.FailedImport.MaxStrikes);
                 DeleteReason deleteReason = downloadCheckResult.ShouldRemove ? downloadCheckResult.DeleteReason : DeleteReason.FailedImport;
                 
                 if (!shouldRemoveFromArr && !downloadCheckResult.ShouldRemove)

code/backend/Cleanuparr.Domain/Entities/Arr/Queue/Image.cs

@@ -1,4 +1,4 @@
-namespace Cleanuparr.Domain.Entities.Arr.Queue;
+namespace Data.Models.Arr.Queue;
 
 public record Image
 {

code/backend/Cleanuparr.Domain/Entities/Arr/Queue/LidarrImage.cs

@@ -1,4 +1,4 @@
-namespace Cleanuparr.Domain.Entities.Arr.Queue;
+namespace Data.Models.Arr.Queue;
 
 public record LidarrImage
 {

code/backend/Cleanuparr.Domain/Entities/Arr/Queue/QueueAlbum.cs

@@ -1,4 +1,4 @@
-namespace Cleanuparr.Domain.Entities.Arr.Queue;
+namespace Data.Models.Arr.Queue;
 
 public sealed record QueueAlbum
 {

code/backend/Cleanuparr.Domain/Entities/Arr/Queue/QueueBook.cs

@@ -1,6 +0,0 @@
-namespace Cleanuparr.Domain.Entities.Arr.Queue;
-
-public sealed record QueueBook
-{
-    public List<ReadarrImage> Images { get; init; } = [];
-} 

code/backend/Cleanuparr.Domain/Entities/Arr/Queue/QueueListResponse.cs

@@ -1,4 +1,4 @@
-namespace Cleanuparr.Domain.Entities.Arr.Queue;
+namespace Data.Models.Arr.Queue;
 
 public record QueueListResponse
 {

code/backend/Cleanuparr.Domain/Entities/Arr/Queue/QueueMovie.cs

@@ -1,4 +1,4 @@
-namespace Cleanuparr.Domain.Entities.Arr.Queue;
+namespace Data.Models.Arr.Queue;
 
 public sealed record QueueMovie
 {

code/backend/Cleanuparr.Domain/Entities/Arr/Queue/QueueRecord.cs

@@ -1,8 +1,8 @@
-namespace Cleanuparr.Domain.Entities.Arr.Queue;
+namespace Data.Models.Arr.Queue;
 
 public sealed record QueueRecord
 {
-    // Sonarr and Whisparr
+    // Sonarr
     public long SeriesId { get; init; }
     public long EpisodeId { get; init; }
     public long SeasonNumber { get; init; }
@@ -21,13 +21,6 @@ public sealed record QueueRecord
     
     public QueueAlbum? Album { get; init; }
     
-    // Readarr
-    public long AuthorId { get; init; }
-    
-    public long BookId { get; init; }
-    
-    public QueueBook? Book { get; init; }
-    
     // common
     public required string Title { get; init; }
     public string Status { get; init; }

code/backend/Cleanuparr.Domain/Entities/Arr/Queue/QueueSeries.cs

@@ -1,4 +1,4 @@
-namespace Cleanuparr.Domain.Entities.Arr.Queue;
+namespace Data.Models.Arr.Queue;
 
 public sealed record QueueSeries
 {

code/backend/Cleanuparr.Domain/Entities/Arr/Queue/ReadarrImage.cs

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

code/backend/Cleanuparr.Domain/Entities/Arr/Queue/TrackedDownloadStatusMessage.cs

@@ -1,4 +1,4 @@
-namespace Cleanuparr.Domain.Entities.Arr.Queue;
+namespace Data.Models.Arr.Queue;
 
 public sealed record TrackedDownloadStatusMessage
 {

code/backend/Cleanuparr.Domain/Entities/Arr/SonarrSearchItem.cs

@@ -1,17 +1,16 @@
 using Cleanuparr.Domain.Enums;
-using Data.Models.Arr;
 
-namespace Cleanuparr.Domain.Entities.Arr;
+namespace Data.Models.Arr;
 
-public sealed class SeriesSearchItem : SearchItem
+public sealed class SonarrSearchItem : SearchItem
 {
     public long SeriesId { get; set; }
     
-    public SeriesSearchType SearchType { get; set; }
+    public SonarrSearchType SearchType { get; set; }
     
     public override bool Equals(object? obj)
     {
-        if (obj is not SeriesSearchItem other)
+        if (obj is not SonarrSearchItem other)
         {
             return false;
         }

code/backend/Cleanuparr.Domain/Entities/Readarr/Author.cs

@@ -1,8 +0,0 @@
-namespace Cleanuparr.Domain.Entities.Readarr;
-
-public sealed record Author
-{
-    public long Id { get; set; }
-    
-    public string AuthorName { get; set; } = string.Empty;
-} 

code/backend/Cleanuparr.Domain/Entities/Readarr/Book.cs

@@ -1,12 +0,0 @@
-namespace Cleanuparr.Domain.Entities.Readarr;
-
-public sealed record Book
-{
-    public required long Id { get; init; }
-    
-    public required string Title { get; init; }
-    
-    public long AuthorId { get; set; }
-    
-    public Author Author { get; set; } = new();
-} 

code/backend/Cleanuparr.Domain/Entities/Readarr/ReadarrCommand.cs

@@ -1,8 +0,0 @@
-namespace Cleanuparr.Domain.Entities.Readarr;
-
-public sealed record ReadarrCommand
-{
-    public string Name { get; set; } = string.Empty;
-    
-    public List<long> BookIds { get; set; } = [];
-} 

code/backend/Cleanuparr.Domain/Entities/Sonarr/SonarrCommand.cs

@@ -12,5 +12,5 @@ public sealed record SonarrCommand
     
     public List<long>? EpisodeIds { get; set; }
     
-    public SeriesSearchType SearchType { get; set; }
+    public SonarrSearchType SearchType { get; set; }
 }

code/backend/Cleanuparr.Domain/Entities/UTorrent/Request/UTorrentRequest.cs

@@ -1,69 +0,0 @@
-namespace Cleanuparr.Domain.Entities.UTorrent.Request;
-
-/// <summary>
-/// Represents a request to the µTorrent Web UI API
-/// </summary>
-public sealed class UTorrentRequest
-{
-    /// <summary>
-    /// The API action to perform
-    /// </summary>
-    public string Action { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Authentication token (required for CSRF protection)
-    /// </summary>
-    public string Token { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Additional parameters for the request
-    /// </summary>
-    public List<(string Name, string Value)> Parameters { get; set; } = new();
-
-    /// <summary>
-    /// Constructs the query string for the API call
-    /// </summary>
-    /// <returns>The complete query string including token and action</returns>
-    public string ToQueryString()
-    {
-        var queryParams = new List<string>
-        {
-            $"token={Token}",
-            Action
-        };
-
-        foreach (var param in Parameters)
-        {
-            queryParams.Add($"{Uri.EscapeDataString(param.Name)}={Uri.EscapeDataString(param.Value)}");
-        }
-
-        return string.Join("&", queryParams);
-    }
-
-    /// <summary>
-    /// Creates a new request with the specified action
-    /// </summary>
-    /// <param name="action">The API action</param>
-    /// <param name="token">Authentication token</param>
-    /// <returns>A new UTorrentRequest instance</returns>
-    public static UTorrentRequest Create(string action, string token)
-    {
-        return new UTorrentRequest
-        {
-            Action = action,
-            Token = token
-        };
-    }
-
-    /// <summary>
-    /// Adds a parameter to the request
-    /// </summary>
-    /// <param name="key">Parameter name</param>
-    /// <param name="value">Parameter value</param>
-    /// <returns>This instance for method chaining</returns>
-    public UTorrentRequest WithParameter(string key, string value)
-    {
-        Parameters.Add((key, value));
-        return this;
-    }
-} 

code/backend/Cleanuparr.Domain/Entities/UTorrent/Response/FileListResponse.cs

@@ -1,28 +0,0 @@
-using Newtonsoft.Json;
-
-namespace Cleanuparr.Domain.Entities.UTorrent.Response;
-
-/// <summary>
-/// Specific response type for file list API calls
-/// Replaces the generic UTorrentResponse<T> for file listings
-/// </summary>
-public sealed class FileListResponse
-{
-    /// <summary>
-    /// Raw file data from the API
-    /// </summary>
-    [JsonProperty(PropertyName = "files")]
-    public object[]? FilesRaw { get; set; }
-
-    /// <summary>
-    /// Torrent hash for which files are listed
-    /// </summary>
-    [JsonIgnore]
-    public string Hash { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Parsed files as strongly-typed objects
-    /// </summary>
-    [JsonIgnore]
-    public List<UTorrentFile> Files { get; set; } = new();
-}

code/backend/Cleanuparr.Domain/Entities/UTorrent/Response/LabelListResponse.cs

@@ -1,22 +0,0 @@
-using Newtonsoft.Json;
-
-namespace Cleanuparr.Domain.Entities.UTorrent.Response;
-
-/// <summary>
-/// Specific response type for label list API calls
-/// Replaces the generic UTorrentResponse<T> for label listings
-/// </summary>
-public sealed class LabelListResponse
-{
-    /// <summary>
-    /// Raw label data from the API
-    /// </summary>
-    [JsonProperty(PropertyName = "label")]
-    public object[][]? LabelsRaw { get; set; }
-
-    /// <summary>
-    /// Parsed labels as string list
-    /// </summary>
-    [JsonIgnore]
-    public List<string> Labels { get; set; } = new();
-}

code/backend/Cleanuparr.Domain/Entities/UTorrent/Response/PropertiesResponse.cs

@@ -1,22 +0,0 @@
-using Newtonsoft.Json;
-
-namespace Cleanuparr.Domain.Entities.UTorrent.Response;
-
-/// <summary>
-/// Specific response type for torrent properties API calls
-/// Replaces the generic UTorrentResponse<T> for properties retrieval
-/// </summary>
-public sealed class PropertiesResponse
-{
-    /// <summary>
-    /// Raw properties data from the API
-    /// </summary>
-    [JsonProperty(PropertyName = "props")]
-    public object[]? PropertiesRaw { get; set; }
-
-    /// <summary>
-    /// Parsed properties as strongly-typed object
-    /// </summary>
-    [JsonIgnore]
-    public UTorrentProperties Properties { get; set; } = new();
-}

code/backend/Cleanuparr.Domain/Entities/UTorrent/Response/TorrentListResponse.cs

@@ -1,40 +0,0 @@
-using Newtonsoft.Json;
-
-namespace Cleanuparr.Domain.Entities.UTorrent.Response;
-
-/// <summary>
-/// Specific response type for torrent list API calls
-/// Replaces the generic UTorrentResponse<T> for torrent listings
-/// </summary>
-public sealed class TorrentListResponse
-{
-    /// <summary>
-    /// µTorrent build number
-    /// </summary>
-    [JsonProperty(PropertyName = "build")]
-    public int Build { get; set; }
-
-    /// <summary>
-    /// List of torrent data from the API
-    /// </summary>
-    [JsonProperty(PropertyName = "torrents")]
-    public object[][]? TorrentsRaw { get; set; }
-
-    /// <summary>
-    /// Label data from the API
-    /// </summary>
-    [JsonProperty(PropertyName = "label")]
-    public object[][]? LabelsRaw { get; set; }
-
-    /// <summary>
-    /// Parsed torrents as strongly-typed objects
-    /// </summary>
-    [JsonIgnore]
-    public List<UTorrentItem> Torrents { get; set; } = new();
-
-    /// <summary>
-    /// Parsed labels as string list
-    /// </summary>
-    [JsonIgnore]
-    public List<string> Labels { get; set; } = new();
-}

code/backend/Cleanuparr.Domain/Entities/UTorrent/Response/UTorrentFile.cs

@@ -1,18 +0,0 @@
-namespace Cleanuparr.Domain.Entities.UTorrent.Response;
-
-/// <summary>
-/// Represents a file within a torrent from µTorrent Web UI API
-/// Based on the files array structure from the API documentation
-/// </summary>
-public sealed class UTorrentFile
-{
-    public string Name { get; set; } = string.Empty;
-
-    public long Size { get; set; }
-
-    public long Downloaded { get; set; }
-
-    public int Priority { get; set; }
-
-    public int Index { get; set; }
-} 

code/backend/Cleanuparr.Domain/Entities/UTorrent/Response/UTorrentItem.cs

@@ -1,181 +0,0 @@
-using Newtonsoft.Json;
-
-namespace Cleanuparr.Domain.Entities.UTorrent.Response;
-
-/// <summary>
-/// Represents a torrent from µTorrent Web UI API
-/// Based on the torrent array structure from the API documentation
-/// </summary>
-public sealed class UTorrentItem
-{
-    /// <summary>
-    /// Torrent hash (index 0)
-    /// </summary>
-    public string Hash { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Status bitfield (index 1)
-    /// </summary>
-    public int Status { get; set; }
-
-    /// <summary>
-    /// Torrent name (index 2)
-    /// </summary>
-    public string Name { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Total size in bytes (index 3)
-    /// </summary>
-    public long Size { get; set; }
-
-    /// <summary>
-    /// Progress in permille (1000 = 100%) (index 4)
-    /// </summary>
-    public int Progress { get; set; }
-
-    /// <summary>
-    /// Downloaded bytes (index 5)
-    /// </summary>
-    public long Downloaded { get; set; }
-
-    /// <summary>
-    /// Uploaded bytes (index 6)
-    /// </summary>
-    public long Uploaded { get; set; }
-
-    /// <summary>
-    /// Ratio * 1000 (index 7)
-    /// </summary>
-    public int RatioRaw { get; set; }
-
-    /// <summary>
-    /// Upload speed in bytes/sec (index 8)
-    /// </summary>
-    public int UploadSpeed { get; set; }
-
-    /// <summary>
-    /// Download speed in bytes/sec (index 9)
-    /// </summary>
-    public int DownloadSpeed { get; set; }
-
-    /// <summary>
-    /// ETA in seconds (index 10)
-    /// </summary>
-    public int ETA { get; set; }
-
-    /// <summary>
-    /// Label (index 11)
-    /// </summary>
-    public string Label { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Connected peers (index 12)
-    /// </summary>
-    public int PeersConnected { get; set; }
-
-    /// <summary>
-    /// Peers in swarm (index 13)
-    /// </summary>
-    public int PeersInSwarm { get; set; }
-
-    /// <summary>
-    /// Connected seeds (index 14)
-    /// </summary>
-    public int SeedsConnected { get; set; }
-
-    /// <summary>
-    /// Seeds in swarm (index 15)
-    /// </summary>
-    public int SeedsInSwarm { get; set; }
-
-    /// <summary>
-    /// Availability (index 16)
-    /// </summary>
-    public int Availability { get; set; }
-
-    /// <summary>
-    /// Queue order (index 17)
-    /// </summary>
-    public int QueueOrder { get; set; }
-
-    /// <summary>
-    /// Remaining bytes (index 18)
-    /// </summary>
-    public long Remaining { get; set; }
-
-    /// <summary>
-    /// Download URL (index 19)
-    /// </summary>
-    public string DownloadUrl { get; set; } = string.Empty;
-
-    /// <summary>
-    /// RSS feed URL (index 20)
-    /// </summary>
-    public string RssFeedUrl { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Status message (index 21)
-    /// </summary>
-    public string StatusMessage { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Stream ID (index 22)
-    /// </summary>
-    public string StreamId { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Date added as Unix timestamp (index 23)
-    /// </summary>
-    public long DateAdded { get; set; }
-
-    /// <summary>
-    /// Date completed as Unix timestamp (index 24)
-    /// </summary>
-    public long DateCompleted { get; set; }
-
-    /// <summary>
-    /// App update URL (index 25)
-    /// </summary>
-    public string AppUpdateUrl { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Save path (index 26)
-    /// </summary>
-    public string SavePath { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Calculated ratio value (RatioRaw / 1000.0)
-    /// </summary>
-    [JsonIgnore]
-    public double Ratio => RatioRaw / 1000.0;
-
-    /// <summary>
-    /// Progress as percentage (0.0 to 1.0)
-    /// </summary>
-    [JsonIgnore]
-    public double ProgressPercent => Progress / 1000.0;
-
-    /// <summary>
-    /// Date completed as DateTime (or null if not completed)
-    /// </summary>
-    [JsonIgnore]
-    public DateTime? DateCompletedDateTime => 
-        DateCompleted > 0 ? DateTimeOffset.FromUnixTimeSeconds(DateCompleted).DateTime : null;
-
-    /// <summary>
-    /// Seeding time in seconds (calculated from DateCompleted to now)
-    /// </summary>
-    [JsonIgnore]
-    public TimeSpan? SeedingTime
-    {
-        get
-        {
-            if (DateCompletedDateTime.HasValue)
-            {
-                return DateTime.UtcNow - DateCompletedDateTime.Value;
-            }
-            
-            return null;
-        }
-    }
-} 

code/backend/Cleanuparr.Domain/Entities/UTorrent/Response/UTorrentProperties.cs

@@ -1,85 +0,0 @@
-namespace Cleanuparr.Domain.Entities.UTorrent.Response;
-
-/// <summary>
-/// Represents torrent properties from µTorrent Web UI API getprops action
-/// Based on the properties structure from the API documentation
-/// </summary>
-public sealed class UTorrentProperties
-{
-    /// <summary>
-    /// Torrent hash
-    /// </summary>
-    public string Hash { get; set; } = string.Empty;
-
-    /// <summary>
-    /// Trackers list (newlines are represented by \r\n)
-    /// </summary>
-    public string Trackers { get; set; } = string.Empty;
-    
-    public List<string> TrackerList => Trackers
-        .Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries)
-        .Select(x => x.Trim())
-        .Where(x => !string.IsNullOrWhiteSpace(x))
-        .ToList();
-
-    /// <summary>
-    /// Upload limit in bytes per second
-    /// </summary>
-    public int UploadLimit { get; set; }
-
-    /// <summary>
-    /// Download limit in bytes per second
-    /// </summary>
-    public int DownloadLimit { get; set; }
-
-    /// <summary>
-    /// Initial seeding / Super seeding
-    /// -1 = Not allowed, 0 = Disabled, 1 = Enabled
-    /// </summary>
-    public int SuperSeed { get; set; }
-
-    /// <summary>
-    /// Use DHT
-    /// -1 = Not allowed, 0 = Disabled, 1 = Enabled
-    /// </summary>
-    public int Dht { get; set; }
-
-    /// <summary>
-    /// Use PEX (Peer Exchange)
-    /// -1 = Not allowed (indicates private torrent), 0 = Disabled, 1 = Enabled
-    /// </summary>
-    public int Pex { get; set; }
-
-    /// <summary>
-    /// Override queueing
-    /// -1 = Not allowed, 0 = Disabled, 1 = Enabled
-    /// </summary>
-    public int SeedOverride { get; set; }
-
-    /// <summary>
-    /// Seed ratio in per mils (1000 = 1.0 ratio)
-    /// </summary>
-    public int SeedRatio { get; set; }
-
-    /// <summary>
-    /// Seeding time in seconds
-    /// 0 = No minimum seeding time
-    /// </summary>
-    public int SeedTime { get; set; }
-
-    /// <summary>
-    /// Upload slots
-    /// </summary>
-    public int UploadSlots { get; set; }
-
-    /// <summary>
-    /// Whether this torrent is private (based on PEX value)
-    /// Private torrents have PEX = -1 (not allowed)
-    /// </summary>
-    public bool IsPrivate => Pex == -1;
-
-    /// <summary>
-    /// Calculated seed ratio value (SeedRatio / 1000.0)
-    /// </summary>
-    public double SeedRatioValue => SeedRatio / 1000.0;
-} 

code/backend/Cleanuparr.Domain/Entities/UTorrent/Response/UTorrentResponse.cs

@@ -1,61 +0,0 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace Cleanuparr.Domain.Entities.UTorrent.Response;
-
-/// <summary>
-/// Base response wrapper for µTorrent Web UI API calls
-/// </summary>
-public sealed record UTorrentResponse<T>
-{
-    [JsonProperty(PropertyName = "build")]
-    public int Build { get; set; }
-
-    [JsonProperty(PropertyName = "label")]
-    public object[][]? Labels { get; set; }
-
-    [JsonProperty(PropertyName = "torrents")]
-    public T? Torrents { get; set; }
-
-    [JsonProperty(PropertyName = "torrentp")]
-    public object[]? TorrentProperties { get; set; }
-
-    [JsonProperty(PropertyName = "files")]
-    public object[]? FilesDto { get; set; }
-    
-    [JsonIgnore]
-    public List<UTorrentFile>? Files
-    {
-        get
-        {
-            if (FilesDto is null || FilesDto.Length < 2)
-            {
-                return null;
-            }
-
-            var files = new List<UTorrentFile>();
-            
-            if (FilesDto[1] is JArray jArray)
-            {
-                foreach (var jToken in jArray)
-                {
-                    var fileTokenArray = (JArray)jToken;
-                    var fileArray = fileTokenArray.ToObject<object[]>() ?? [];
-                    files.Add(new UTorrentFile
-                    {
-                        Name = fileArray[0].ToString() ?? string.Empty,
-                        Size = Convert.ToInt64(fileArray[1]),
-                        Downloaded = Convert.ToInt64(fileArray[2]),
-                        Priority = Convert.ToInt32(fileArray[3]),
-                    });
-                }
-                
-            }
-
-            return files;
-        }
-    }
-
-    [JsonProperty(PropertyName = "props")]
-    public UTorrentProperties[]? Properties { get; set; }
-} 

code/backend/Cleanuparr.Domain/Entities/Whisparr/WhisparrCommand.cs

@@ -1,16 +0,0 @@
-using Cleanuparr.Domain.Enums;
-
-namespace Cleanuparr.Domain.Entities.Whisparr;
-
-public sealed record WhisparrCommand
-{
-    public string Name { get; set; }
-
-    public long? SeriesId { get; set; }
-    
-    public long? SeasonNumber { get; set; }
-    
-    public List<long>? EpisodeIds { get; set; }
-    
-    public SeriesSearchType SearchType { get; set; }
-} 

code/backend/Cleanuparr.Domain/Enums/DeleteReason.cs

@@ -11,5 +11,4 @@ public enum DeleteReason
     AllFilesSkipped,
     AllFilesSkippedByQBit,
     AllFilesBlocked,
-    MalwareFileFound,
 }

code/backend/Cleanuparr.Domain/Enums/DownloadClientTypeName.cs

@@ -2,8 +2,7 @@
 
 public enum DownloadClientTypeName
 {
-    qBittorrent,
+    QBittorrent,
     Deluge,
     Transmission,
-    uTorrent,
-}
+}

code/backend/Cleanuparr.Domain/Enums/NotificationEventType.cs

@@ -1,13 +0,0 @@
-namespace Cleanuparr.Domain.Enums;
-
-public enum NotificationEventType
-{
-    Test,
-    FailedImportStrike,
-    StalledStrike,
-    SlowSpeedStrike,
-    SlowTimeStrike,
-    QueueItemDeleted,
-    DownloadCleaned,
-    CategoryChanged
-}

code/backend/Cleanuparr.Domain/Enums/NotificationProviderType.cs

@@ -1,8 +0,0 @@
-namespace Cleanuparr.Domain.Enums;
-
-public enum NotificationProviderType
-{
-    Notifiarr,
-    Apprise,
-    Ntfy
-}

code/backend/Cleanuparr.Domain/Enums/NtfyAuthenticationType.cs

@@ -1,8 +0,0 @@
-namespace Cleanuparr.Domain.Enums;
-
-public enum NtfyAuthenticationType
-{
-    None,
-    BasicAuth,
-    AccessToken
-}

code/backend/Cleanuparr.Domain/Enums/NtfyPriority.cs

@@ -1,10 +0,0 @@
-namespace Cleanuparr.Domain.Enums;
-
-public enum NtfyPriority
-{
-    Min = 1,
-    Low = 2,
-    Default = 3,
-    High = 4,
-    Max = 5
-}

code/backend/Cleanuparr.Domain/Enums/SonarrSearchType.cs

@@ -1,6 +1,6 @@
 namespace Cleanuparr.Domain.Enums;
 
-public enum SeriesSearchType
+public enum SonarrSearchType
 {
     Episode,
     Season,

code/backend/Cleanuparr.Domain/Exceptions/DelugeClientException.cs

@@ -1,4 +1,4 @@
-namespace Cleanuparr.Domain.Exceptions;
+namespace Data.Models.Deluge.Exceptions;
 
 public class DelugeClientException : Exception
 {

code/backend/Cleanuparr.Domain/Exceptions/DelugeLoginException.cs

@@ -1,4 +1,4 @@
-namespace Cleanuparr.Domain.Exceptions;
+namespace Data.Models.Deluge.Exceptions;
 
 public sealed class DelugeLoginException : DelugeClientException
 {

code/backend/Cleanuparr.Domain/Exceptions/DelugeLogoutException.cs

@@ -1,4 +1,4 @@
-namespace Cleanuparr.Domain.Exceptions;
+namespace Data.Models.Deluge.Exceptions;
 
 public sealed class DelugeLogoutException : DelugeClientException
 {

code/backend/Cleanuparr.Domain/Exceptions/UTorrentAuthenticationException.cs

@@ -1,15 +0,0 @@
-namespace Cleanuparr.Domain.Exceptions;
-
-/// <summary>
-/// Exception thrown when µTorrent authentication fails
-/// </summary>
-public class UTorrentAuthenticationException : UTorrentException
-{
-    public UTorrentAuthenticationException(string message) : base(message)
-    {
-    }
-    
-    public UTorrentAuthenticationException(string message, Exception innerException) : base(message, innerException)
-    {
-    }
-}

code/backend/Cleanuparr.Domain/Exceptions/UTorrentException.cs

@@ -1,12 +0,0 @@
-namespace Cleanuparr.Domain.Exceptions;
-
-public class UTorrentException : Exception
-{
-    public UTorrentException(string message) : base(message)
-    {
-    }
-    
-    public UTorrentException(string message, Exception innerException) : base(message, innerException)
-    {
-    }
-}

code/backend/Cleanuparr.Domain/Exceptions/UTorrentParsingException.cs

@@ -1,22 +0,0 @@
-namespace Cleanuparr.Domain.Exceptions;
-
-/// <summary>
-/// Exception thrown when µTorrent response parsing fails
-/// </summary>
-public class UTorrentParsingException : UTorrentException
-{
-    /// <summary>
-    /// The raw response that failed to parse
-    /// </summary>
-    public string RawResponse { get; }
-
-    public UTorrentParsingException(string message, string rawResponse) : base(message)
-    {
-        RawResponse = rawResponse;
-    }
-    
-    public UTorrentParsingException(string message, string rawResponse, Exception innerException) : base(message, innerException)
-    {
-        RawResponse = rawResponse;
-    }
-}

code/backend/Cleanuparr.Infrastructure.Tests/Cleanuparr.Infrastructure.Tests.csproj

@@ -16,7 +16,6 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-        <PackageReference Include="Moq" Version="4.20.72" />
         <PackageReference Include="NSubstitute" Version="5.3.0" />
         <PackageReference Include="Serilog" Version="4.3.0" />
         <PackageReference Include="Serilog.Expressions" Version="5.0.0" />

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

@@ -1,8 +1,8 @@
-using Cleanuparr.Infrastructure.Features.MalwareBlocker;
+using Cleanuparr.Infrastructure.Features.ContentBlocker;
 using Microsoft.Extensions.Logging;
 using NSubstitute;
 
-namespace Cleanuparr.Infrastructure.Tests.Verticals.MalwareBlocker;
+namespace Cleanuparr.Infrastructure.Tests.Verticals.ContentBlocker;
 
 public class FilenameEvaluatorFixture
 {

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

@@ -4,7 +4,7 @@ using Cleanuparr.Domain.Enums;
 using Shouldly;
 using Xunit;
 
-namespace Cleanuparr.Infrastructure.Tests.Verticals.MalwareBlocker;
+namespace Cleanuparr.Infrastructure.Tests.Verticals.ContentBlocker;
 
 public class FilenameEvaluatorTests : IClassFixture<FilenameEvaluatorFixture>
 {

code/backend/Cleanuparr.Infrastructure.Tests/Verticals/DownloadClient/UTorrentClientTests.cs

@@ -1,266 +0,0 @@
-using System.Net;
-using Cleanuparr.Domain.Entities.UTorrent.Response;
-using Cleanuparr.Domain.Enums;
-using Cleanuparr.Infrastructure.Features.DownloadClient.UTorrent;
-using Cleanuparr.Persistence.Models.Configuration;
-using Microsoft.Extensions.Logging;
-using Moq;
-using Moq.Protected;
-using Newtonsoft.Json;
-using Xunit;
-
-namespace Cleanuparr.Infrastructure.Tests.Verticals.DownloadClient;
-
-public class UTorrentClientTests
-{
-    private readonly UTorrentClient _client;
-    private readonly Mock<HttpMessageHandler> _mockHttpHandler;
-    private readonly DownloadClientConfig _config;
-    private readonly Mock<IUTorrentAuthenticator> _mockAuthenticator;
-    private readonly Mock<IUTorrentHttpService> _mockHttpService;
-    private readonly Mock<IUTorrentResponseParser> _mockResponseParser;
-    private readonly Mock<ILogger<UTorrentClient>> _mockLogger;
-
-    public UTorrentClientTests()
-    {
-        _mockHttpHandler = new Mock<HttpMessageHandler>();
-        _mockAuthenticator = new Mock<IUTorrentAuthenticator>();
-        _mockHttpService = new Mock<IUTorrentHttpService>();
-        _mockResponseParser = new Mock<IUTorrentResponseParser>();
-        _mockLogger = new Mock<ILogger<UTorrentClient>>();
-        
-        _config = new DownloadClientConfig
-        {
-            Name = "test",
-            Type = DownloadClientType.Torrent,
-            TypeName = DownloadClientTypeName.uTorrent,
-            Host = new Uri("http://localhost:8080"),
-            Username = "admin",
-            Password = "password"
-        };
-
-        _client = new UTorrentClient(
-            _config,
-            _mockAuthenticator.Object,
-            _mockHttpService.Object,
-            _mockResponseParser.Object,
-            _mockLogger.Object
-        );
-    }
-
-    [Fact]
-    public async Task GetTorrentFilesAsync_ShouldDeserializeMixedArrayCorrectly()
-    {
-        // Arrange
-        var mockResponse = new UTorrentResponse<object>
-        {
-            Build = 30470,
-            FilesDto = new object[]
-            {
-                "F0616FB199B78254474AF6D72705177E71D713ED", // Hash (string)
-                new object[] // File 1
-                {
-                    "test name",
-                    2604L,
-                    0L,
-                    2,
-                    0,
-                    1,
-                    false,
-                    -1,
-                    -1,
-                    -1,
-                    -1,
-                    -1,
-                    0
-                },
-                new object[] // File 2
-                {
-                    "Dir1/Dir11/test11.zipx",
-                    2604L,
-                    0L,
-                    2,
-                    0,
-                    1,
-                    false,
-                    -1,
-                    -1,
-                    -1,
-                    -1,
-                    -1,
-                    0
-                },
-                new object[] // File 3
-                {
-                    "Dir1/sample.txt",
-                    2604L,
-                    0L,
-                    2,
-                    0,
-                    1,
-                    false,
-                    -1,
-                    -1,
-                    -1,
-                    -1,
-                    -1,
-                    0
-                }
-            }
-        };
-
-        // Mock the token request
-        var tokenResponse = new HttpResponseMessage
-        {
-            StatusCode = HttpStatusCode.OK,
-            Content = new StringContent("<div id='token'>test-token</div>")
-        };
-        tokenResponse.Headers.Add("Set-Cookie", "GUID=test-guid; path=/");
-
-        // Mock the files request
-        var filesResponse = new HttpResponseMessage
-        {
-            StatusCode = HttpStatusCode.OK,
-            Content = new StringContent(JsonConvert.SerializeObject(mockResponse))
-        };
-
-        // Setup mock to return different responses based on URL
-        _mockHttpHandler
-            .Protected()
-            .Setup<Task<HttpResponseMessage>>("SendAsync", 
-                ItExpr.Is<HttpRequestMessage>(req => req.RequestUri!.AbsolutePath.Contains("token.html")), 
-                ItExpr.IsAny<CancellationToken>())
-            .ReturnsAsync(tokenResponse);
-
-        _mockHttpHandler
-            .Protected()
-            .Setup<Task<HttpResponseMessage>>("SendAsync", 
-                ItExpr.Is<HttpRequestMessage>(req => req.RequestUri!.AbsolutePath.Contains("gui") && req.RequestUri.Query.Contains("action=getfiles")), 
-                ItExpr.IsAny<CancellationToken>())
-            .ReturnsAsync(filesResponse);
-
-        // Act
-        var files = await _client.GetTorrentFilesAsync("test-hash");
-
-        // Assert
-        Assert.NotNull(files);
-        Assert.Equal(3, files.Count);
-        
-        Assert.Equal("test name", files[0].Name);
-        Assert.Equal(2604L, files[0].Size);
-        Assert.Equal(0L, files[0].Downloaded);
-        Assert.Equal(2, files[0].Priority);
-        Assert.Equal(0, files[0].Index);
-        
-        Assert.Equal("Dir1/Dir11/test11.zipx", files[1].Name);
-        Assert.Equal(2604L, files[1].Size);
-        Assert.Equal(0L, files[1].Downloaded);
-        Assert.Equal(2, files[1].Priority);
-        Assert.Equal(1, files[1].Index);
-        
-        Assert.Equal("Dir1/sample.txt", files[2].Name);
-        Assert.Equal(2604L, files[2].Size);
-        Assert.Equal(0L, files[2].Downloaded);
-        Assert.Equal(2, files[2].Priority);
-        Assert.Equal(2, files[2].Index);
-    }
-
-    [Fact]
-    public async Task GetTorrentFilesAsync_ShouldHandleEmptyResponse()
-    {
-        // Arrange
-        var mockResponse = new UTorrentResponse<object>
-        {
-            Build = 30470,
-            FilesDto = new object[]
-            {
-                "F0616FB199B78254474AF6D72705177E71D713ED" // Only hash, no files
-            }
-        };
-
-        // Mock the token request
-        var tokenResponse = new HttpResponseMessage
-        {
-            StatusCode = HttpStatusCode.OK,
-            Content = new StringContent("<div id='token'>test-token</div>")
-        };
-        tokenResponse.Headers.Add("Set-Cookie", "GUID=test-guid; path=/");
-
-        // Mock the files request
-        var filesResponse = new HttpResponseMessage
-        {
-            StatusCode = HttpStatusCode.OK,
-            Content = new StringContent(JsonConvert.SerializeObject(mockResponse))
-        };
-
-        // Setup mock to return different responses based on URL
-        _mockHttpHandler
-            .Protected()
-            .Setup<Task<HttpResponseMessage>>("SendAsync", 
-                ItExpr.Is<HttpRequestMessage>(req => req.RequestUri!.AbsolutePath.Contains("token.html")), 
-                ItExpr.IsAny<CancellationToken>())
-            .ReturnsAsync(tokenResponse);
-
-        _mockHttpHandler
-            .Protected()
-            .Setup<Task<HttpResponseMessage>>("SendAsync", 
-                ItExpr.Is<HttpRequestMessage>(req => req.RequestUri!.AbsolutePath.Contains("gui") && req.RequestUri.Query.Contains("action=getfiles")), 
-                ItExpr.IsAny<CancellationToken>())
-            .ReturnsAsync(filesResponse);
-
-        // Act
-        var files = await _client.GetTorrentFilesAsync("test-hash");
-
-        // Assert
-        Assert.NotNull(files);
-        Assert.Empty(files);
-    }
-
-    [Fact]
-    public async Task GetTorrentFilesAsync_ShouldHandleNullResponse()
-    {
-        // Arrange
-        var mockResponse = new UTorrentResponse<object>
-        {
-            Build = 30470,
-            FilesDto = null
-        };
-
-        // Mock the token request
-        var tokenResponse = new HttpResponseMessage
-        {
-            StatusCode = HttpStatusCode.OK,
-            Content = new StringContent("<div id='token'>test-token</div>")
-        };
-        tokenResponse.Headers.Add("Set-Cookie", "GUID=test-guid; path=/");
-
-        // Mock the files request
-        var filesResponse = new HttpResponseMessage
-        {
-            StatusCode = HttpStatusCode.OK,
-            Content = new StringContent(JsonConvert.SerializeObject(mockResponse))
-        };
-
-        // Setup mock to return different responses based on URL
-        _mockHttpHandler
-            .Protected()
-            .Setup<Task<HttpResponseMessage>>("SendAsync", 
-                ItExpr.Is<HttpRequestMessage>(req => req.RequestUri!.AbsolutePath.Contains("token.html")), 
-                ItExpr.IsAny<CancellationToken>())
-            .ReturnsAsync(tokenResponse);
-
-        _mockHttpHandler
-            .Protected()
-            .Setup<Task<HttpResponseMessage>>("SendAsync", 
-                ItExpr.Is<HttpRequestMessage>(req => req.RequestUri!.AbsolutePath.Contains("gui") && req.RequestUri.Query.Contains("action=getfiles")), 
-                ItExpr.IsAny<CancellationToken>())
-            .ReturnsAsync(filesResponse);
-
-        // Act
-        var files = await _client.GetTorrentFilesAsync("test-hash");
-
-        // Assert
-        Assert.NotNull(files);
-        Assert.Empty(files);
-    }
-} 

code/backend/Cleanuparr.Infrastructure/Cleanuparr.Infrastructure.csproj

@@ -7,18 +7,20 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="FLM.QBittorrent" Version="1.0.2" />
+      <Folder Include="Features\" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="FLM.QBittorrent" Version="1.0.1" />
       <PackageReference Include="FLM.Transmission" Version="1.0.3" />
       <PackageReference Include="Mapster" Version="7.4.0" />
       <PackageReference Include="MassTransit.Abstractions" Version="8.4.1" />
       <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.2.0" />
-      <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="9.0.0" />
       <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.6" />
       <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.6" />
       <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
       <PackageReference Include="Mono.Unix" Version="7.1.0-final.1.21458.1" />
       <PackageReference Include="Quartz" Version="3.14.0" />
-      <PackageReference Include="Serilog.Expressions" Version="5.0.0" />
     </ItemGroup>
 
     <ItemGroup>

code/backend/Cleanuparr.Infrastructure/Events/EventCleanupService.cs

@@ -11,15 +11,15 @@ namespace Cleanuparr.Infrastructure.Events;
 /// </summary>
 public class EventCleanupService : BackgroundService
 {
+    private readonly IServiceProvider _serviceProvider;
     private readonly ILogger<EventCleanupService> _logger;
-    private readonly IServiceScopeFactory _scopeFactory;
     private readonly TimeSpan _cleanupInterval = TimeSpan.FromHours(4); // Run every 4 hours
     private readonly int _retentionDays = 30; // Keep events for 30 days
 
-    public EventCleanupService(ILogger<EventCleanupService> logger, IServiceScopeFactory scopeFactory)
+    public EventCleanupService(IServiceProvider serviceProvider, ILogger<EventCleanupService> logger)
     {
+        _serviceProvider = serviceProvider;
         _logger = logger;
-        _scopeFactory = scopeFactory;
     }
 
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
@@ -58,7 +58,7 @@ public class EventCleanupService : BackgroundService
     {
         try
         {
-            await using var scope = _scopeFactory.CreateAsyncScope();
+            using var scope = _serviceProvider.CreateScope();
             var context = scope.ServiceProvider.GetRequiredService<EventsContext>();
 
             var cutoffDate = DateTime.UtcNow.AddDays(-_retentionDays);

code/backend/Cleanuparr.Infrastructure/Events/EventPublisher.cs

@@ -1,14 +1,12 @@
-using System.Dynamic;
 using System.Text.Json;
-using System.Text.Json.Serialization;
-using Cleanuparr.Domain.Entities.Arr.Queue;
 using Cleanuparr.Domain.Enums;
 using Cleanuparr.Infrastructure.Features.Context;
 using Cleanuparr.Infrastructure.Features.Notifications;
 using Cleanuparr.Infrastructure.Hubs;
-using Cleanuparr.Infrastructure.Interceptors;
 using Cleanuparr.Persistence;
 using Cleanuparr.Persistence.Models.Events;
+using Infrastructure.Interceptors;
+using Infrastructure.Verticals.Notifications;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Logging;
 
@@ -49,10 +47,7 @@ public class EventPublisher
             EventType = eventType,
             Message = message,
             Severity = severity,
-            Data = data != null ? JsonSerializer.Serialize(data, new JsonSerializerOptions
-            {
-                Converters = { new JsonStringEnumConverter() }
-            }) : null,
+            Data = data != null ? JsonSerializer.Serialize(data) : null,
             TrackingId = trackingId
         };
 
@@ -78,40 +73,14 @@ public class EventPublisher
             StrikeType.FailedImport => EventType.FailedImportStrike,
             StrikeType.SlowSpeed => EventType.SlowSpeedStrike,
             StrikeType.SlowTime => EventType.SlowTimeStrike,
-            _ => throw new ArgumentOutOfRangeException(nameof(strikeType), strikeType, null)
         };
 
-        dynamic data;
-
-        if (strikeType is StrikeType.FailedImport)
-        {
-            QueueRecord record = ContextProvider.Get<QueueRecord>(nameof(QueueRecord));
-            data = new
-            {
-                hash,
-                itemName,
-                strikeCount,
-                strikeType,
-                failedImportReasons = record.StatusMessages ?? [],
-            };
-        }
-        else
-        {
-            data = new
-            {
-                hash,
-                itemName,
-                strikeCount,
-                strikeType,
-            };
-        }
-
         // Publish the event
         await PublishAsync(
             eventType,
             $"Item '{itemName}' has been struck {strikeCount} times for reason '{strikeType}'",
             EventSeverity.Important,
-            data: data);
+            data: new { hash, itemName, strikeCount, strikeType });
 
         // Send notification (uses ContextProvider internally)
         await _notificationPublisher.NotifyStrike(strikeType, strikeCount);

code/backend/Cleanuparr.Infrastructure/Extensions/DelugeExtensions.cs

@@ -1,5 +1,6 @@
 using Cleanuparr.Domain.Entities.Deluge.Response;
 using Cleanuparr.Infrastructure.Services;
+using Infrastructure.Services;
 
 namespace Cleanuparr.Infrastructure.Extensions;
 

code/backend/Cleanuparr.Infrastructure/Extensions/QBitExtensions.cs

@@ -1,4 +1,5 @@
 using Cleanuparr.Infrastructure.Services;
+using Infrastructure.Services;
 using QBittorrent.Client;
 
 namespace Cleanuparr.Infrastructure.Extensions;

code/backend/Cleanuparr.Infrastructure/Extensions/TransmissionExtensions.cs

@@ -1,4 +1,5 @@
 using Cleanuparr.Infrastructure.Services;
+using Infrastructure.Services;
 using Transmission.API.RPC.Entity;
 
 namespace Cleanuparr.Infrastructure.Extensions;

code/backend/Cleanuparr.Infrastructure/Features/Arr/ArrClient.cs

@@ -1,13 +1,13 @@
-using Cleanuparr.Domain.Entities.Arr.Queue;
 using Cleanuparr.Domain.Enums;
 using Cleanuparr.Infrastructure.Features.Arr.Interfaces;
 using Cleanuparr.Infrastructure.Features.Context;
 using Cleanuparr.Infrastructure.Features.ItemStriker;
-using Cleanuparr.Infrastructure.Interceptors;
 using Cleanuparr.Persistence.Models.Configuration.Arr;
 using Cleanuparr.Persistence.Models.Configuration.QueueCleaner;
 using Cleanuparr.Shared.Helpers;
 using Data.Models.Arr;
+using Data.Models.Arr.Queue;
+using Infrastructure.Interceptors;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 
@@ -65,7 +65,7 @@ public abstract class ArrClient : IArrClient
         return queueResponse;
     }
 
-    public virtual async Task<bool> ShouldRemoveFromQueue(InstanceType instanceType, QueueRecord record, bool isPrivateDownload, short arrMaxStrikes)
+    public virtual async Task<bool> ShouldRemoveFromQueue(InstanceType instanceType, QueueRecord record, bool isPrivateDownload, ushort arrMaxStrikes)
     {
         var queueCleanerConfig = ContextProvider.Get<QueueCleanerConfig>();
         
@@ -105,12 +105,6 @@ public abstract class ArrClient : IArrClient
             
             ushort maxStrikes = arrMaxStrikes > 0 ? (ushort)arrMaxStrikes : queueCleanerConfig.FailedImport.MaxStrikes;
             
-            _logger.LogInformation(
-                "Item {title} has failed import status with the following reason(s):\n{messages}",
-                record.Title,
-                string.Join("\n",  record.StatusMessages?.Select(JsonConvert.SerializeObject) ?? [])
-            );
-            
             return await _striker.StrikeAndCheckLimit(
                 record.DownloadId,
                 record.Title,
@@ -212,7 +206,7 @@ public abstract class ArrClient : IArrClient
         return response;
     }
     
-    private static bool HasIgnoredPatterns(QueueRecord record)
+    private bool HasIgnoredPatterns(QueueRecord record)
     {
         var queueCleanerConfig = ContextProvider.Get<QueueCleanerConfig>();
         

code/backend/Cleanuparr.Infrastructure/Features/Arr/ArrClientFactory.cs

@@ -8,22 +8,16 @@ public sealed class ArrClientFactory
     private readonly ISonarrClient _sonarrClient;
     private readonly IRadarrClient _radarrClient;
     private readonly ILidarrClient _lidarrClient;
-    private readonly IReadarrClient _readarrClient;
-    private readonly IWhisparrClient _whisparrClient;
 
     public ArrClientFactory(
         SonarrClient sonarrClient,
         RadarrClient radarrClient,
-        LidarrClient lidarrClient,
-        ReadarrClient readarrClient,
-        WhisparrClient whisparrClient
+        LidarrClient lidarrClient
     )
     {
         _sonarrClient = sonarrClient;
         _radarrClient = radarrClient;
         _lidarrClient = lidarrClient;
-        _readarrClient = readarrClient;
-        _whisparrClient = whisparrClient;
     }
     
     public IArrClient GetClient(InstanceType type) =>
@@ -32,8 +26,6 @@ public sealed class ArrClientFactory
             InstanceType.Sonarr => _sonarrClient,
             InstanceType.Radarr => _radarrClient,
             InstanceType.Lidarr => _lidarrClient,
-            InstanceType.Readarr => _readarrClient,
-            InstanceType.Whisparr => _whisparrClient,
             _ => throw new NotImplementedException($"instance type {type} is not yet supported")
         };
 }

code/backend/Cleanuparr.Infrastructure/Features/Arr/ArrQueueIterator.cs

@@ -1,6 +1,6 @@
-using Cleanuparr.Domain.Entities.Arr.Queue;
-using Cleanuparr.Infrastructure.Features.Arr.Interfaces;
+using Cleanuparr.Infrastructure.Features.Arr.Interfaces;
 using Cleanuparr.Persistence.Models.Configuration.Arr;
+using Data.Models.Arr.Queue;
 using Microsoft.Extensions.Logging;
 
 namespace Cleanuparr.Infrastructure.Features.Arr;

code/backend/Cleanuparr.Infrastructure/Features/Arr/Interfaces/IArrClient.cs

@@ -1,7 +1,7 @@
-using Cleanuparr.Domain.Entities.Arr.Queue;
-using Cleanuparr.Domain.Enums;
+using Cleanuparr.Domain.Enums;
 using Cleanuparr.Persistence.Models.Configuration.Arr;
 using Data.Models.Arr;
+using Data.Models.Arr.Queue;
 
 namespace Cleanuparr.Infrastructure.Features.Arr.Interfaces;
 
@@ -9,7 +9,7 @@ public interface IArrClient
 {
     Task<QueueListResponse> GetQueueItemsAsync(ArrInstance arrInstance, int page);
 
-    Task<bool> ShouldRemoveFromQueue(InstanceType instanceType, QueueRecord record, bool isPrivateDownload, short arrMaxStrikes);
+    Task<bool> ShouldRemoveFromQueue(InstanceType instanceType, QueueRecord record, bool isPrivateDownload, ushort arrMaxStrikes);
 
     Task DeleteQueueItemAsync(ArrInstance arrInstance, QueueRecord record, bool removeFromClient, DeleteReason deleteReason);