Switch from overseerr to jellyseerr

README.md

@@ -23,15 +23,13 @@ Having Plex and Jellyfin separate from the rest of my docker infrastructure allo
 **Storage:**
 * `/`: 1 TB NVME SSD
 * `/vm_storage`: 2x 240 GB SSD in ZFS mirror for config and data files
-* `/mnt/storage`: mergerfs + SnapRAID pool totaling 56 TB usable storage. Currently single parity disk but hoping to add a second one soon. Drives run btrfs allowing me to utilize [snapraid-btrfs](https://wiki.selfhosted.show/tools/snapraid-btrfs/) for instant snapshotting
+* `/mnt/storage`: mergerfs + SnapRAID pool totaling ~90 TiB usable storage. Currently single parity disk but hoping to add a second one soon. Drives run btrfs allowing me to utilize [snapraid-btrfs](https://wiki.selfhosted.show/tools/snapraid-btrfs/) for instant snapshotting
 
 ## Roadmap
 
 * Flesh out backup strategy with btrfs snapshots and restic (separately)
 * Move everything to Arch VMs on Proxmox
-* Move VMs to an Arch Host with virtiofs
+* Possibly set up second Proxmox node for backups
 * Immich for photo management
-* Prosody for XMPP
-* Move forge to forgejo
 * Look into [Wazuh](https://github.com/wazuh/wazuh) for threat prevention/detection
 * [GoAccess](https://goaccess.io/) for web server analytics

ansible/host_vars/pve-docker/main.yml

@@ -7,6 +7,7 @@ docker_compose_directory_mask: 0775
 docker_compose_file_mask: 0664
 install_directory: /srv
 
+vpn_listen_port: 61383
 
 sonarr_api_key: !vault |
   $ANSIBLE_VAULT;1.1;AES256
@@ -26,4 +27,26 @@ radarr_api_key: !vault |
   66613735373430636437343135303238663534316632363534323130313934306536633862303632
   6431656565666466303837336430613062346331646432306164
 
-vpn_listen_port: 61383
+slskd_api_key: !vault |
+  $ANSIBLE_VAULT;1.1;AES256
+  39666166376666636338643866636262356665363135386336343030326539363163333963626163
+  6666313861613930663433623933343439366562356563340a663639363566336435376436303762
+  65613536356139356364653432643736366436333139666165383736323834656130393036306339
+  3065646663366136320a383936643239343039656334336236623232313035633664303434383030
+  66626663303961333936306661623339333634653433633035633734373261366231333365383062
+  33633863366639326236373234326264616136656463353164353730376366373939643061306239
+  36353234333363386563643066313861343633376236333162313737366536613066303633363566
+  36633636653261343431356230666234626162333630333536633233313036326661373836333766
+  39343331396465323261393563306631666632343330306637636365373963613430633236656539
+  63663665386334306235336262656438396336633037363534666438373534623333333061646130
+  653230663539386239396337306130373531
+
+lidarr_api_key: !vault |
+  $ANSIBLE_VAULT;1.1;AES256
+  64336163343037336539353364636235383462643538396534636630323266333730353636366235
+  3938396634613464613639356466616365353738633433320a323333333339316332613266373939
+  33613133653436316230623634323066383535653961386465643334396166353064666135343030
+  3638613966616630390a613261336531343934393634316263303632353038643634663236666162
+  62653835383739653661363962303862613338333865363430383335643635353037656537323034
+  6164633230363736306565646233333466313362653738303065
+

ansible/main.yml

@@ -1,36 +1,3 @@
 - hosts: pve-docker
   roles:
-    - pve-docker
-    - docker-compose
-    - traefik
-    - tautulli
-    - searxng
-    - prowlarr
-    - sonarr
-    - radarr
-    - firefly3
-    - overseerr
-    - ntfy
-    - gluetun
-    - name: qbittorrent
-      tags: test
-    - nextcloud
-    - redlib
-    - readarr
-    - calibre
-    - calibre-web
-    - deemix
-    - barassistant
-    - mealie
-    - recyclarr
-    - firefly3
-    - sabnzbd
-    - unifi-controller
-    - slskd
-    - navidrome
-    - lidarr
-    - lubelogger
-    - searxng
-    - synapse
-    - rimgo
-    - gitea
+    - qbittorrent

ansible/roles/authentik/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/autobrr/tasks/main.yml

@@ -0,0 +1,46 @@
+- name: Create service user
+  user:
+    name: "{{ role_name }}"
+    system: true
+  register: service_user
+  become: true
+
+- name: Create install directory
+  file:
+    path: "{{ install_directory }}/{{ role_name }}"
+    state: directory
+    owner: "{{ docker_user }}"
+    mode: "{{ docker_compose_directory_mask }}"
+  become: true
+
+- name: Create config directory
+  file:
+    path: "{{ data_dir }}/{{ role_name }}"
+    state: directory
+    owner: "{{ service_user.uid }}"
+    group: "{{ docker_user }}"
+    mode: "{{ docker_compose_directory_mask }}"
+  become: true
+
+- name: Install config file
+  template:
+    src: "config.toml"
+    dest: "{{ data_dir }}/{{ role_name }}/config.toml"
+    owner: "{{ service_user.uid }}"
+    group: "{{ docker_user }}"
+  become: true
+
+- name: Copy docker-compose file to destination
+  template:
+    src: docker-compose.yml
+    dest: "{{ install_directory }}/{{ role_name }}/docker-compose.yml"
+    owner: "{{ docker_user }}"
+    mode: "{{ docker_compose_file_mask }}"
+    validate: docker compose -f %s config
+  become: true
+
+- name: Start docker container
+  community.docker.docker_compose_v2:
+    project_src: "{{ install_directory }}/{{ role_name }}"
+    pull: always
+    remove_orphans: yes

ansible/roles/autobrr/templates/config.toml

@@ -0,0 +1,8 @@
+# config.toml
+
+host = "0.0.0.0"
+
+# Default: 7474
+port = 7474
+
+sessionSecret = "7bae936f68b70a015b12b9b19a8a652a"

ansible/roles/autobrr/templates/docker-compose.yml

@@ -0,0 +1,22 @@
+
+networks:
+  traefik:
+    external: true
+
+services:
+  "{{ role_name }}":
+    container_name: "{{ role_name }}"
+    image: "ghcr.io/autobrr/autobrr:latest"
+    restart: unless-stopped
+    networks:
+      - traefik
+    user: "{{ service_user.uid }}:{{ service_user.uid }}"
+    environment:
+      - "TZ={{ timezone }}"
+    volumes:
+      - "{{ data_dir }}/{{ role_name }}:/config"
+    labels:
+      traefik.enable: true
+      traefik.http.routers.{{ role_name }}.rule: "Host(`{{ role_name }}.local.{{ personal_domain }}`)"
+      traefik.http.routers.{{ role_name }}.middlewares: lan-whitelist@file
+      traefik.http.services.{{ role_name }}.loadbalancer.server.port: {{ service_port }}

ansible/roles/autobrr/vars/main.yml

@@ -0,0 +1,10 @@
+service_port: 7474
+
+session_secret: !vault |
+  $ANSIBLE_VAULT;1.1;AES256
+  37633531366164363734323934653137636663393533356434323936393932383036666361373733
+  3430643961313935336130626431326564396534333262330a356165333437343462656533623366
+  66303066353135616665323230633133633434343638346461646339666330366561643166393133
+  3939636539393365660a386638393232646138313566323065376237643361383332336631396133
+  66336339343363356162303330363431346137613263626139663666623937336638303530656561
+  3236376239306261313232346537383264623461366565393839

ansible/roles/barassistant/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/beets/files/config.yaml

@@ -1,42 +1,37 @@
-plugins: fetchart embedart scrub replaygain lastgenre chroma web inline
 directory: /music
-library: /config/musiclibrary.blb
-art_filename: cover
-threaded: yes
-original_date: no
 per_disc_numbering: yes
 
+plugins: fetchart web inline lyrics
+
 paths:
     default: $albumartist/$album%aunique{}/%if{$multidisc,$disc}$track - $title
     singleton: Non-Album/$artist - $title
     comp: Various Artists/$album%aunique{}/%if{$multidisc,$disc}$track - $title
-    albumtype_soundtrack: Soundtracks/$album/$track $title 
 item_fields:
   multidisc: 1 if disctotal > 1 else 0 # Makes it so track number is preceded by disc number only if album contains multiple discs
         
 import:
     write: yes
-    copy: no
-    move: yes
+    hardlink: yes
     resume: ask
     incremental: yes
     quiet_fallback: skip
     timid: no
     log: /config/beet.log
+    languages: "en jp es"
 
-lastgenre:
-    auto: yes
-    source: album
+asciify_paths: yes
 
 embedart:
     auto: yes
 
 fetchart:
     auto: yes
-    
-replaygain:
-    auto: no
+    high_resolution: yes
 
+lyrics:
+    sources: [lrclib, genius]
+    
 scrub:
     auto: yes
 

ansible/roles/beets/templates/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "{{ docker_compose_version }}"
-
 networks:
   traefik:
     external: true

ansible/roles/calibre-web/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/calibre/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/deemix/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/firefly3/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   firefly_iii:

ansible/roles/gitea/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/jellyseerr/tasks/main.yml

@@ -1,10 +1,3 @@
-- name: Create service user
-  user:
-    name: "{{ role_name }}"
-    system: true
-  register: service_user
-  become: true
-
 - name: Create install directory
   file:
     path: "{{ install_directory }}/{{ role_name }}"

ansible/roles/jellyseerr/templates/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "{{ docker_compose_version }}"
-
 networks:
   traefik:
     external: true
@@ -7,16 +5,21 @@ networks:
 services:
   {{ role_name }}:
     container_name: "{{ role_name }}"
-    image: lscr.io/linuxserver/overseerr:latest
+    image: fallenbagel/jellyseerr:latest
     restart: unless-stopped
     networks:
       - traefik
     environment:
-      - "PUID={{ service_user.uid }}"
-      - "PGID={{ service_user.uid }}"
+      - LOG_LEVEL=debug
       - "TZ={{ timezone }}"
     volumes:
-      - "{{ data_dir }}/{{ role_name }}:/config"
+      - "{{ data_dir }}/{{ role_name }}:/app/config"
+    healthcheck:
+      test: wget --no-verbose --tries=1 --spider http://localhost:5055/api/v1/status || exit 1
+      start_period: 20s
+      timeout: 3s
+      interval: 15s
+      retries: 3
     labels:
       traefik.enable: true
       traefik.http.routers.{{ role_name }}.rule: "Host(`requests.{{ personal_domain }}`)"

ansible/roles/lidarr/files/scripts_init.bash

@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bash
+set -euo pipefail
+
+curl -sfL https://raw.githubusercontent.com/RandomNinjaAtk/arr-scripts/main/lidarr/setup.bash | bash
+exit

ansible/roles/lidarr/tasks/main.yml

@@ -24,6 +24,32 @@
     validate: docker compose -f %s config
   become: true
 
+- name: Create data directory
+  ansible.builtin.file:
+    path: "{{ data_dir }}/{{ item }}"
+    state: directory
+    owner: "{{ service_user.uid }}"
+    group: "{{ primary_gid }}"
+    mode: "{{ docker_compose_directory_mask }}"
+  become: true
+  loop:
+    - "{{ role_name }}/config"
+    - "{{ role_name }}/custom-services"
+    - "{{ role_name }}/custom-cont"
+
+- name: Copy arr-scripts init script
+  ansible.builtin.copy:
+    src: "scripts_init.bash"
+    dest: "{{ data_dir }}/{{ role_name }}/custom-cont"
+    owner: "{{ service_user.uid }}"
+    mode: 0564
+  become: true
+
+- name: Copy extended.conf
+  ansible.builtin.template:
+    src: "extended.conf"
+    dest: "{{ data_dir }}/{{ role_name }}/config"
+
 - name: Start docker container
   community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"

ansible/roles/lidarr/templates/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "{{ docker_compose_version }}"
-
 networks:
   traefik:
     external: true
@@ -17,8 +15,11 @@ services:
       - "TZ={{ timezone }}"
       - "UMASK=002"
     volumes:
-      - "{{ data_dir }}/{{ role_name }}:/config"
+      - "{{ data_dir }}/{{ role_name }}/config:/config"
       - "{{ media_storage_mnt }}/data:/data"
+    # arr-scripts - https://github.com/RandomNinjaAtk/arr-scripts/blob/main/lidarr/readme.md
+      - "{{ data_dir }}/{{ role_name }}/custom-services:/custom-services.d"
+      - "{{ data_dir }}/{{ role_name }}/custom-cont:/custom-cont-init.d"
     labels:
       traefik.enable: true
       traefik.http.routers.{{ role_name }}.rule: "Host(`{{ role_name }}.local.{{ personal_domain }}`)"

ansible/roles/lidarr/templates/extended.conf

@@ -0,0 +1,89 @@
+##### LIDARR EXTENDED SCRIPTS SETTINGS #####
+
+##### PATHS
+downloadPath="/config/extended/downloads" # OPTIONAL, only change if needed.... Temporary Download Location for incoming Audio files from included clients
+importPath="/config/extended/import"      # OPTIONAL, only change if needed.... Completed downloads are stored here for the Usenet Blackhole client to import from. When Using queue cleaner, failed imports will be automatically cleaned up.
+videoPath=""                              # Final destination/location of completed Videos
+
+##### SCRIPT ENABLEMENT
+enableAutoConfig="true"            # true = enabled :: Automatically configures Lidarr with optimal settings
+enableAudio="true"                 # true = enabled :: Enables the Audio script to run automatically
+enableVideo="false"                 # true = enabled :: Enables the Video script to run automatically
+enableUnmappedFilesCleaner="false" # true = enabled :: Enables the UnmappedFilesCleaner script to run automatically
+enableQueueCleaner="true"          # true = enabled :: Enables the QueueCleaner script to run automatically
+
+##### SCRIPT INTERVALS
+audioScriptInterval=15m                 #s or #m or #h or #d :: s = seconds, m = minutes, h = hours, d = days :: Amount of time between each script run, when script is enabled
+videoScriptInterval=15m                 #s or #m or #h or #d :: s = seconds, m = minutes, h = hours, d = days :: Amount of time between each script run, when script is enabled
+autoArtistAdderInterval=12h             #s or #m or #h or #d :: s = seconds, m = minutes, h = hours, d = days :: Amount of time between each script run, when script is enabled
+unmappedFolderCleanerScriptInterval=15m #s or #m or #h or #d :: s = seconds, m = minutes, h = hours, d = days :: Amount of time between each script run, when script is enabled
+queueCleanerScriptInterval=15m          #s or #m or #h or #d :: s = seconds, m = minutes, h = hours, d = days :: Amount of time between each script run, when script is enabled
+
+##### AUTOCONFIG SCRIPT SETTINGS
+configureMediaManagement="true"               # Configures Lidarr Media Management Settings
+configureMetadataConsumerSettings="false"      # Configures Lidarr Metadata Consumer Settings
+configureMetadataProviderSettings="false"      # Configures Lidarr Metadata Provider Settings
+configureCustomScripts="true"                  # Adds custom scripts to Lidarr
+configureLidarrUiSettings="true"              # Configures Lidarr UI Settings
+configureMetadataProfileSettings="false"       # Configures Lidarr Metadata Profile Settings
+configureTrackNamingSettings="true"           # Configures Lidarr Track Naming Settings
+
+##### AUDIO SCRIPT
+# SEARCH
+searchSort="date"                 # date or album :: Sorts the missing/cutoff list by release date (newest -> oldest) or album type (album -> single) for processing the list
+matchDistance="3"                 # The number of changes required to transform the searched album title into a possible found album title match... (0, requires a perfect match)
+lidarrSearchForMissing="false"     # true = enabled :: When artists are added, search for them using Lidarr's built in functionality
+retryNotFound="90"                ## :: Number of days between re-attempting the download of previously notfound albums
+ignoreInstrumentalRelease="false" # true = enabled :: Skips albums releases that have the word "instrumental" in either the title or disambiguation
+preferSpecialEditions="true"      # true = enabled :: This changes the release title sort order, when true, it will search for releases with longest release names first, which are more likely to be deluxe/special versions...
+
+# CLIENT
+dlClientSource="deezer"                # deezer, tidal or both :: set to both, to use both clients, tidal requires extra steps, view logging output
+arlToken="{{ deezer_arl }}"                            # OPTIONAL (fallback using Freyr) - User ARL token for deemix client
+tidalCountryCode="US"                  # Country Code required for tidal
+failedDownloadAttemptThreshold="6"     # Maximum number of attempts to download a particular album ID from the service before considering it a failed download...
+deezerClientTestDownloadId="197472472" # A known good deezer track id that is used to test/verify the client is functioning in the event all download attempts have failed. Prevents the script from exiting...
+tidalClientTestDownloadId="166356219"  # A known good tidal track id that is used to test/verify the client is functioning in the event all download attempts have failed. Prevents the script from exiting...
+downloadClientTimeOut="10m"            # 's' for seconds (the default), 'm' for minutes, 'h' for hours or 'd' for days :: Kills freyr download client after the set timeout period, prevents lock ups...
+
+# QUALITY
+audioLyricType="both"   # both or explicit or clean :: both, is explicit preferred matching, explicit is explicit releases only matching and clean is clean releases only matching
+audioFormat="native"    # native or alac or mp3 or aac or opus :: native is the native download client file type, selected by the matching audio bit-rate
+audioBitrate="lossless" # master or lossless or high or low or ### :: master = MQA/lossless flac files, lossless = flac files, high = 320K, low = 128k/96k, ### = the output bit-rate of converted lossless files to selected audioFormat that is not native, example: 192...
+requireQuality="true"  # true = enabled :: Downloads will be checked for quality and require to have the requested file format & quality
+
+# POST PROCESSING
+enableBeetsTagging="true"   # true = enabled :: Downloads will be processed and tagged by Beets
+beetsMatchPercentage="90"   # 1-100 :: Set this to the minimum percentage required for Beets to match the downloaded album to a musicbrainz release :: Lower percentage is less restrictive
+enableReplaygainTags="true" # true = enabled :: Downloads will be tagged with ReplayGain Metadata
+
+# ADD ARTIST AUTOMATION
+addDeezerTopArtists="false"              # true = enabled :: Enabling this will enable the extended script to automatically add artists that are on the Deezer Top Artist Chart to your existing Lidarr instance
+addDeezerTopAlbumArtists="false"         # true = enabled :: Enabling this will enable the extended script to automatically add artists that are on the Deezer Top Album Chart to your existing Lidarr instance
+addDeezerTopTrackArtists="false"         # true = enabled :: Enabling this will enable the extended script to automatically add artists that are on the Deezer Top Track Chart to your existing Lidarr instance
+topLimit="3"                             # This setting controls the amount of Top Artist (Albums/Tracks/Artists) to add to Lidarr from Deezer
+addRelatedArtists="false"                # true = enabled :: WARNING !!! WARNING !!! Enabling this can cause an endless loop of additional artists.... Enabling this will enable the extended script to automatically add artists that are related to your existing Lidarr artists from Tidal & Deezer
+numberOfRelatedArtistsToAddPerArtist="1" # 1-20 :: This will limit the number of related artists to add per artist in your library :: Minimum is 1, Maximum is 20
+autoArtistAdderMonitored="true"          # true or false :: If true, artists that are added automatically are monitored, when false they are added in an unmonitored state
+preventRelatedArtistsLoop="true"         # true = enabled :: This will prevent added related artists from adding additional related artists, thus killing an endless loop. This works by using the Lidarr's tag system (arr-extended), Remove tag from artist to allow it to be proessed for related artists...
+
+##### VIDEO SCRIPT
+addFeaturedVideoArtists="false"  # true = enabled :: WARNING !!! WARNING !!! Enabling this can cause an endless loop of additional artists.... Enabling this will enable the extended Video script to automatically add Music Video Featured Artists to your existing Lidarr artists from IMVDB
+videoFormat="bv[width>=1920]+ba" # ONLY CHANGE if you know what your doing, for guidence, please see yt-dlp documentation.
+videoInfoJson="false"            # true = enabled :: Stores yt-dlp info-json files alongside video files.
+youtubeSubtitleLanguage="en"     # Desired Language Code :: For guidence, please see yt-dlp documentation.
+disableImvd="false"              # true = enabled :: Use this to disable IMVDB as a source, will result in only tidal videos
+
+##### DEEZER ARLCHECKER
+arlUpdateInterval="24h"   # Interval to check ARL Validity (default 24 hours). Reboot container after changing. s = seconds, m = minutes, h = hours, d = days
+telegramBotEnable="false" # Enable/Disable  Telegram Bot to notify if ARL expires. Otherwise check text file in custom-services.d/python for status.
+telegramBotToken=""       # Get token from BotFather during bot creation. If you use a notify channel for Lidarr, you can probably use the same bot, as this script only takes temporary control.
+telegramUserChatID=""     # Get your userid by chatting: t.me/userinfobot
+pushoverEnable="false"    # Pushover Notification Support
+pushoverUserKey=""
+pushoverAppAPIKey=""
+ntfyEnable="false"        # ntfy Notification Support
+ntfyServerTopic=""        # Put your server + topic address ex: https://ntfy.mydomain.com/lidarr
+ntfyUserToken=""          # create a new user token using the ntfy cli commands. See ntfy documentation on how to do that.
+
+

ansible/roles/lidarr/vars/main.yml

@@ -0,0 +1,17 @@
+deezer_arl: !vault |
+  $ANSIBLE_VAULT;1.1;AES256
+  30376434343866323037636662633839313731316533636463383031353462346337626337376563
+  3334356436383831353265663266666631356131386139310a333066363932643363386139396437
+  62333561623365336163663062663035383335336465333031306165633539343663333462313362
+  6634396266386466340a336162626636633531363738353561363030316133386163316135613538
+  64326563336665333566616163366263663763313764613636643931393862333166333332323139
+  65653234663836346538636264613637346662636566666364393165313863333939326538663632
+  38363438356234363639373162633762383139373838376137366333663166326165616663393039
+  34343863666163393164653937663931626434626562306333313665306332313865636462613030
+  36343930323861366235636535646662643561666663656165303031346631396239623531386365
+  39633063363934316637663139396461326533626362363730613562306163663163306665623233
+  38323763653064303631303566653736333237643031626266343036333938636635653132636661
+  64636438653933363335343431383162366636393834396639363266653963316431333138353638
+  61656535363734303139323964303336353032663635366131313866373033666662393130393132
+  3637393263373761646366376532613761613039633465633432
+

ansible/roles/lubelogger/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/mealie/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/navidrome/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/nextcloud/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/ntfy/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/prowlarr/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/qbittorrent/handlers/main.yml

@@ -1,4 +1,4 @@
 - name: restart qbittorrent
   community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/qbittorrent"
-    restarted: true
+    state: restarted

ansible/roles/qbittorrent/templates/cross-seed/config.js

@@ -4,9 +4,7 @@ module.exports = {
     delay: 30,
 
     torznab: [
-	    "http://prowlarr.local.{{ personal_domain }}/1/api?apikey={{ prowlarr_api_key }}", // TorrentLeech
 	    "http://prowlarr.local.{{ personal_domain }}/3/api?apikey={{ prowlarr_api_key }}", // ImmortalSeed
-	    "http://prowlarr.local.{{ personal_domain }}/5/api?apikey={{ prowlarr_api_key }}", // AnimeTosho
 	    "http://prowlarr.local.{{ personal_domain }}/6/api?apikey={{ prowlarr_api_key }}", // Aither
 	    "http://prowlarr.local.{{ personal_domain }}/7/api?apikey={{ prowlarr_api_key }}", // Reelflix
 	    "http://prowlarr.local.{{ personal_domain }}/9/api?apikey={{ prowlarr_api_key }}", // LST
@@ -15,6 +13,8 @@ module.exports = {
 	    "http://prowlarr.local.{{ personal_domain }}/16/api?apikey={{ prowlarr_api_key }}", // AlphaRatio
 	    "http://prowlarr.local.{{ personal_domain }}/17/api?apikey={{ prowlarr_api_key }}", // FileList
 	    "http://prowlarr.local.{{ personal_domain }}/19/api?apikey={{ prowlarr_api_key }}", // Cathode-Ray.Tube
+	    "http://prowlarr.local.{{ personal_domain }}/25/api?apikey={{ prowlarr_api_key }}", // seedpool
+	    "http://prowlarr.local.{{ personal_domain }}/27/api?apikey={{ prowlarr_api_key }}", // Upload.cx
     ],
 
     outputDir: null,
@@ -28,7 +28,6 @@ module.exports = {
     qbittorrentUrl: "https://qbittorrent.local.{{ personal_domain }}",
     sonarr: ["https://sonarr.local.{{ personal_domain }}/?apikey={{ sonarr_api_key }}"],
     radarr: ["https://radarr.local.{{ personal_domain }}/?apikey={{ radarr_api_key }}"],
-    duplicateCategories: true, // This is instead of setting a linkCategory
     seasonsFromEpisodes: 0.8,
     matchMode: "partial",
     linkDirs: ["/data/torrents/cross-seed"],

ansible/roles/qbittorrent/templates/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "{{ docker_compose_version }}"
-
 networks:
   starr:
     external: true
@@ -7,7 +5,7 @@ networks:
 services:
   qbittorrent:
     container_name: qbittorrent
-    image: lscr.io/linuxserver/qbittorrent:5.0.3
+    image: lscr.io/linuxserver/qbittorrent:5.1.2
     restart: unless-stopped
     network_mode: "container:gluetun"
     environment:
@@ -46,6 +44,8 @@ services:
     depends_on:
       - qbittorrent
     image: ghcr.io/cross-seed/cross-seed:6
+    ports:
+      - "2468:2468"
     user: "{{ service_user.uid }}:{{ service_user.uid }}"
     volumes:
       - "{{ data_dir }}/cross-seed:/config"

ansible/roles/qbittorrent/templates/qbitmanage/config.yml

@@ -1,6 +1,6 @@
 commands:
   share_limits: True
-  dry_run: True
+  dry_run: False
   schedule: 720
   recheck: True
   tag_update: True
@@ -19,13 +19,10 @@ settings:
     - cross-seed
     - Upload
   tracker_error_tag: issue  # Will set the tag of any torrents that do not have a working tracker.
-  ignoreTags_OnUpdate: # When running tag-update function, it will update torrent tags for a given torrent even if the torrent has one or more of the tags defined here.
-  - noHL
-  - issue
-  - cross-seed
-
   nohardlinks_tag: noHL
   share_limits_tag: ~share_limit
+  share_limits_min_seeding_time_tag: MinSeedTimeNotReached
+
 directory:
   root_dir: /data/torrents
   torrents_dir: /torrents
@@ -38,6 +35,7 @@ cat:
   movies.cross-seed: /data/torrents/movies
   tv: /data/torrents/tv
   tv.cross-seed: /data/torrents/tv
+  music: /data/torrents/music
   cross-seed-link: /data/torrents/cross-seed
 
 tracker:
@@ -79,6 +77,14 @@ tracker:
     tag: CRT
   t-ru.org:
     tag: rutracker
+  seedpool|seedpool.org:
+    tag: seedpool
+  upload.cx:
+    tag: ULCX
+  archlinux:
+    tag: archlinux
+  other:
+    tag: other
 
 nohardlinks:
   - movies
@@ -93,29 +99,35 @@ share_limits:
     priority: 1
     include_all_tags:
       - noHL
-    exclude_tags:
-      - cross-seed
-    max_ratio: 4.0
     max_seeding_time: 28800 # 20 days
-    min_seeding_time: 10080 # 7 days
     cleanup: true
     add_group_to_tag: false
-  noHL.cross-seed:
-    priority: 2
+  isos:
+    priority: 8
+    include_any_tags:
+      - archlinux
+    max_seeding_time: 129600 # 90 days
+    cleanup: true
+    add_group_to_tag: false
+  tl_cross-seed:
+    priority: 9
     include_all_tags:
-      - noHL
       - cross-seed
-    max_ratio: 4.0
-    max_seeding_time: 28800 # 20 days
-    min_seeding_time: 0
+      - TorrentLeech
+    limit_upload_speed: 100 # 100 KiBps
     add_group_to_tag: false
   public_trackers:
     priority: 10
     include_any_tags:
       - Nyaa
       - AnimeTosho
+      - rutracker
+    categories:
+      - movies
+      - tv
     max_ratio: 2
     max_seeding_time: 21600 # 15 days
+    limit_upload_speed: 5000 # 5 MiBps
     cleanup: true
     add_group_to_tag: false
 

ansible/roles/radarr/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/readarr/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/recyclarr/files/includes/radarr-anime-custom_formats.yml

@@ -1,12 +1,13 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/recyclarr/recyclarr/master/schemas/config-schema.json
 custom_formats:
   - trash_ids:
-      # HQ Anime Release Groups
+      # HQ Release Groups
       - fb3ccc5d5cc8f77c9055d4cb4561dded # Anime BD Tier 01 (Top SeaDex Muxers)
       - 66926c8fa9312bc74ab71bf69aae4f4a # Anime BD Tier 02 (SeaDex Muxers)
       - fa857662bad28d5ff21a6e611869a0ff # Anime BD Tier 03 (SeaDex Muxers)
       - f262f1299d99b1a2263375e8fa2ddbb3 # Anime BD Tier 04 (SeaDex Muxers)
       - ca864ed93c7b431150cc6748dc34875d # Anime BD Tier 05 (Remuxes)
-      - 9dce189b960fddf47891b7484ee886ca # Anime BD Tier 06 (FanSubs)
+      - 9dce189b960fddf47891b7484ee886ca # Anime BD tier 06 (FanSubs)
       - 1ef101b3a82646b40e0cab7fc92cd896 # Anime BD Tier 07 (P2P/Scene)
       - 6115ccd6640b978234cc47f2c1f2cadc # Anime BD Tier 08 (Mini Encodes)
       - 8167cffba4febfb9a6988ef24f274e7e # Anime Web Tier 01 (Muxers)
@@ -14,58 +15,36 @@ custom_formats:
       - de41e72708d2c856fa261094c85e965d # Anime Web Tier 03 (Official Subs)
       - 9edaeee9ea3bcd585da9b7c0ac3fc54f # Anime Web Tier 04 (Official Subs)
       - 22d953bbe897857b517928f3652b8dd3 # Anime Web Tier 05 (FanSubs)
-      - a786fbc0eae05afe3bb51aee3c83a9d4 # Anime Web Tier 06 (FanSubs)
+      - a786fbc0eae05afe3bb51aee3c83a9d4 # Anime Web tier 06 (FanSubs)
+      - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01
+      - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02
+      - 8baaf0b3142bf4d94c42a724f034e27a # Remux Tier 03
+      - c20f169ef63c5f40c2def54abaf4438e # WEB Tier 01
+      - 403816d65392c79236dcb6dd591aeda4 # WEB Tier 02
+      - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03
 
-      # Anime Streaming Services
-      - 60f6d50cbd3cfc3e9a8c00e3a30c3114 # VRV
+      # Miscellaneous
+      - d4e5e842fad129a3c097bdb2d20d31a0 # VRV
+      - a5d148168c4506b55cf53984107c396e # 10bit
 
-      # Misc
-      - c259005cbaeb5ab44c06eddb4751e70c # v0
+      # Movie Versions
       - 5f400539421b8fcf71d51e6384434573 # v1
       - 3df5e6dfef4b09bb6002f732bed5b774 # v2
       - db92c27ba606996b146b57fbe6d09186 # v3
       - d4e5e842fad129a3c097bdb2d20d31a0 # v4
-      - a5d148168c4506b55cf53984107c396e # 10bit
 
       # Unwanted
-      - b0fdc5897f68c9a68c70c25169f77447 # Anime LQ Groups
       - 06b6542a47037d1e33b15aa3677c2365 # Anime Raws
-      - 9172b2f683f6223e3a1846427b417a3d # VOSTFR
+      - b0fdc5897f68c9a68c70c25169f77447 # Anime LQ Groups
+      - c259005cbaeb5ab44c06eddb4751e70c # v0
       - b23eae459cc960816f2d6ba84af45055 # Dubs Only
-    quality_profiles:
+      - 9172b2f683f6223e3a1846427b417a3d # VOSTFR
+      - cae4ca30163749b891686f95532519bd # AV1
+    assign_scores_to:
       - name: Anime
 
-  - trash_ids: [3a3ff47579026e76d6504ebea39390de] # Remux Tier 01
-    quality_profiles:
+  - trash_ids:
+      - 4a3b087eea2ce012fcc1ce319259a3be # Anime Dual Audio
+    assign_scores_to:
       - name: Anime
-        score: 1050
-  - trash_ids: [9f98181fe5a3fbeb0cc29340da2a468a] # Remux Tier 02
-    quality_profiles:
-      - name: Anime
-        score: 1000
-  - trash_ids: [8baaf0b3142bf4d94c42a724f034e27a] # Remux Tier 03
-    quality_profiles:
-      - name: Anime
-        score: 950
-  - trash_ids: [c20f169ef63c5f40c2def54abaf4438e] # WEB Tier 01
-    quality_profiles:
-      - name: Anime
-        score: 350
-  - trash_ids: [403816d65392c79236dcb6dd591aeda4] # WEB Tier 02
-    quality_profiles:
-      - name: Anime
-        score: 250
-  - trash_ids: [af94e0fe497124d1f9ce732069ec8c3b] # WEB Tier 03
-    quality_profiles:
-      - name: Anime
-        score: 150
-
-  - trash_ids: [4a3b087eea2ce012fcc1ce319259a3be] # Anime Dual Audio
-    quality_profiles:
-      - name: Anime
-        score: 101
-
-  - trash_ids: [064af5f084a0a24458cc8ecd3220f93f] # Uncensored
-    quality_profiles:
-      - name: Anime
-        score: 10
+        score: 10 # Prefer dual audio within the same tier but not over higher quality releases 

ansible/roles/recyclarr/files/includes/radarr-anime-qualities.yml

@@ -1,33 +1,38 @@
 quality_profiles:
   - name: Anime
-    reset_unmatched_scores:
-      enabled: true
     upgrade:
       allowed: true
-      until_quality: Bluray 1080p
+      until_quality: 'Bluray 2160p'
       until_score: 10000
     min_format_score: 0
+    score_set: anime-radarr
+    quality_sort: top
     qualities:
-      - name: Bluray 1080p
+      - name: 'Bluray 2160p'
+        qualities:
+          - Remux-2160p
+          - Bluray-2160p
+      - name: 'Bluray 1080p'
         qualities:
           - Remux-1080p
           - Bluray-1080p
+      - name: 'WEB 2160p'
+        qualities:
+          - WEBDL-2160p
+          - WEBRip-2160p
       - name: WEB 1080p
         qualities:
           - WEBDL-1080p
           - WEBRip-1080p
-          - HDTV-1080p
       - name: Bluray-720p
-      - name: WEB 720p
+      - name: 'WEB 720p'
         qualities:
           - WEBDL-720p
           - WEBRip-720p
           - HDTV-720p
       - name: Bluray-576p
       - name: Bluray-480p
-      - name: WEB 480p
+      - name: 'WEB 480p'
         qualities:
           - WEBDL-480p
           - WEBRip-480p
-      - name: DVD
-      - name: SDTV

ansible/roles/recyclarr/files/includes/radarr-not4k.yml

@@ -1,55 +0,0 @@
-custom_formats:
-  - trash_ids:
-      # Movie Versions
-      - 570bc9ebecd92723d2d21500f4be314c # Remaster
-      - e0c07d59beb37348e975a930d5e50319 # Criterion Collection
-      - 9d27d9d2181838f76dee150882bdc58c # Masters of Cinema
-      - db9b4c4b53d312a3ca5f1378f6440fc9 # Vinegar Syndrome
-      - 957d0f44b592285f26449575e8b1167e # Special Edition
-      - eecf3a857724171f968a66cb5719e152 # IMAX
-      - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced
-
-      # HQ Release Groups
-      - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01
-      - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02
-      - 8baaf0b3142bf4d94c42a724f034e27a # Remux Tier 03
-      - c20f169ef63c5f40c2def54abaf4438e # WEB Tier 01
-      - 403816d65392c79236dcb6dd591aeda4 # WEB Tier 02
-      - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03
-      - ed27ebfef2f323e964fb1f61391bcb35 # HD Bluray Tier 01
-      - c20c8647f2746a1f4c4262b0fbbeeeae # HD Bluray Tier 02
-
-      # Misc
-      - e7718d7a3ce595f289bfee26adc178f5 # Repack/Proper
-      - ae43b294509409a6a13919dedd4764c4 # Repack2
-
-      # Unwanted
-      - ed38b889b31be83fda192888e2286d83 # BR-DISK
-      - 90a6f9a284dff5103f6346090e6280c8 # LQ
-      - b8cd450cbfa689c0259a01d9e29ba3d6 # 3D
-      - bfd8eb01832d646a0a89c4deb46f8564 # Upscaled
-      - 0a3f082873eb454bde444150b70253cc # Extras
-      - 839bea857ed2c0a8e084f3cbdbd65ecb # x265 (no HDR/DV)
-      - 25c12f78430a3a23413652cbd1d48d77 # SDR (no WEBDL)
-
-      # Streaming Services
-      - cc5e51a9e85a6296ceefe097a77f12f4 # BCORE
-      - 16622a6911d1ab5d5b8b713d5b0036d4 # CRiT
-      - 2a6039655313bf5dab1e43523b62c374 # MA
-      - b3b3a6ac74ecbd56bcdbefa4799fb9df # AMZN
-      - 40e9380490e748672c2522eaaeb692f7 # ATVP
-      - f6ff65b3f4b464a79dcc75950fe20382 # CRAV
-      - 84272245b2988854bfb76a16e60baea5 # DSNP
-      - 509e5f41146e278f9eab1ddaceb34515 # HBO
-      - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX
-      - 526d445d4c16214309f0fd2b3be18a89 # Hulu
-      - 6a061313d22e51e0f25b7cd4dc065233 # MAX
-      - 170b1d363bd8516fbf3a3eb05d4faff6 # NF
-      - fbca986396c5e695ef7b2def3c755d01 # OViD
-      - bf7e73dd1d85b12cc527dc619761c840 # Pathe
-      - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK
-      - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP
-      - c2863d2a50c9acad1fb50e53ece60817 # STAN
-
-    quality_profiles:
-      - name: Not 4k

ansible/roles/recyclarr/files/includes/radarr-not_4k-custom_formats.yml

@@ -13,8 +13,53 @@ custom_formats:
       - 08d6d8834ad9ec87b1dc7ec8148e7a1f # PQ
       - 9364dd386c9b4a1100dde8264690add7 # HLG
 
+      # HQ Release Groups
+      - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01
+      - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02
+      - 8baaf0b3142bf4d94c42a724f034e27a # Remux Tier 03
+      - ed27ebfef2f323e964fb1f61391bcb35 # HD Bluray Tier 01
+      - c20c8647f2746a1f4c4262b0fbbeeeae # HD Bluray Tier 02
+      - 5608c71bcebba0a5e666223bae8c9227 # HD Bluray Tier 03
+      - c20f169ef63c5f40c2def54abaf4438e # WEB Tier 01
+      - 403816d65392c79236dcb6dd591aeda4 # WEB Tier 02
+      - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03
+
+      # General Streaming Services
+      - b3b3a6ac74ecbd56bcdbefa4799fb9df # AMZN
+      - 40e9380490e748672c2522eaaeb692f7 # ATVP
+      - cc5e51a9e85a6296ceefe097a77f12f4 # BCORE
+      - 16622a6911d1ab5d5b8b713d5b0036d4 # CRiT
+      - 84272245b2988854bfb76a16e60baea5 # DSNP
+      - 509e5f41146e278f9eab1ddaceb34515 # HBO
+      - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX
+      - 526d445d4c16214309f0fd2b3be18a89 # Hulu
+      - e0ec9672be6cac914ffad34a6b077209 # iT
+      - 6a061313d22e51e0f25b7cd4dc065233 # MAX
+      - 2a6039655313bf5dab1e43523b62c374 # MA
+      - 170b1d363bd8516fbf3a3eb05d4faff6 # NF
+      - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP
+      - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK
+      - c2863d2a50c9acad1fb50e53ece60817 # STAN
+
+      # Audio
+      - 496f355514737f7d83bf7aa4d24f8169 # TrueHD Atmos
+      - 2f22d89048b01681dde8afe203bf2e95 # DTS:X
+      - 417804f7f2c4308c1f4c5d380d4c4475 # Atmos (undefined)
+      - 1af239278386be2919e1bcee0bde047e # DD+ Atmos
+      - 3cafb66171b47f226146a0770576870f # TrueHD
+      - dcf3ec6938fa32445f590a4da84256cd # DTS-HD MA
+      - a570d4a0e56a2874b64e5bfa55202a1b # FLAC
+      - e7c2fcae07cbada050a0af3357491d7b # PCM
+      - 8e109e50e0a0b83a5098b056e13bf6db # DTS-HD HRA
+      - 185f1dd7264c4562b9022d963ac37424 # DD+
+      - f9f847ac70a0af62ea4a08280b859636 # DTS-ES
+      - 1c1a4c5e823891c75bc50380a6866f73 # DTS
+      - 240770601cc226190c367ef59aba7463 # AAC
+      - c2998bd0d90ed5621d8df281e839436e # DD
+      - 6ba9033150e7896bdc9ec4b44f2b230f # MP3
+      - a061e2e700f81932daf888599f8a8273 # Opus
+
       # Movie Versions
-      #- 0f12c086e289cf966fa5948eac571f44 # Hybrid
       - 570bc9ebecd92723d2d21500f4be314c # Remaster
       - eca37840c13c6ef2dd0262b141a5482f # 4K Remaster
       - e0c07d59beb37348e975a930d5e50319 # Criterion Collection
@@ -23,44 +68,31 @@ custom_formats:
       - 957d0f44b592285f26449575e8b1167e # Special Edition
       - eecf3a857724171f968a66cb5719e152 # IMAX
       - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced
+      - 09d9dd29a0fc958f9796e65c2a8864b4 # Open Matte
 
-      # HQ Release Groups
-      - c20f169ef63c5f40c2def54abaf4438e # WEB Tier 01
-      - 403816d65392c79236dcb6dd591aeda4 # WEB Tier 02
-      - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03
-
-      # Misc
+      # Miscellaneous
       - e7718d7a3ce595f289bfee26adc178f5 # Repack/Proper
       - ae43b294509409a6a13919dedd4764c4 # Repack2
-
+      - 5caaaa1c08c1742aa4342d8c4cc463f2 # Repack3
+      
       # Unwanted
+      - 923b6abef9b17f937fab56cfcf89e1f1 # DV (WEBDL)
       - ed38b889b31be83fda192888e2286d83 # BR-DISK
+      - e6886871085226c3da1830830146846c # Gererated Dynamic HDR
       - 90a6f9a284dff5103f6346090e6280c8 # LQ
+      - e204b80c87be9497a8a6eaff48f72905 # LQ (Release Title)
+      - 839bea857ed2c0a8e084f3cbdbd65ecb # x265 (no HDR/DV)
+      - 25c12f78430a3a23413652cbd1d48d77 # SDR (no WEBDL)
       - b8cd450cbfa689c0259a01d9e29ba3d6 # 3D
       - bfd8eb01832d646a0a89c4deb46f8564 # Upscaled
       - 0a3f082873eb454bde444150b70253cc # Extras
-      - 839bea857ed2c0a8e084f3cbdbd65ecb # x265 (no HDR/DV)
-      - 25c12f78430a3a23413652cbd1d48d77 # SDR (no WEBDL)
-      - 923b6abef9b17f937fab56cfcf89e1f1 # DV (WEBDL)
-
-      # Streaming Services
-      - cc5e51a9e85a6296ceefe097a77f12f4 # BCORE
-      - 16622a6911d1ab5d5b8b713d5b0036d4 # CRiT
-      - 2a6039655313bf5dab1e43523b62c374 # MA
-      - b3b3a6ac74ecbd56bcdbefa4799fb9df # AMZN
-      - 40e9380490e748672c2522eaaeb692f7 # ATVP
-      - f6ff65b3f4b464a79dcc75950fe20382 # CRAV
-      - 84272245b2988854bfb76a16e60baea5 # DSNP
-      - 509e5f41146e278f9eab1ddaceb34515 # HBO
-      - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX
-      - 526d445d4c16214309f0fd2b3be18a89 # Hulu
-      - 6a061313d22e51e0f25b7cd4dc065233 # MAX
-      - 170b1d363bd8516fbf3a3eb05d4faff6 # NF
-      - fbca986396c5e695ef7b2def3c755d01 # OViD
-      - bf7e73dd1d85b12cc527dc619761c840 # Pathe
-      - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK
-      - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP
-      - c2863d2a50c9acad1fb50e53ece60817 # STAN
-
-    quality_profiles:
-      - name: Web
+      - 712d74cd88bceb883ee32f773656b1f5 # Sing-Along Versions
+      - cae4ca30163749b891686f95532519bd # AV1
+      - b6832f586342ef70d9c128d40c07b872 # Bad Dual Groups
+      - cc444569854e9de0b084ab2b8b1532b2 # Black and White Editions
+      - ae9b7c9ebde1f3bd336a8cbd1ec4c5e5 # No-RlsGroup
+      - 7357cf5161efbf8c4d5d0c30b4815ee2 # Obfuscated
+      - 5c44f52a8714fdd79bb4d98e2673be1f # Retags
+      - f537cf427b64c38c8e36298f657e4828 # Scene
+    assign_scores_to:
+      - name: 'Not 4k'

ansible/roles/recyclarr/files/includes/radarr-not_4k-qualities.yml

@@ -1,12 +1,12 @@
 quality_profiles:
-  - name: Not 4k
-    reset_unmatched_scores:
-      enabled: true
+  - name: 'Not 4k'
     upgrade:
       allowed: true
       until_quality: Remux-1080p
       until_score: 10000
     min_format_score: 0
+    score_set: default
+    quality_sort: top
     qualities:
       - name: Remux-1080p
       - name: Bluray-1080p

ansible/roles/recyclarr/files/includes/radarr-old-custom_formats.yml

@@ -0,0 +1,101 @@
+custom_formats:
+  - trash_ids:
+      # HDR Formats
+      - c53085ddbd027d9624b320627748612f # DV HDR10+
+      - e23edd2482476e595fb990b12e7c609c # DV HDR10
+      - 58d6a88f13e2db7f5059c41047876f00 # DV
+      - 55d53828b9d81cbe20b02efd00aa0efd # DV HLG
+      - a3e19f8f627608af0211acd02bf89735 # DV SDR
+      - b974a6cd08c1066250f1f177d7aa1225 # HDR10+
+      - dfb86d5941bc9075d6af23b09c2aeecd # HDR10
+      - e61e28db95d22bedcadf030b8f156d96 # HDR
+      - 2a4d9069cc1fe3242ff9bdaebed239bb # HDR (undefined)
+      - 08d6d8834ad9ec87b1dc7ec8148e7a1f # PQ
+      - 9364dd386c9b4a1100dde8264690add7 # HLG
+
+      # HQ Release Groups
+      - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01
+      - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02
+      - 8baaf0b3142bf4d94c42a724f034e27a # Remux Tier 03
+      - 4d74ac4c4db0b64bff6ce0cffef99bf0 # UHD Bluray Tier 01
+      - a58f517a70193f8e578056642178419d # UHD Bluray Tier 02
+      - e71939fae578037e7aed3ee219bbe7c1 # UHD Bluray Tier 03
+      - ed27ebfef2f323e964fb1f61391bcb35 # HD Bluray Tier 01
+      - c20c8647f2746a1f4c4262b0fbbeeeae # HD Bluray Tier 02
+      - 5608c71bcebba0a5e666223bae8c9227 # HD Bluray Tier 03
+      - c20f169ef63c5f40c2def54abaf4438e # WEB Tier 01
+      - 403816d65392c79236dcb6dd591aeda4 # WEB Tier 02
+      - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03
+
+      # General Streaming Services
+      - b3b3a6ac74ecbd56bcdbefa4799fb9df # AMZN
+      - 40e9380490e748672c2522eaaeb692f7 # ATVP
+      - cc5e51a9e85a6296ceefe097a77f12f4 # BCORE
+      - 16622a6911d1ab5d5b8b713d5b0036d4 # CRiT
+      - 84272245b2988854bfb76a16e60baea5 # DSNP
+      - 509e5f41146e278f9eab1ddaceb34515 # HBO
+      - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX
+      - 526d445d4c16214309f0fd2b3be18a89 # Hulu
+      - e0ec9672be6cac914ffad34a6b077209 # iT
+      - 6a061313d22e51e0f25b7cd4dc065233 # MAX
+      - 2a6039655313bf5dab1e43523b62c374 # MA
+      - 170b1d363bd8516fbf3a3eb05d4faff6 # NF
+      - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP
+      - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK
+      - c2863d2a50c9acad1fb50e53ece60817 # STAN
+
+      # Audio
+      - 496f355514737f7d83bf7aa4d24f8169 # TrueHD Atmos
+      - 2f22d89048b01681dde8afe203bf2e95 # DTS:X
+      - 417804f7f2c4308c1f4c5d380d4c4475 # Atmos (undefined)
+      - 1af239278386be2919e1bcee0bde047e # DD+ Atmos
+      - 3cafb66171b47f226146a0770576870f # TrueHD
+      - dcf3ec6938fa32445f590a4da84256cd # DTS-HD MA
+      - a570d4a0e56a2874b64e5bfa55202a1b # FLAC
+      - e7c2fcae07cbada050a0af3357491d7b # PCM
+      - 8e109e50e0a0b83a5098b056e13bf6db # DTS-HD HRA
+      - 185f1dd7264c4562b9022d963ac37424 # DD+
+      - f9f847ac70a0af62ea4a08280b859636 # DTS-ES
+      - 1c1a4c5e823891c75bc50380a6866f73 # DTS
+      - 240770601cc226190c367ef59aba7463 # AAC
+      - c2998bd0d90ed5621d8df281e839436e # DD
+      - 6ba9033150e7896bdc9ec4b44f2b230f # MP3
+      - a061e2e700f81932daf888599f8a8273 # Opus
+
+      # Movie Versions
+      - 570bc9ebecd92723d2d21500f4be314c # Remaster
+      - eca37840c13c6ef2dd0262b141a5482f # 4K Remaster
+      - e0c07d59beb37348e975a930d5e50319 # Criterion Collection
+      - 9d27d9d2181838f76dee150882bdc58c # Masters of Cinema
+      - db9b4c4b53d312a3ca5f1378f6440fc9 # Vinegar Syndrome
+      - 957d0f44b592285f26449575e8b1167e # Special Edition
+      - eecf3a857724171f968a66cb5719e152 # IMAX
+      - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced
+      - 09d9dd29a0fc958f9796e65c2a8864b4 # Open Matte
+
+      # Miscellaneous
+      - e7718d7a3ce595f289bfee26adc178f5 # Repack/Proper
+      - ae43b294509409a6a13919dedd4764c4 # Repack2
+      - 5caaaa1c08c1742aa4342d8c4cc463f2 # Repack3
+      
+      # Unwanted
+      - 923b6abef9b17f937fab56cfcf89e1f1 # DV (WEBDL)
+      - ed38b889b31be83fda192888e2286d83 # BR-DISK
+      - e6886871085226c3da1830830146846c # Gererated Dynamic HDR
+      - 90a6f9a284dff5103f6346090e6280c8 # LQ
+      - e204b80c87be9497a8a6eaff48f72905 # LQ (Release Title)
+      - 839bea857ed2c0a8e084f3cbdbd65ecb # x265 (no HDR/DV)
+      - 25c12f78430a3a23413652cbd1d48d77 # SDR (no WEBDL)
+      - b8cd450cbfa689c0259a01d9e29ba3d6 # 3D
+      - bfd8eb01832d646a0a89c4deb46f8564 # Upscaled
+      - 0a3f082873eb454bde444150b70253cc # Extras
+      - 712d74cd88bceb883ee32f773656b1f5 # Sing-Along Versions
+      - cae4ca30163749b891686f95532519bd # AV1
+      - b6832f586342ef70d9c128d40c07b872 # Bad Dual Groups
+      - cc444569854e9de0b084ab2b8b1532b2 # Black and White Editions
+      - ae9b7c9ebde1f3bd336a8cbd1ec4c5e5 # No-RlsGroup
+      - 7357cf5161efbf8c4d5d0c30b4815ee2 # Obfuscated
+      - 5c44f52a8714fdd79bb4d98e2673be1f # Retags
+      - f537cf427b64c38c8e36298f657e4828 # Scene
+    assign_scores_to:
+      - name: Old

ansible/roles/recyclarr/files/includes/radarr-old-qualities.yml

@@ -0,0 +1,37 @@
+quality_profiles:
+  - name: Old
+    upgrade:
+      allowed: true
+      until_quality: Remux-2160p
+      until_score: 10000
+    min_format_score: 0
+    score_set: default
+    quality_sort: top
+    qualities:
+      - name: Remux-2160p
+      - name: Remux-1080p
+      - name: Bluray-2160p
+      - name: WEB 2160p
+        qualities:
+          - WEBDL-2160p
+          - WEBRip-2160p
+      - name: Bluray-1080p
+      - name: WEB 1080p
+        qualities:
+          - WEBDL-1080p
+          - WEBRip-1080p
+      - name: HDTV-2160p
+      - name: HDTV-1080p
+      - name: Bluray-720p
+      - name: 'WEB 720p'
+        qualities:
+          - WEBDL-720p
+          - WEBRip-720p
+      - name: Bluray-576p
+      - name: Bluray-480p
+      - name: 'WEB 480p'
+        qualities:
+          - WEBDL-480p
+          - WEBRip-480p
+      - name: DVD
+      - name: DVD-R

ansible/roles/recyclarr/files/includes/radarr-remux-custom_formats.yml

@@ -13,8 +13,56 @@ custom_formats:
       - 08d6d8834ad9ec87b1dc7ec8148e7a1f # PQ
       - 9364dd386c9b4a1100dde8264690add7 # HLG
 
+      # HQ Release Groups
+      - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01
+      - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02
+      - 8baaf0b3142bf4d94c42a724f034e27a # Remux Tier 03
+      - 4d74ac4c4db0b64bff6ce0cffef99bf0 # UHD Bluray Tier 01
+      - a58f517a70193f8e578056642178419d # UHD Bluray Tier 02
+      - e71939fae578037e7aed3ee219bbe7c1 # UHD Bluray Tier 03
+      - ed27ebfef2f323e964fb1f61391bcb35 # HD Bluray Tier 01
+      - c20c8647f2746a1f4c4262b0fbbeeeae # HD Bluray Tier 02
+      - 5608c71bcebba0a5e666223bae8c9227 # HD Bluray Tier 03
+      - c20f169ef63c5f40c2def54abaf4438e # WEB Tier 01
+      - 403816d65392c79236dcb6dd591aeda4 # WEB Tier 02
+      - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03
+
+      # General Streaming Services
+      - b3b3a6ac74ecbd56bcdbefa4799fb9df # AMZN
+      - 40e9380490e748672c2522eaaeb692f7 # ATVP
+      - cc5e51a9e85a6296ceefe097a77f12f4 # BCORE
+      - 16622a6911d1ab5d5b8b713d5b0036d4 # CRiT
+      - 84272245b2988854bfb76a16e60baea5 # DSNP
+      - 509e5f41146e278f9eab1ddaceb34515 # HBO
+      - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX
+      - 526d445d4c16214309f0fd2b3be18a89 # Hulu
+      - e0ec9672be6cac914ffad34a6b077209 # iT
+      - 6a061313d22e51e0f25b7cd4dc065233 # MAX
+      - 2a6039655313bf5dab1e43523b62c374 # MA
+      - 170b1d363bd8516fbf3a3eb05d4faff6 # NF
+      - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP
+      - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK
+      - c2863d2a50c9acad1fb50e53ece60817 # STAN
+
+      # Audio
+      - 496f355514737f7d83bf7aa4d24f8169 # TrueHD Atmos
+      - 2f22d89048b01681dde8afe203bf2e95 # DTS:X
+      - 417804f7f2c4308c1f4c5d380d4c4475 # Atmos (undefined)
+      - 1af239278386be2919e1bcee0bde047e # DD+ Atmos
+      - 3cafb66171b47f226146a0770576870f # TrueHD
+      - dcf3ec6938fa32445f590a4da84256cd # DTS-HD MA
+      - a570d4a0e56a2874b64e5bfa55202a1b # FLAC
+      - e7c2fcae07cbada050a0af3357491d7b # PCM
+      - 8e109e50e0a0b83a5098b056e13bf6db # DTS-HD HRA
+      - 185f1dd7264c4562b9022d963ac37424 # DD+
+      - f9f847ac70a0af62ea4a08280b859636 # DTS-ES
+      - 1c1a4c5e823891c75bc50380a6866f73 # DTS
+      - 240770601cc226190c367ef59aba7463 # AAC
+      - c2998bd0d90ed5621d8df281e839436e # DD
+      - 6ba9033150e7896bdc9ec4b44f2b230f # MP3
+      - a061e2e700f81932daf888599f8a8273 # Opus
+
       # Movie Versions
-      #- 0f12c086e289cf966fa5948eac571f44 # Hybrid
       - 570bc9ebecd92723d2d21500f4be314c # Remaster
       - eca37840c13c6ef2dd0262b141a5482f # 4K Remaster
       - e0c07d59beb37348e975a930d5e50319 # Criterion Collection
@@ -23,53 +71,31 @@ custom_formats:
       - 957d0f44b592285f26449575e8b1167e # Special Edition
       - eecf3a857724171f968a66cb5719e152 # IMAX
       - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced
+      - 09d9dd29a0fc958f9796e65c2a8864b4 # Open Matte
 
-      # HQ Release Groups
-      - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01
-      - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02
-      - 8baaf0b3142bf4d94c42a724f034e27a # Remux Tier 03
-      - c20f169ef63c5f40c2def54abaf4438e # WEB Tier 01
-      - 403816d65392c79236dcb6dd591aeda4 # WEB Tier 02
-      - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03
-      - 4d74ac4c4db0b64bff6ce0cffef99bf0 # UHD Bluray Tier 01
-      - a58f517a70193f8e578056642178419d # UHD Bluray Tier 02
-      - e71939fae578037e7aed3ee219bbe7c1 # UHD Bluray Tier 03
-      - ed27ebfef2f323e964fb1f61391bcb35 # HD Bluray Tier 01
-      - c20c8647f2746a1f4c4262b0fbbeeeae # HD Bluray Tier 02
-
-      # Misc
+      # Miscellaneous
       - e7718d7a3ce595f289bfee26adc178f5 # Repack/Proper
       - ae43b294509409a6a13919dedd4764c4 # Repack2
-      - f700d29429c023a5734505e77daeaea7 # DV FEL
-
+      - 5caaaa1c08c1742aa4342d8c4cc463f2 # Repack3
+      
       # Unwanted
+      - 923b6abef9b17f937fab56cfcf89e1f1 # DV (WEBDL)
       - ed38b889b31be83fda192888e2286d83 # BR-DISK
+      - e6886871085226c3da1830830146846c # Gererated Dynamic HDR
       - 90a6f9a284dff5103f6346090e6280c8 # LQ
+      - e204b80c87be9497a8a6eaff48f72905 # LQ (Release Title)
+      - 839bea857ed2c0a8e084f3cbdbd65ecb # x265 (no HDR/DV)
+      - 25c12f78430a3a23413652cbd1d48d77 # SDR (no WEBDL)
       - b8cd450cbfa689c0259a01d9e29ba3d6 # 3D
       - bfd8eb01832d646a0a89c4deb46f8564 # Upscaled
       - 0a3f082873eb454bde444150b70253cc # Extras
-      - 839bea857ed2c0a8e084f3cbdbd65ecb # x265 (no HDR/DV)
-      - 25c12f78430a3a23413652cbd1d48d77 # SDR (no WEBDL)
-      - 923b6abef9b17f937fab56cfcf89e1f1 # DV (WEBDL)
-
-      # Streaming Services
-      - cc5e51a9e85a6296ceefe097a77f12f4 # BCORE
-      - 16622a6911d1ab5d5b8b713d5b0036d4 # CRiT
-      - 2a6039655313bf5dab1e43523b62c374 # MA
-      - b3b3a6ac74ecbd56bcdbefa4799fb9df # AMZN
-      - 40e9380490e748672c2522eaaeb692f7 # ATVP
-      - f6ff65b3f4b464a79dcc75950fe20382 # CRAV
-      - 84272245b2988854bfb76a16e60baea5 # DSNP
-      - 509e5f41146e278f9eab1ddaceb34515 # HBO
-      - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX
-      - 526d445d4c16214309f0fd2b3be18a89 # Hulu
-      - 6a061313d22e51e0f25b7cd4dc065233 # MAX
-      - 170b1d363bd8516fbf3a3eb05d4faff6 # NF
-      - fbca986396c5e695ef7b2def3c755d01 # OViD
-      - bf7e73dd1d85b12cc527dc619761c840 # Pathe
-      - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK
-      - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP
-      - c2863d2a50c9acad1fb50e53ece60817 # STAN
-
-    quality_profiles:
+      - 712d74cd88bceb883ee32f773656b1f5 # Sing-Along Versions
+      - cae4ca30163749b891686f95532519bd # AV1
+      - b6832f586342ef70d9c128d40c07b872 # Bad Dual Groups
+      - cc444569854e9de0b084ab2b8b1532b2 # Black and White Editions
+      - ae9b7c9ebde1f3bd336a8cbd1ec4c5e5 # No-RlsGroup
+      - 7357cf5161efbf8c4d5d0c30b4815ee2 # Obfuscated
+      - 5c44f52a8714fdd79bb4d98e2673be1f # Retags
+      - f537cf427b64c38c8e36298f657e4828 # Scene
+    assign_scores_to:
       - name: Remux

ansible/roles/recyclarr/files/includes/radarr-remux-qualities.yml

@@ -1,16 +1,16 @@
 quality_profiles:
   - name: Remux
-    reset_unmatched_scores:
-      enabled: true
     upgrade:
       allowed: true
       until_quality: Remux-2160p
       until_score: 10000
     min_format_score: 0
+    score_set: default
+    quality_sort: top
     qualities:
       - name: Remux-2160p
-      - name: Bluray-2160p
       - name: Remux-1080p
+      - name: Bluray-2160p
       - name: WEB 2160p
         qualities:
           - WEBDL-2160p

ansible/roles/recyclarr/files/includes/radarr-web-custom_formats.yml

@@ -0,0 +1,101 @@
+custom_formats:
+  - trash_ids:
+      # HDR Formats
+      - c53085ddbd027d9624b320627748612f # DV HDR10+
+      - e23edd2482476e595fb990b12e7c609c # DV HDR10
+      - 58d6a88f13e2db7f5059c41047876f00 # DV
+      - 55d53828b9d81cbe20b02efd00aa0efd # DV HLG
+      - a3e19f8f627608af0211acd02bf89735 # DV SDR
+      - b974a6cd08c1066250f1f177d7aa1225 # HDR10+
+      - dfb86d5941bc9075d6af23b09c2aeecd # HDR10
+      - e61e28db95d22bedcadf030b8f156d96 # HDR
+      - 2a4d9069cc1fe3242ff9bdaebed239bb # HDR (undefined)
+      - 08d6d8834ad9ec87b1dc7ec8148e7a1f # PQ
+      - 9364dd386c9b4a1100dde8264690add7 # HLG
+
+      # HQ Release Groups
+      - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01
+      - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02
+      - 8baaf0b3142bf4d94c42a724f034e27a # Remux Tier 03
+      - 4d74ac4c4db0b64bff6ce0cffef99bf0 # UHD Bluray Tier 01
+      - a58f517a70193f8e578056642178419d # UHD Bluray Tier 02
+      - e71939fae578037e7aed3ee219bbe7c1 # UHD Bluray Tier 03
+      - ed27ebfef2f323e964fb1f61391bcb35 # HD Bluray Tier 01
+      - c20c8647f2746a1f4c4262b0fbbeeeae # HD Bluray Tier 02
+      - 5608c71bcebba0a5e666223bae8c9227 # HD Bluray Tier 03
+      - c20f169ef63c5f40c2def54abaf4438e # WEB Tier 01
+      - 403816d65392c79236dcb6dd591aeda4 # WEB Tier 02
+      - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03
+
+      # General Streaming Services
+      - b3b3a6ac74ecbd56bcdbefa4799fb9df # AMZN
+      - 40e9380490e748672c2522eaaeb692f7 # ATVP
+      - cc5e51a9e85a6296ceefe097a77f12f4 # BCORE
+      - 16622a6911d1ab5d5b8b713d5b0036d4 # CRiT
+      - 84272245b2988854bfb76a16e60baea5 # DSNP
+      - 509e5f41146e278f9eab1ddaceb34515 # HBO
+      - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX
+      - 526d445d4c16214309f0fd2b3be18a89 # Hulu
+      - e0ec9672be6cac914ffad34a6b077209 # iT
+      - 6a061313d22e51e0f25b7cd4dc065233 # MAX
+      - 2a6039655313bf5dab1e43523b62c374 # MA
+      - 170b1d363bd8516fbf3a3eb05d4faff6 # NF
+      - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP
+      - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK
+      - c2863d2a50c9acad1fb50e53ece60817 # STAN
+
+      # Audio
+      - 496f355514737f7d83bf7aa4d24f8169 # TrueHD Atmos
+      - 2f22d89048b01681dde8afe203bf2e95 # DTS:X
+      - 417804f7f2c4308c1f4c5d380d4c4475 # Atmos (undefined)
+      - 1af239278386be2919e1bcee0bde047e # DD+ Atmos
+      - 3cafb66171b47f226146a0770576870f # TrueHD
+      - dcf3ec6938fa32445f590a4da84256cd # DTS-HD MA
+      - a570d4a0e56a2874b64e5bfa55202a1b # FLAC
+      - e7c2fcae07cbada050a0af3357491d7b # PCM
+      - 8e109e50e0a0b83a5098b056e13bf6db # DTS-HD HRA
+      - 185f1dd7264c4562b9022d963ac37424 # DD+
+      - f9f847ac70a0af62ea4a08280b859636 # DTS-ES
+      - 1c1a4c5e823891c75bc50380a6866f73 # DTS
+      - 240770601cc226190c367ef59aba7463 # AAC
+      - c2998bd0d90ed5621d8df281e839436e # DD
+      - 6ba9033150e7896bdc9ec4b44f2b230f # MP3
+      - a061e2e700f81932daf888599f8a8273 # Opus
+
+      # Movie Versions
+      - 570bc9ebecd92723d2d21500f4be314c # Remaster
+      - eca37840c13c6ef2dd0262b141a5482f # 4K Remaster
+      - e0c07d59beb37348e975a930d5e50319 # Criterion Collection
+      - 9d27d9d2181838f76dee150882bdc58c # Masters of Cinema
+      - db9b4c4b53d312a3ca5f1378f6440fc9 # Vinegar Syndrome
+      - 957d0f44b592285f26449575e8b1167e # Special Edition
+      - eecf3a857724171f968a66cb5719e152 # IMAX
+      - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced
+      - 09d9dd29a0fc958f9796e65c2a8864b4 # Open Matte
+
+      # Miscellaneous
+      - e7718d7a3ce595f289bfee26adc178f5 # Repack/Proper
+      - ae43b294509409a6a13919dedd4764c4 # Repack2
+      - 5caaaa1c08c1742aa4342d8c4cc463f2 # Repack3
+      
+      # Unwanted
+      - 923b6abef9b17f937fab56cfcf89e1f1 # DV (WEBDL)
+      - ed38b889b31be83fda192888e2286d83 # BR-DISK
+      - e6886871085226c3da1830830146846c # Gererated Dynamic HDR
+      - 90a6f9a284dff5103f6346090e6280c8 # LQ
+      - e204b80c87be9497a8a6eaff48f72905 # LQ (Release Title)
+      - 839bea857ed2c0a8e084f3cbdbd65ecb # x265 (no HDR/DV)
+      - 25c12f78430a3a23413652cbd1d48d77 # SDR (no WEBDL)
+      - b8cd450cbfa689c0259a01d9e29ba3d6 # 3D
+      - bfd8eb01832d646a0a89c4deb46f8564 # Upscaled
+      - 0a3f082873eb454bde444150b70253cc # Extras
+      - 712d74cd88bceb883ee32f773656b1f5 # Sing-Along Versions
+      - cae4ca30163749b891686f95532519bd # AV1
+      - b6832f586342ef70d9c128d40c07b872 # Bad Dual Groups
+      - cc444569854e9de0b084ab2b8b1532b2 # Black and White Editions
+      - ae9b7c9ebde1f3bd336a8cbd1ec4c5e5 # No-RlsGroup
+      - 7357cf5161efbf8c4d5d0c30b4815ee2 # Obfuscated
+      - 5c44f52a8714fdd79bb4d98e2673be1f # Retags
+      - f537cf427b64c38c8e36298f657e4828 # Scene
+    assign_scores_to:
+      - name: Web

ansible/roles/recyclarr/files/includes/radarr-web-qualities.yml

@@ -1,17 +1,18 @@
 quality_profiles:
-  - name: Season Pack
-    reset_unmatched_scores:
-      enabled: true
+  - name: Web
     upgrade:
       allowed: true
-      until_quality: WEB 2160p
+      until_quality: 'WEB 2160p'
       until_score: 10000
     min_format_score: 0
+    score_set: default
+    quality_sort: top
     qualities:
       - name: WEB 2160p
         qualities:
           - WEBDL-2160p
           - WEBRip-2160p
+      - name: Bluray-1080p
       - name: WEB 1080p
         qualities:
           - WEBDL-1080p

ansible/roles/recyclarr/files/includes/sonarr-anime-custom_formats.yml

@@ -0,0 +1,110 @@
+custom_formats:
+  - trash_ids:
+      - 2b239ed870daba8126a53bd5dc8dc1c8 # DV HDR10+
+      - 7878c33f1963fefb3d6c8657d46c2f0a # DV HDR10
+      - 6d0d8de7b57e35518ac0308b0ddf404e # DV
+      - 1f733af03141f068a540eec352589a89 # DV HLG
+      - 27954b0a80aab882522a88a4d9eae1cd # DV SDR
+      - a3d82cbef5039f8d295478d28a887159 # HDR10+
+      - 3497799d29a085e2ac2df9d468413c94 # HDR10
+      - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR
+      - bb019e1cd00f304f80971c965de064dc # HDR (undefined)
+      - 2a7e3be05d3861d6df7171ec74cad727 # PQ
+      - 17e889ce13117940092308f48b48b45b # HLG
+      - 9b27ab6498ec0f31a3353992e19434ca # DV (WEBDL)
+
+      # Miscellaneous
+      - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper
+      - eb3d5cc0a2be0db205fb823640db6a3c # Repack v2
+      - 44e7c4de10ae50265753082e5dc76047 # Repack v3
+      - 026d5aadd1a6b4e550b134cb6c72b3ca # Uncensored
+      - 273bd326df95955e1b6c26527d1df89b # v1
+      - 228b8ee9aa0a609463efca874524a6b8 # v2
+      - 0e5833d3af2cc5fa96a0c29cd4477feb # v3
+      - 4fc15eeb8f2f9a749f918217d4234ad8 # v4
+      - b2550eb333d27b75833e25b8c2557b38 # 10bit
+
+      # Streaming Services
+      - d660701077794679fd59e8bdf4ce3a29 # AMZN
+      - f67c9ca88f463a48346062e8ad07713f # ATVP
+      - 77a7b25585c18af08f60b1547bb9b4fb # CC
+      - 36b72f59f4ea20aad9316f475f2d9fbb # DCU
+      - 89358767a60cc28783cdc3d0be9388a4 # DSNP
+      - a880d6abc21e7c16884f3ae393f84179 # HMAX
+      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
+      - f6cce30f1733d5c8194222a7507909bb # HULU
+      - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT
+      - 81d1fbf600e2540cee87f3a23f9d3c1c # MAX
+      - d34870697c9db575f17700212167be23 # NF
+      - c67a75ae4a1715f2bb4d492755ba4195 # PMTP
+      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
+      - ae58039e1319178e6be73caab5c42166 # SHO
+      - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN
+      - 9623c5c9cac8e939c1b9aedd32f640bf # SYFY
+      - 9623c5c9cac8e939c1b9aedd32f640bf # UHD Streaming Boost
+      - d2d299244a92b8a52d4921ce3897a256 # UHD Streaming Cut
+
+      # Release Group Tiers
+      - 949c16fe0a8147f50ba82cc2df9411c9 # Anime BD Tier 01 (Top SeaDex Muxers)
+      - ed7f1e315e000aef424a58517fa48727 # Anime BD Tier 02 (SeaDex Muxers)
+      - 096e406c92baa713da4a72d88030b815 # Anime BD Tier 03 (SeaDex Muxers)
+      - 30feba9da3030c5ed1e0f7d610bcadc4 # Anime BD Tier 04 (SeaDex Muxers)
+      - 545a76b14ddc349b8b185a6344e28b04 # Anime BD Tier 05 (Remuxes)
+      - 25d2afecab632b1582eaf03b63055f72 # Anime BD Tier 06 (FanSubs)
+      - 0329044e3d9137b08502a9f84a7e58db # Anime BD Tier 07 (P2P/Scene)
+      - c81bbfb47fed3d5a3ad027d077f889de # Anime BD Tier 08 (Mini Encodes)
+      - e0014372773c8f0e1bef8824f00c7dc4 # Anime Web Tier 01 (Muxers)
+      - 19180499de5ef2b84b6ec59aae444696 # Anime Web Tier 02 (Top FanSubs)
+      - e6258996055b9fbab7e9cb2f75819294 # WEB Tier 01
+      - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02
+      - c27f2ae6a4e82373b0f1da094e2489ad # Anime Web Tier 03 (Official Subs)
+      - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03
+      - 9965a052eb87b0d10313b1cea89eb451 # Remux Tier 01
+      - 8a1d0c3d7497e741736761a1da866a2e # Remux Tier 02
+      - 4fd5528a3a8024e6b49f9c67053ea5f3 # Anime Web Tier 04 (Official Subs)
+      - 29c2a13d091144f63307e4a8ce963a39 # Anime Web Tier 05 (FanSubs)
+      - dc262f88d74c651b12e9d90b39f6c753 # Anime Web Tier 06 (FanSubs)
+      - d6819cba26b1a6508138d25fb5e32293 # HD Bluray Tier 01
+      - c2216b7b8aa545dc1ce8388c618f8d57 # HD Bluray Tier 02
+      - d0c516558625b04b363fa6c5c2c7cfd4 # WEB Scene
+
+      # Audio Advanced
+      - 0d7824bb924701997f874e7ff7d4844a # TrueHD Atmos
+      - 9d00418ba386a083fbf4d58235fc37ef # DTS:X
+      - b6fbafa7942952a13e17e2b1152b539a # Atmos (undefined)
+      - 4232a509ce60c4e208d13825b7c06264 # DDPlus Atmos
+      - 1808e4b9cee74e064dfae3f1db99dbfe # TrueHD
+      - c429417a57ea8c41d57e6990a8b0033f # DTS-HD MA
+      - 851bd64e04c9374c51102be3dd9ae4cc # FLAC
+      - 30f70576671ca933adbdcfc736a69718 # PCM
+      - cfa5fbd8f02a86fc55d8d223d06a5e1f # DTS-HD HRA
+      - 63487786a8b01b7f20dd2bc90dd4a477 # DDPlus
+      - c1a25cd67b5d2e08287c957b1eb903ec # DTS-ES
+      - 5964f2a8b3be407d083498e4459d05d0 # DTS
+      - a50b8a0c62274a7c38b09a9619ba9d86 # AAC
+      - dbe00161b08a25ac6154c55f95e6318d # DD
+      - 3e8b714263b26f486972ee1e0fe7606c # MP3
+      - 28f6ef16d61e2d1adfce3156ed8257e3 # Opus
+      - bd6dd5e043aa27ff4696a08d011c7d96 # 1.0 Mono
+      - 834e534f103938853ffced4203b53e72 # 2.0 Stereo
+      - 42cba7e38c7947a6d1d0a62580ee6d62 # 3.0 Sound
+      - 1895195e84767de180653914ce207245 # 4.0 Sound
+      - 3fbafa924f361e66fbc6187af82dfa85 # 5.1 Surround
+      - 9fb6d778592c293467437593ef394bf1 # 6.1 Surround
+      - 204c8c3e7315bb0ea81332774fa888d6 # 7.1 Surround
+
+      # Unwanted
+      - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1
+      - b4a1b3d705159cdca36d71e57ca86871 # Anime Raws
+      - e3515e519f3b1360cbfc17651944354c # Anime LQ Groups
+      - d2d7b8a9d39413da5f44054080e028a3 # v0
+      - 9c14d194486c4014d422adc64092d794 # Dubs Only
+      - 07a32f77690263bb9fda1842db7e273f # VOSTFR
+    assign_scores_to:
+      - name: Anime
+
+  - trash_ids:
+      - 418f50b10f1907201b6cfdf881f467b7 # Anime Dual Audio
+    assign_scores_to:
+      - name: Anime
+        score: 10 # Prefer dual audio within the same tier but don't prefer over higher quality releases 

ansible/roles/recyclarr/files/includes/sonarr-anime-qualities.yml

@@ -1,32 +1,32 @@
 quality_profiles:
   - name: Anime
-    reset_unmatched_scores:
-      enabled: true
     upgrade:
       allowed: true
-      until_quality: Bluray 1080p
+      until_quality: Bluray-2160p
       until_score: 10000
     min_format_score: 0
+    score_set: sonarr-anime
+    quality_sort: top
     qualities:
-      - name: Bluray 1080p
+      - name: Bluray-2160p
+        qualities:
+          - Bluray-2160p Remux
+          - Bluray-2160p
+      - name: Bluray-1080p
         qualities:
           - Bluray-1080p Remux
           - Bluray-1080p
+      - name: WEB 2160p
+        qualities:
+          - WEBDL-2160p
+          - WEBRip-2160p
       - name: WEB 1080p
         qualities:
           - WEBDL-1080p
           - WEBRip-1080p
           - HDTV-1080p
-      - name: Bluray-720p
       - name: WEB 720p
         qualities:
           - WEBDL-720p
           - WEBRip-720p
           - HDTV-720p
-      - name: Bluray-480p
-      - name: WEB 480p
-        qualities:
-          - WEBDL-480p
-          - WEBRip-480p
-      - name: DVD
-      - name: SDTV

ansible/roles/recyclarr/files/includes/sonarr-anime.yml

@@ -1,76 +0,0 @@
-custom_formats:
-  - trash_ids:
-      # HQ Release Groups
-      - 949c16fe0a8147f50ba82cc2df9411c9 # Anime BD Tier 01 (Top SeaDex Muxers)
-      - ed7f1e315e000aef424a58517fa48727 # Anime BD Tier 02 (SeaDex Muxers)
-      - 096e406c92baa713da4a72d88030b815 # Anime BD Tier 03 (SeaDex Muxers)
-      - 30feba9da3030c5ed1e0f7d610bcadc4 # Anime BD Tier 04 (SeaDex Muxers)
-      - 545a76b14ddc349b8b185a6344e28b04 # Anime BD Tier 05 (Remuxes)
-      - 25d2afecab632b1582eaf03b63055f72 # Anime BD Tier 06 (FanSubs)
-      - 0329044e3d9137b08502a9f84a7e58db # Anime BD Tier 07 (P2P/Scene)
-      - c81bbfb47fed3d5a3ad027d077f889de # Anime BD Tier 08 (Mini Encodes)
-      - e0014372773c8f0e1bef8824f00c7dc4 # Anime Web Tier 01 (Muxers)
-      - 19180499de5ef2b84b6ec59aae444696 # Anime Web Tier 02 (Top FanSubs)
-      - c27f2ae6a4e82373b0f1da094e2489ad # Anime Web Tier 03 (Official Subs)
-      - 4fd5528a3a8024e6b49f9c67053ea5f3 # Anime Web Tier 04 (Official Subs)
-      - 29c2a13d091144f63307e4a8ce963a39 # Anime Web Tier 05 (FanSubs)
-      - dc262f88d74c651b12e9d90b39f6c753 # Anime Web Tier 06 (FanSubs)
-
-      # Misc
-      - 273bd326df95955e1b6c26527d1df89b # v1
-      - 228b8ee9aa0a609463efca874524a6b8 # v2
-      - 0e5833d3af2cc5fa96a0c29cd4477feb # v3
-      - 4fc15eeb8f2f9a749f918217d4234ad8 # v4
-
-      # Unwanted
-      - d2d7b8a9d39413da5f44054080e028a3 # v0
-      - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1
-      - 07a32f77690263bb9fda1842db7e273f # VOSTFR
-      - e3515e519f3b1360cbfc17651944354c # Anime LQ Groups
-      - b4a1b3d705159cdca36d71e57ca86871 # Anime Raws
-      - 9c14d194486c4014d422adc64092d794 # Dubs Only
-
-      # Anime Streaming Services
-      - 3e0b26604165f463f3e8e192261e7284 # CR
-      - 1284d18e693de8efe0fe7d6b3e0b9170 # FUNi
-      - 44a8ee6403071dd7b8a3a8dd3fe8cb20 # VRV
-      - 89358767a60cc28783cdc3d0be9388a4 # DSNP
-      - d34870697c9db575f17700212167be23 # NF
-      - d660701077794679fd59e8bdf4ce3a29 # AMZN
-      - d54cd2bf1326287275b56bccedb72ee2 # ADN
-      - 7dd31f3dee6d2ef8eeaa156e23c3857e # B-Global
-      - 4c67ff059210182b59cdd41697b8cb08 # Bilibili
-      - 570b03b3145a25011bf073274a407259 # HIDIVE
-    quality_profiles:
-      - name: Anime
-
-  - trash_ids: [9965a052eb87b0d10313b1cea89eb451] # Remux Tier 01
-    quality_profiles:
-      - name: Anime
-        score: 1050
-  - trash_ids: [8a1d0c3d7497e741736761a1da866a2e] # Remux Tier 02
-    quality_profiles:
-      - name: Anime
-        score: 1000
-  - trash_ids: [e6258996055b9fbab7e9cb2f75819294] # WEB Tier 01
-    quality_profiles:
-      - name: Anime
-        score: 350
-  - trash_ids: [58790d4e2fdcd9733aa7ae68ba2bb503] # WEB Tier 02
-    quality_profiles:
-      - name: Anime
-        score: 150
-  - trash_ids: [d84935abd3f8556dcd51d4f27e22d0a6] # WEB Tier 03
-    quality_profiles:
-      - name: Anime
-        score: 150
-
-  - trash_ids: [418f50b10f1907201b6cfdf881f467b7] # Anime Dual Audio
-    quality_profiles:
-      - name: Anime
-        score: 10
-
-  - trash_ids: [026d5aadd1a6b4e550b134cb6c72b3ca] # Uncensored
-    quality_profiles:
-      - name: Anime
-        score: 10

ansible/roles/recyclarr/files/includes/sonarr-old-custom_formats.yml

@@ -3,67 +3,91 @@ custom_formats:
       # HDR Formats
       - 2b239ed870daba8126a53bd5dc8dc1c8 # DV HDR10+
       - 7878c33f1963fefb3d6c8657d46c2f0a # DV HDR10
+      - 6d0d8de7b57e35518ac0308b0ddf404e # DV
       - 1f733af03141f068a540eec352589a89 # DV HLG
       - 27954b0a80aab882522a88a4d9eae1cd # DV SDR
-      - 6d0d8de7b57e35518ac0308b0ddf404e # DV
-      - bb019e1cd00f304f80971c965de064dc # HDR (undefined)
-      - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR
-      - 3497799d29a085e2ac2df9d468413c94 # HDR10
       - a3d82cbef5039f8d295478d28a887159 # HDR10+
-      - 17e889ce13117940092308f48b48b45b # HLG
+      - 3497799d29a085e2ac2df9d468413c94 # HDR10
+      - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR
+      - bb019e1cd00f304f80971c965de064dc # HDR (undefined)
       - 2a7e3be05d3861d6df7171ec74cad727 # PQ
-
-      # Unwanted
-      - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
-      - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
-      - 9b64dff695c2115facf1b6ea59c9bd07 # x265 (no HDR)
-      - fbcb31d8dabd2a319072b84fc0b7249c # Extras
-      - 83304f261cf516bb208c18c54c0adf97 # SDR (no WEBDL)
-      - 06d66ab109d4d2eddb2794d21526d140 # Retags
-      - e1a997ddb54e3ecbfe06341ad323c458 # Obfuscated
-      - 32b367365729d530ca1c124a0b180c64 # Bad Dual Groups
-      - 82d40da2bc6923f41e14394075dd4b03 # No-RlsGroup
+      - 17e889ce13117940092308f48b48b45b # HLG
       - 9b27ab6498ec0f31a3353992e19434ca # DV (WEBDL)
 
-      # Misc
+      # Miscellaneous
       - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper
       - eb3d5cc0a2be0db205fb823640db6a3c # Repack v2
       - 44e7c4de10ae50265753082e5dc76047 # Repack v3
+      - b735f09d3c025cbb7d75a5d38325b73b # Remaster
+      - 3bc5f395426614e155e585a2f056cdf1 # Season Pack
 
       # Streaming Services
       - d660701077794679fd59e8bdf4ce3a29 # AMZN
       - f67c9ca88f463a48346062e8ad07713f # ATVP
-      - 4e9a630db98d5391aec1368a0256e2fe # CRAV
+      - 77a7b25585c18af08f60b1547bb9b4fb # CC
       - 36b72f59f4ea20aad9316f475f2d9fbb # DCU
       - 89358767a60cc28783cdc3d0be9388a4 # DSNP
-      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
       - a880d6abc21e7c16884f3ae393f84179 # HMAX
+      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
       - f6cce30f1733d5c8194222a7507909bb # HULU
       - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT
       - 81d1fbf600e2540cee87f3a23f9d3c1c # MAX
       - d34870697c9db575f17700212167be23 # NF
-      - b2b980877494b560443631eb1f473867 # NLZ
-      - fb1a91cdc0f26f7ca0696e0e95274645 # OViD
-      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
       - c67a75ae4a1715f2bb4d492755ba4195 # PMTP
-      - 3ac5d84fce98bab1b531393e9c82f467 # QIBI
-      - c30d2958827d1867c73318a5a2957eb1 # RED
+      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
       - ae58039e1319178e6be73caab5c42166 # SHO
       - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN
-      - 5d2317d99af813b6529c7ebf01c83533 # VDL
-      - 77a7b25585c18af08f60b1547bb9b4fb # CC
-      - 43b3cf48cb385cd3eac608ee6bca7f09 # UHD Streaming Boost
+      - 9623c5c9cac8e939c1b9aedd32f640bf # SYFY
+      - 9623c5c9cac8e939c1b9aedd32f640bf # UHD Streaming Boost
       - d2d299244a92b8a52d4921ce3897a256 # UHD Streaming Cut
 
-      # HQ Source Groups
+      # Release Group Tiers
+      - 9965a052eb87b0d10313b1cea89eb451 # Remux Tier 01
+      - 8a1d0c3d7497e741736761a1da866a2e # Remux Tier 02
+      - d6819cba26b1a6508138d25fb5e32293 # HD Bluray Tier 01
+      - c2216b7b8aa545dc1ce8388c618f8d57 # HD Bluray Tier 02
       - e6258996055b9fbab7e9cb2f75819294 # WEB Tier 01
       - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02
       - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03
       - d0c516558625b04b363fa6c5c2c7cfd4 # WEB Scene
-    quality_profiles:
-      - name: Web
 
-  - trash_ids: [3bc5f395426614e155e585a2f056cdf1] # Season Pack
-    quality_profiles:
-      - name: Web
-        score: 10
+      # Audio Advanced
+      - 0d7824bb924701997f874e7ff7d4844a # TrueHD Atmos
+      - 9d00418ba386a083fbf4d58235fc37ef # DTS:X
+      - b6fbafa7942952a13e17e2b1152b539a # Atmos (undefined)
+      - 4232a509ce60c4e208d13825b7c06264 # DDPlus Atmos
+      - 1808e4b9cee74e064dfae3f1db99dbfe # TrueHD
+      - c429417a57ea8c41d57e6990a8b0033f # DTS-HD MA
+      - 851bd64e04c9374c51102be3dd9ae4cc # FLAC
+      - 30f70576671ca933adbdcfc736a69718 # PCM
+      - cfa5fbd8f02a86fc55d8d223d06a5e1f # DTS-HD HRA
+      - 63487786a8b01b7f20dd2bc90dd4a477 # DDPlus
+      - c1a25cd67b5d2e08287c957b1eb903ec # DTS-ES
+      - 5964f2a8b3be407d083498e4459d05d0 # DTS
+      - a50b8a0c62274a7c38b09a9619ba9d86 # AAC
+      - dbe00161b08a25ac6154c55f95e6318d # DD
+      - 3e8b714263b26f486972ee1e0fe7606c # MP3
+      - 28f6ef16d61e2d1adfce3156ed8257e3 # Opus
+      - bd6dd5e043aa27ff4696a08d011c7d96 # 1.0 Mono
+      - 834e534f103938853ffced4203b53e72 # 2.0 Stereo
+      - 42cba7e38c7947a6d1d0a62580ee6d62 # 3.0 Sound
+      - 1895195e84767de180653914ce207245 # 4.0 Sound
+      - 3fbafa924f361e66fbc6187af82dfa85 # 5.1 Surround
+      - 9fb6d778592c293467437593ef394bf1 # 6.1 Surround
+      - 204c8c3e7315bb0ea81332774fa888d6 # 7.1 Surround
+
+      # Unwanted
+      - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
+      - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
+      - e2315f990da2e2cbfc9fa5b7a6fcfe48 # LQ (Release Title)
+      - 9b64dff695c2115facf1b6ea59c9bd07 # x265 (no HDR/DV)
+      - 83304f261cf516bb208c18c54c0adf97 # SDR (no WEBDL)
+      - fbcb31d8dabd2a319072b84fc0b7249c # Extras
+      - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1
+      - 32b367365729d530ca1c124a0b180c64 # Bad Dual Groups
+      - 82d40da2bc6923f41e14394075dd4b03 # No-RlsGroup
+      - e1a997ddb54e3ecbfe06341ad323c458 # Obfuscated
+      - 06d66ab109d4d2eddb2794d21526d140 # Retags
+      - b735f09d3c025cbb7d75a5d38325b73b # Upscaled
+    assign_scores_to:
+      - name: Old

ansible/roles/recyclarr/files/includes/sonarr-old-qualities.yml

@@ -0,0 +1,38 @@
+quality_profiles:
+  - name: Old
+    upgrade:
+      allowed: true
+      until_quality: 'Bluray-2160p Remux'
+      until_score: 10000
+    min_format_score: 0
+    score_set: default
+    quality_sort: top
+    qualities:
+      - name: 'Bluray-2160p Remux'
+      - name: 'Bluray-1080p Remux'
+      - name: Bluray-2160p
+      - name: 'WEB 2160p'
+        qualities:
+          - WEBDL-2160p
+          - WEBRip-2160p
+      - name: Bluray-1080p
+      - name: 'WEB 1080p'
+        qualities:
+          - WEBDL-1080p
+          - WEBRip-1080p
+      - name: HDTV-2160p
+      - name: Bluray-720p
+      - name: 'WEB 720p' 
+        qualities:
+          - WEBDL-720p
+          - WEBRip-720p
+      - name: HDTV-1080p
+      - name: HDTV-720p
+      - name: Bluray-576p
+      - name: Bluray-480p
+      - name: DVD
+      - name: 'WEB 480p'
+        qualities:
+          - WEBDL-480p
+          - WEBRip-480p
+      - name: SDTV

ansible/roles/recyclarr/files/includes/sonarr-old_season_pack-custom_formats.yml

@@ -0,0 +1,99 @@
+custom_formats:
+  - trash_ids:
+      # HDR Formats
+      - 2b239ed870daba8126a53bd5dc8dc1c8 # DV HDR10+
+      - 7878c33f1963fefb3d6c8657d46c2f0a # DV HDR10
+      - 6d0d8de7b57e35518ac0308b0ddf404e # DV
+      - 1f733af03141f068a540eec352589a89 # DV HLG
+      - 27954b0a80aab882522a88a4d9eae1cd # DV SDR
+      - a3d82cbef5039f8d295478d28a887159 # HDR10+
+      - 3497799d29a085e2ac2df9d468413c94 # HDR10
+      - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR
+      - bb019e1cd00f304f80971c965de064dc # HDR (undefined)
+      - 2a7e3be05d3861d6df7171ec74cad727 # PQ
+      - 17e889ce13117940092308f48b48b45b # HLG
+      - 9b27ab6498ec0f31a3353992e19434ca # DV (WEBDL)
+
+      # Miscellaneous
+      - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper
+      - eb3d5cc0a2be0db205fb823640db6a3c # Repack v2
+      - 44e7c4de10ae50265753082e5dc76047 # Repack v3
+      - b735f09d3c025cbb7d75a5d38325b73b # Remaster
+      - 3bc5f395426614e155e585a2f056cdf1 # Season Pack
+
+      # Streaming Services
+      - d660701077794679fd59e8bdf4ce3a29 # AMZN
+      - f67c9ca88f463a48346062e8ad07713f # ATVP
+      - 77a7b25585c18af08f60b1547bb9b4fb # CC
+      - 36b72f59f4ea20aad9316f475f2d9fbb # DCU
+      - 89358767a60cc28783cdc3d0be9388a4 # DSNP
+      - a880d6abc21e7c16884f3ae393f84179 # HMAX
+      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
+      - f6cce30f1733d5c8194222a7507909bb # HULU
+      - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT
+      - 81d1fbf600e2540cee87f3a23f9d3c1c # MAX
+      - d34870697c9db575f17700212167be23 # NF
+      - c67a75ae4a1715f2bb4d492755ba4195 # PMTP
+      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
+      - ae58039e1319178e6be73caab5c42166 # SHO
+      - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN
+      - 9623c5c9cac8e939c1b9aedd32f640bf # SYFY
+      - 9623c5c9cac8e939c1b9aedd32f640bf # UHD Streaming Boost
+      - d2d299244a92b8a52d4921ce3897a256 # UHD Streaming Cut
+
+      # Release Group Tiers
+      - 9965a052eb87b0d10313b1cea89eb451 # Remux Tier 01
+      - 8a1d0c3d7497e741736761a1da866a2e # Remux Tier 02
+      - d6819cba26b1a6508138d25fb5e32293 # HD Bluray Tier 01
+      - c2216b7b8aa545dc1ce8388c618f8d57 # HD Bluray Tier 02
+      - e6258996055b9fbab7e9cb2f75819294 # WEB Tier 01
+      - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02
+      - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03
+      - d0c516558625b04b363fa6c5c2c7cfd4 # WEB Scene
+
+      # Audio Advanced
+      - 0d7824bb924701997f874e7ff7d4844a # TrueHD Atmos
+      - 9d00418ba386a083fbf4d58235fc37ef # DTS:X
+      - b6fbafa7942952a13e17e2b1152b539a # Atmos (undefined)
+      - 4232a509ce60c4e208d13825b7c06264 # DDPlus Atmos
+      - 1808e4b9cee74e064dfae3f1db99dbfe # TrueHD
+      - c429417a57ea8c41d57e6990a8b0033f # DTS-HD MA
+      - 851bd64e04c9374c51102be3dd9ae4cc # FLAC
+      - 30f70576671ca933adbdcfc736a69718 # PCM
+      - cfa5fbd8f02a86fc55d8d223d06a5e1f # DTS-HD HRA
+      - 63487786a8b01b7f20dd2bc90dd4a477 # DDPlus
+      - c1a25cd67b5d2e08287c957b1eb903ec # DTS-ES
+      - 5964f2a8b3be407d083498e4459d05d0 # DTS
+      - a50b8a0c62274a7c38b09a9619ba9d86 # AAC
+      - dbe00161b08a25ac6154c55f95e6318d # DD
+      - 3e8b714263b26f486972ee1e0fe7606c # MP3
+      - 28f6ef16d61e2d1adfce3156ed8257e3 # Opus
+      - bd6dd5e043aa27ff4696a08d011c7d96 # 1.0 Mono
+      - 834e534f103938853ffced4203b53e72 # 2.0 Stereo
+      - 42cba7e38c7947a6d1d0a62580ee6d62 # 3.0 Sound
+      - 1895195e84767de180653914ce207245 # 4.0 Sound
+      - 3fbafa924f361e66fbc6187af82dfa85 # 5.1 Surround
+      - 9fb6d778592c293467437593ef394bf1 # 6.1 Surround
+      - 204c8c3e7315bb0ea81332774fa888d6 # 7.1 Surround
+
+      # Unwanted
+      - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
+      - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
+      - e2315f990da2e2cbfc9fa5b7a6fcfe48 # LQ (Release Title)
+      - 9b64dff695c2115facf1b6ea59c9bd07 # x265 (no HDR/DV)
+      - 83304f261cf516bb208c18c54c0adf97 # SDR (no WEBDL)
+      - fbcb31d8dabd2a319072b84fc0b7249c # Extras
+      - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1
+      - 32b367365729d530ca1c124a0b180c64 # Bad Dual Groups
+      - 82d40da2bc6923f41e14394075dd4b03 # No-RlsGroup
+      - e1a997ddb54e3ecbfe06341ad323c458 # Obfuscated
+      - 06d66ab109d4d2eddb2794d21526d140 # Retags
+      - b735f09d3c025cbb7d75a5d38325b73b # Upscaled
+    assign_scores_to:
+      - name: 'Old - Season Pack'
+
+  - trash_ids:
+      - e0c1a67f23908a55b6ae9834e8ed6727 # Single Episode
+    assign_scores_to:
+      - name: 'Old - Season Pack'
+        score: -10000

ansible/roles/recyclarr/files/includes/sonarr-old_season_pack-qualities.yml

@@ -0,0 +1,38 @@
+quality_profiles:
+  - name: 'Old - Season Pack'
+    upgrade:
+      allowed: true
+      until_quality: 'Bluray-2160p Remux'
+      until_score: 10000
+    min_format_score: 0
+    score_set: default
+    quality_sort: top
+    qualities:
+      - name: 'Bluray-2160p Remux'
+      - name: 'Bluray-1080p Remux'
+      - name: Bluray-2160p
+      - name: 'WEB 2160p'
+        qualities:
+          - WEBDL-2160p
+          - WEBRip-2160p
+      - name: Bluray-1080p
+      - name: 'WEB 1080p'
+        qualities:
+          - WEBDL-1080p
+          - WEBRip-1080p
+      - name: HDTV-2160p
+      - name: Bluray-720p
+      - name: 'WEB 720p' 
+        qualities:
+          - WEBDL-720p
+          - WEBRip-720p
+      - name: HDTV-1080p
+      - name: HDTV-720p
+      - name: Bluray-576p
+      - name: Bluray-480p
+      - name: DVD
+      - name: 'WEB 480p'
+        qualities:
+          - WEBDL-480p
+          - WEBRip-480p
+      - name: SDTV

ansible/roles/recyclarr/files/includes/sonarr-remux-custom_formats.yml

@@ -3,60 +3,45 @@ custom_formats:
       # HDR Formats
       - 2b239ed870daba8126a53bd5dc8dc1c8 # DV HDR10+
       - 7878c33f1963fefb3d6c8657d46c2f0a # DV HDR10
+      - 6d0d8de7b57e35518ac0308b0ddf404e # DV
       - 1f733af03141f068a540eec352589a89 # DV HLG
       - 27954b0a80aab882522a88a4d9eae1cd # DV SDR
-      - ef4963043b0987f8485bc9106f16db38 # DV FEL
-      - 6d0d8de7b57e35518ac0308b0ddf404e # DV
-      - bb019e1cd00f304f80971c965de064dc # HDR (undefined)
-      - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR
-      - 3497799d29a085e2ac2df9d468413c94 # HDR10
       - a3d82cbef5039f8d295478d28a887159 # HDR10+
-      - 17e889ce13117940092308f48b48b45b # HLG
+      - 3497799d29a085e2ac2df9d468413c94 # HDR10
+      - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR
+      - bb019e1cd00f304f80971c965de064dc # HDR (undefined)
       - 2a7e3be05d3861d6df7171ec74cad727 # PQ
-
-      # Unwanted
-      - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
-      - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
-      - 9b64dff695c2115facf1b6ea59c9bd07 # x265 (no HDR)
-      - fbcb31d8dabd2a319072b84fc0b7249c # Extras
-      - 83304f261cf516bb208c18c54c0adf97 # SDR (no WEBDL)
-      - 82d40da2bc6923f41e14394075dd4b03 # No-RlsGroup
-      - e1a997ddb54e3ecbfe06341ad323c458 # Obfuscated
-      - 06d66ab109d4d2eddb2794d21526d140 # Retag
-      - 32b367365729d530ca1c124a0b180c64 # Bad Dual Groups
+      - 17e889ce13117940092308f48b48b45b # HLG
       - 9b27ab6498ec0f31a3353992e19434ca # DV (WEBDL)
 
-      # Misc
+      # Miscellaneous
       - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper
       - eb3d5cc0a2be0db205fb823640db6a3c # Repack v2
       - 44e7c4de10ae50265753082e5dc76047 # Repack v3
+      - b735f09d3c025cbb7d75a5d38325b73b # Remaster
+      - 3bc5f395426614e155e585a2f056cdf1 # Season Pack
 
       # Streaming Services
       - d660701077794679fd59e8bdf4ce3a29 # AMZN
       - f67c9ca88f463a48346062e8ad07713f # ATVP
-      - 4e9a630db98d5391aec1368a0256e2fe # CRAV
+      - 77a7b25585c18af08f60b1547bb9b4fb # CC
       - 36b72f59f4ea20aad9316f475f2d9fbb # DCU
       - 89358767a60cc28783cdc3d0be9388a4 # DSNP
-      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
       - a880d6abc21e7c16884f3ae393f84179 # HMAX
+      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
       - f6cce30f1733d5c8194222a7507909bb # HULU
       - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT
       - 81d1fbf600e2540cee87f3a23f9d3c1c # MAX
       - d34870697c9db575f17700212167be23 # NF
-      - b2b980877494b560443631eb1f473867 # NLZ
-      - fb1a91cdc0f26f7ca0696e0e95274645 # OViD
-      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
       - c67a75ae4a1715f2bb4d492755ba4195 # PMTP
-      - 3ac5d84fce98bab1b531393e9c82f467 # QIBI
-      - c30d2958827d1867c73318a5a2957eb1 # RED
+      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
       - ae58039e1319178e6be73caab5c42166 # SHO
       - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN
-      - 5d2317d99af813b6529c7ebf01c83533 # VDL
-      - 77a7b25585c18af08f60b1547bb9b4fb # CC
-      - 43b3cf48cb385cd3eac608ee6bca7f09 # UHD Streaming Boost
+      - 9623c5c9cac8e939c1b9aedd32f640bf # SYFY
+      - 9623c5c9cac8e939c1b9aedd32f640bf # UHD Streaming Boost
       - d2d299244a92b8a52d4921ce3897a256 # UHD Streaming Cut
 
-      # HQ Source Groups
+      # Release Group Tiers
       - 9965a052eb87b0d10313b1cea89eb451 # Remux Tier 01
       - 8a1d0c3d7497e741736761a1da866a2e # Remux Tier 02
       - d6819cba26b1a6508138d25fb5e32293 # HD Bluray Tier 01
@@ -65,10 +50,44 @@ custom_formats:
       - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02
       - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03
       - d0c516558625b04b363fa6c5c2c7cfd4 # WEB Scene
-    quality_profiles:
-      - name: Remux
 
-  - trash_ids: [3bc5f395426614e155e585a2f056cdf1] # Season Pack
-    quality_profiles:
+      # Audio Advanced
+      - 0d7824bb924701997f874e7ff7d4844a # TrueHD Atmos
+      - 9d00418ba386a083fbf4d58235fc37ef # DTS:X
+      - b6fbafa7942952a13e17e2b1152b539a # Atmos (undefined)
+      - 4232a509ce60c4e208d13825b7c06264 # DDPlus Atmos
+      - 1808e4b9cee74e064dfae3f1db99dbfe # TrueHD
+      - c429417a57ea8c41d57e6990a8b0033f # DTS-HD MA
+      - 851bd64e04c9374c51102be3dd9ae4cc # FLAC
+      - 30f70576671ca933adbdcfc736a69718 # PCM
+      - cfa5fbd8f02a86fc55d8d223d06a5e1f # DTS-HD HRA
+      - 63487786a8b01b7f20dd2bc90dd4a477 # DDPlus
+      - c1a25cd67b5d2e08287c957b1eb903ec # DTS-ES
+      - 5964f2a8b3be407d083498e4459d05d0 # DTS
+      - a50b8a0c62274a7c38b09a9619ba9d86 # AAC
+      - dbe00161b08a25ac6154c55f95e6318d # DD
+      - 3e8b714263b26f486972ee1e0fe7606c # MP3
+      - 28f6ef16d61e2d1adfce3156ed8257e3 # Opus
+      - bd6dd5e043aa27ff4696a08d011c7d96 # 1.0 Mono
+      - 834e534f103938853ffced4203b53e72 # 2.0 Stereo
+      - 42cba7e38c7947a6d1d0a62580ee6d62 # 3.0 Sound
+      - 1895195e84767de180653914ce207245 # 4.0 Sound
+      - 3fbafa924f361e66fbc6187af82dfa85 # 5.1 Surround
+      - 9fb6d778592c293467437593ef394bf1 # 6.1 Surround
+      - 204c8c3e7315bb0ea81332774fa888d6 # 7.1 Surround
+
+      # Unwanted
+      - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
+      - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
+      - e2315f990da2e2cbfc9fa5b7a6fcfe48 # LQ (Release Title)
+      - 9b64dff695c2115facf1b6ea59c9bd07 # x265 (no HDR/DV)
+      - 83304f261cf516bb208c18c54c0adf97 # SDR (no WEBDL)
+      - fbcb31d8dabd2a319072b84fc0b7249c # Extras
+      - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1
+      - 32b367365729d530ca1c124a0b180c64 # Bad Dual Groups
+      - 82d40da2bc6923f41e14394075dd4b03 # No-RlsGroup
+      - e1a997ddb54e3ecbfe06341ad323c458 # Obfuscated
+      - 06d66ab109d4d2eddb2794d21526d140 # Retags
+      - b735f09d3c025cbb7d75a5d38325b73b # Upscaled
+    assign_scores_to:
       - name: Remux
-        score: 10

ansible/roles/recyclarr/files/includes/sonarr-remux-qualities.yml

@@ -1,16 +1,16 @@
 quality_profiles:
   - name: Remux
-    reset_unmatched_scores:
-      enabled: true
     upgrade:
       allowed: true
-      until_quality: Bluray-2160p Remux
+      until_quality: 'Bluray-2160p Remux'
       until_score: 10000
     min_format_score: 0
+    score_set: default
+    quality_sort: top
     qualities:
-      - name: Bluray-2160p Remux
+      - name: 'Bluray-2160p Remux'
+      - name: 'Bluray-1080p Remux'
       - name: Bluray-2160p
-      - name: Bluray-1080p Remux
       - name: WEB 2160p
         qualities:
           - WEBDL-2160p

ansible/roles/recyclarr/files/includes/sonarr-remux_season_pack-custom_formats.yml

@@ -0,0 +1,99 @@
+custom_formats:
+  - trash_ids:
+      # HDR Formats
+      - 2b239ed870daba8126a53bd5dc8dc1c8 # DV HDR10+
+      - 7878c33f1963fefb3d6c8657d46c2f0a # DV HDR10
+      - 6d0d8de7b57e35518ac0308b0ddf404e # DV
+      - 1f733af03141f068a540eec352589a89 # DV HLG
+      - 27954b0a80aab882522a88a4d9eae1cd # DV SDR
+      - a3d82cbef5039f8d295478d28a887159 # HDR10+
+      - 3497799d29a085e2ac2df9d468413c94 # HDR10
+      - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR
+      - bb019e1cd00f304f80971c965de064dc # HDR (undefined)
+      - 2a7e3be05d3861d6df7171ec74cad727 # PQ
+      - 17e889ce13117940092308f48b48b45b # HLG
+      - 9b27ab6498ec0f31a3353992e19434ca # DV (WEBDL)
+
+      # Miscellaneous
+      - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper
+      - eb3d5cc0a2be0db205fb823640db6a3c # Repack v2
+      - 44e7c4de10ae50265753082e5dc76047 # Repack v3
+      - b735f09d3c025cbb7d75a5d38325b73b # Remaster
+      - 3bc5f395426614e155e585a2f056cdf1 # Season Pack
+
+      # Streaming Services
+      - d660701077794679fd59e8bdf4ce3a29 # AMZN
+      - f67c9ca88f463a48346062e8ad07713f # ATVP
+      - 77a7b25585c18af08f60b1547bb9b4fb # CC
+      - 36b72f59f4ea20aad9316f475f2d9fbb # DCU
+      - 89358767a60cc28783cdc3d0be9388a4 # DSNP
+      - a880d6abc21e7c16884f3ae393f84179 # HMAX
+      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
+      - f6cce30f1733d5c8194222a7507909bb # HULU
+      - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT
+      - 81d1fbf600e2540cee87f3a23f9d3c1c # MAX
+      - d34870697c9db575f17700212167be23 # NF
+      - c67a75ae4a1715f2bb4d492755ba4195 # PMTP
+      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
+      - ae58039e1319178e6be73caab5c42166 # SHO
+      - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN
+      - 9623c5c9cac8e939c1b9aedd32f640bf # SYFY
+      - 9623c5c9cac8e939c1b9aedd32f640bf # UHD Streaming Boost
+      - d2d299244a92b8a52d4921ce3897a256 # UHD Streaming Cut
+
+      # Release Group Tiers
+      - 9965a052eb87b0d10313b1cea89eb451 # Remux Tier 01
+      - 8a1d0c3d7497e741736761a1da866a2e # Remux Tier 02
+      - d6819cba26b1a6508138d25fb5e32293 # HD Bluray Tier 01
+      - c2216b7b8aa545dc1ce8388c618f8d57 # HD Bluray Tier 02
+      - e6258996055b9fbab7e9cb2f75819294 # WEB Tier 01
+      - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02
+      - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03
+      - d0c516558625b04b363fa6c5c2c7cfd4 # WEB Scene
+
+      # Audio Advanced
+      - 0d7824bb924701997f874e7ff7d4844a # TrueHD Atmos
+      - 9d00418ba386a083fbf4d58235fc37ef # DTS:X
+      - b6fbafa7942952a13e17e2b1152b539a # Atmos (undefined)
+      - 4232a509ce60c4e208d13825b7c06264 # DDPlus Atmos
+      - 1808e4b9cee74e064dfae3f1db99dbfe # TrueHD
+      - c429417a57ea8c41d57e6990a8b0033f # DTS-HD MA
+      - 851bd64e04c9374c51102be3dd9ae4cc # FLAC
+      - 30f70576671ca933adbdcfc736a69718 # PCM
+      - cfa5fbd8f02a86fc55d8d223d06a5e1f # DTS-HD HRA
+      - 63487786a8b01b7f20dd2bc90dd4a477 # DDPlus
+      - c1a25cd67b5d2e08287c957b1eb903ec # DTS-ES
+      - 5964f2a8b3be407d083498e4459d05d0 # DTS
+      - a50b8a0c62274a7c38b09a9619ba9d86 # AAC
+      - dbe00161b08a25ac6154c55f95e6318d # DD
+      - 3e8b714263b26f486972ee1e0fe7606c # MP3
+      - 28f6ef16d61e2d1adfce3156ed8257e3 # Opus
+      - bd6dd5e043aa27ff4696a08d011c7d96 # 1.0 Mono
+      - 834e534f103938853ffced4203b53e72 # 2.0 Stereo
+      - 42cba7e38c7947a6d1d0a62580ee6d62 # 3.0 Sound
+      - 1895195e84767de180653914ce207245 # 4.0 Sound
+      - 3fbafa924f361e66fbc6187af82dfa85 # 5.1 Surround
+      - 9fb6d778592c293467437593ef394bf1 # 6.1 Surround
+      - 204c8c3e7315bb0ea81332774fa888d6 # 7.1 Surround
+
+      # Unwanted
+      - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
+      - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
+      - e2315f990da2e2cbfc9fa5b7a6fcfe48 # LQ (Release Title)
+      - 9b64dff695c2115facf1b6ea59c9bd07 # x265 (no HDR/DV)
+      - 83304f261cf516bb208c18c54c0adf97 # SDR (no WEBDL)
+      - fbcb31d8dabd2a319072b84fc0b7249c # Extras
+      - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1
+      - 32b367365729d530ca1c124a0b180c64 # Bad Dual Groups
+      - 82d40da2bc6923f41e14394075dd4b03 # No-RlsGroup
+      - e1a997ddb54e3ecbfe06341ad323c458 # Obfuscated
+      - 06d66ab109d4d2eddb2794d21526d140 # Retags
+      - b735f09d3c025cbb7d75a5d38325b73b # Upscaled
+    assign_scores_to:
+      - name: 'Remux - Season Pack'
+
+  - trash_ids:
+      - e0c1a67f23908a55b6ae9834e8ed6727 # Single Episode
+    assign_scores_to:
+      - name: 'Remux - Season Pack'
+        score: -10000

ansible/roles/recyclarr/files/includes/sonarr-remux_season_pack-qualities.yml

@@ -0,0 +1,23 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/recyclarr/recyclarr/master/schemas/config-schema.json
+quality_profiles:
+  - name: "Remux - Season Pack"
+    upgrade:
+      allowed: true
+      until_quality: 'Bluray-2160p Remux'
+      until_score: 10000
+    min_format_score: 0
+    score_set: default
+    quality_sort: top
+    qualities:
+      - name: 'Bluray-2160p Remux'
+      - name: 'Bluray-1080p Remux'
+      - name: Bluray-2160p
+      - name: WEB 2160p
+        qualities:
+          - WEBDL-2160p
+          - WEBRip-2160p
+      - name: Bluray-1080p
+      - name: WEB 1080p
+        qualities:
+          - WEBDL-1080p
+          - WEBRip-1080p

ansible/roles/recyclarr/files/includes/sonarr-web-custom_formats.yml

@@ -3,69 +3,91 @@ custom_formats:
       # HDR Formats
       - 2b239ed870daba8126a53bd5dc8dc1c8 # DV HDR10+
       - 7878c33f1963fefb3d6c8657d46c2f0a # DV HDR10
+      - 6d0d8de7b57e35518ac0308b0ddf404e # DV
       - 1f733af03141f068a540eec352589a89 # DV HLG
       - 27954b0a80aab882522a88a4d9eae1cd # DV SDR
-      - 6d0d8de7b57e35518ac0308b0ddf404e # DV
-      - bb019e1cd00f304f80971c965de064dc # HDR (undefined)
-      - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR
-      - 3497799d29a085e2ac2df9d468413c94 # HDR10
       - a3d82cbef5039f8d295478d28a887159 # HDR10+
-      - 17e889ce13117940092308f48b48b45b # HLG
+      - 3497799d29a085e2ac2df9d468413c94 # HDR10
+      - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR
+      - bb019e1cd00f304f80971c965de064dc # HDR (undefined)
       - 2a7e3be05d3861d6df7171ec74cad727 # PQ
-
-      # Unwanted
-      - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
-      - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
-      - 9b64dff695c2115facf1b6ea59c9bd07 # x265 (no HDR)
-      - fbcb31d8dabd2a319072b84fc0b7249c # Extras
-      - 83304f261cf516bb208c18c54c0adf97 # SDR (no WEBDL)
-      - 06d66ab109d4d2eddb2794d21526d140 # Retags
-      - e1a997ddb54e3ecbfe06341ad323c458 # Obfuscated
-      - 32b367365729d530ca1c124a0b180c64 # Bad Dual Groups
-      - 82d40da2bc6923f41e14394075dd4b03 # No-RlsGroup
+      - 17e889ce13117940092308f48b48b45b # HLG
       - 9b27ab6498ec0f31a3353992e19434ca # DV (WEBDL)
 
-      # Misc
+      # Miscellaneous
       - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper
       - eb3d5cc0a2be0db205fb823640db6a3c # Repack v2
       - 44e7c4de10ae50265753082e5dc76047 # Repack v3
+      - b735f09d3c025cbb7d75a5d38325b73b # Remaster
+      - 3bc5f395426614e155e585a2f056cdf1 # Season Pack
 
       # Streaming Services
       - d660701077794679fd59e8bdf4ce3a29 # AMZN
       - f67c9ca88f463a48346062e8ad07713f # ATVP
-      - 4e9a630db98d5391aec1368a0256e2fe # CRAV
+      - 77a7b25585c18af08f60b1547bb9b4fb # CC
       - 36b72f59f4ea20aad9316f475f2d9fbb # DCU
       - 89358767a60cc28783cdc3d0be9388a4 # DSNP
-      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
       - a880d6abc21e7c16884f3ae393f84179 # HMAX
+      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
       - f6cce30f1733d5c8194222a7507909bb # HULU
       - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT
       - 81d1fbf600e2540cee87f3a23f9d3c1c # MAX
       - d34870697c9db575f17700212167be23 # NF
-      - b2b980877494b560443631eb1f473867 # NLZ
-      - fb1a91cdc0f26f7ca0696e0e95274645 # OViD
-      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
       - c67a75ae4a1715f2bb4d492755ba4195 # PMTP
-      - 3ac5d84fce98bab1b531393e9c82f467 # QIBI
-      - c30d2958827d1867c73318a5a2957eb1 # RED
+      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
       - ae58039e1319178e6be73caab5c42166 # SHO
       - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN
-      - 5d2317d99af813b6529c7ebf01c83533 # VDL
-      - 77a7b25585c18af08f60b1547bb9b4fb # CC
-      - 43b3cf48cb385cd3eac608ee6bca7f09 # UHD Streaming Boost
+      - 9623c5c9cac8e939c1b9aedd32f640bf # SYFY
+      - 9623c5c9cac8e939c1b9aedd32f640bf # UHD Streaming Boost
       - d2d299244a92b8a52d4921ce3897a256 # UHD Streaming Cut
 
-      # HQ Source Groups
+      # Release Group Tiers
+      - 9965a052eb87b0d10313b1cea89eb451 # Remux Tier 01
+      - 8a1d0c3d7497e741736761a1da866a2e # Remux Tier 02
+      - d6819cba26b1a6508138d25fb5e32293 # HD Bluray Tier 01
+      - c2216b7b8aa545dc1ce8388c618f8d57 # HD Bluray Tier 02
       - e6258996055b9fbab7e9cb2f75819294 # WEB Tier 01
       - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02
       - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03
       - d0c516558625b04b363fa6c5c2c7cfd4 # WEB Scene
-    quality_profiles:
-      - name: Web
 
-  - trash_ids:
-      - e0c1a67f23908a55b6ae9834e8ed6727 # Single Episode
-      - 4a20cfb76b5f92a8ca22b894b32e71be # Multi-Episode
-    quality_profiles:
+      # Audio Advanced
+      - 0d7824bb924701997f874e7ff7d4844a # TrueHD Atmos
+      - 9d00418ba386a083fbf4d58235fc37ef # DTS:X
+      - b6fbafa7942952a13e17e2b1152b539a # Atmos (undefined)
+      - 4232a509ce60c4e208d13825b7c06264 # DDPlus Atmos
+      - 1808e4b9cee74e064dfae3f1db99dbfe # TrueHD
+      - c429417a57ea8c41d57e6990a8b0033f # DTS-HD MA
+      - 851bd64e04c9374c51102be3dd9ae4cc # FLAC
+      - 30f70576671ca933adbdcfc736a69718 # PCM
+      - cfa5fbd8f02a86fc55d8d223d06a5e1f # DTS-HD HRA
+      - 63487786a8b01b7f20dd2bc90dd4a477 # DDPlus
+      - c1a25cd67b5d2e08287c957b1eb903ec # DTS-ES
+      - 5964f2a8b3be407d083498e4459d05d0 # DTS
+      - a50b8a0c62274a7c38b09a9619ba9d86 # AAC
+      - dbe00161b08a25ac6154c55f95e6318d # DD
+      - 3e8b714263b26f486972ee1e0fe7606c # MP3
+      - 28f6ef16d61e2d1adfce3156ed8257e3 # Opus
+      - bd6dd5e043aa27ff4696a08d011c7d96 # 1.0 Mono
+      - 834e534f103938853ffced4203b53e72 # 2.0 Stereo
+      - 42cba7e38c7947a6d1d0a62580ee6d62 # 3.0 Sound
+      - 1895195e84767de180653914ce207245 # 4.0 Sound
+      - 3fbafa924f361e66fbc6187af82dfa85 # 5.1 Surround
+      - 9fb6d778592c293467437593ef394bf1 # 6.1 Surround
+      - 204c8c3e7315bb0ea81332774fa888d6 # 7.1 Surround
+
+      # Unwanted
+      - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
+      - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
+      - e2315f990da2e2cbfc9fa5b7a6fcfe48 # LQ (Release Title)
+      - 9b64dff695c2115facf1b6ea59c9bd07 # x265 (no HDR/DV)
+      - 83304f261cf516bb208c18c54c0adf97 # SDR (no WEBDL)
+      - fbcb31d8dabd2a319072b84fc0b7249c # Extras
+      - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1
+      - 32b367365729d530ca1c124a0b180c64 # Bad Dual Groups
+      - 82d40da2bc6923f41e14394075dd4b03 # No-RlsGroup
+      - e1a997ddb54e3ecbfe06341ad323c458 # Obfuscated
+      - 06d66ab109d4d2eddb2794d21526d140 # Retags
+      - b735f09d3c025cbb7d75a5d38325b73b # Upscaled
+    assign_scores_to:
       - name: Web
-        score: -10000

ansible/roles/recyclarr/files/includes/sonarr-web-qualities.yml

@@ -1,17 +1,18 @@
 quality_profiles:
   - name: Web
-    reset_unmatched_scores:
-      enabled: true
     upgrade:
       allowed: true
-      until_quality: WEB 2160p
+      until_quality: 'WEB 2160p'
       until_score: 10000
     min_format_score: 0
+    score_set: default
+    quality_sort: top
     qualities:
       - name: WEB 2160p
         qualities:
           - WEBDL-2160p
           - WEBRip-2160p
+      - name: Bluray-1080p
       - name: WEB 1080p
         qualities:
           - WEBDL-1080p

ansible/roles/recyclarr/files/includes/sonarr-web_season_pack-custom_formats.yml

@@ -0,0 +1,99 @@
+custom_formats:
+  - trash_ids:
+      # HDR Formats
+      - 2b239ed870daba8126a53bd5dc8dc1c8 # DV HDR10+
+      - 7878c33f1963fefb3d6c8657d46c2f0a # DV HDR10
+      - 6d0d8de7b57e35518ac0308b0ddf404e # DV
+      - 1f733af03141f068a540eec352589a89 # DV HLG
+      - 27954b0a80aab882522a88a4d9eae1cd # DV SDR
+      - a3d82cbef5039f8d295478d28a887159 # HDR10+
+      - 3497799d29a085e2ac2df9d468413c94 # HDR10
+      - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR
+      - bb019e1cd00f304f80971c965de064dc # HDR (undefined)
+      - 2a7e3be05d3861d6df7171ec74cad727 # PQ
+      - 17e889ce13117940092308f48b48b45b # HLG
+      - 9b27ab6498ec0f31a3353992e19434ca # DV (WEBDL)
+
+      # Miscellaneous
+      - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper
+      - eb3d5cc0a2be0db205fb823640db6a3c # Repack v2
+      - 44e7c4de10ae50265753082e5dc76047 # Repack v3
+      - b735f09d3c025cbb7d75a5d38325b73b # Remaster
+      - 3bc5f395426614e155e585a2f056cdf1 # Season Pack
+
+      # Streaming Services
+      - d660701077794679fd59e8bdf4ce3a29 # AMZN
+      - f67c9ca88f463a48346062e8ad07713f # ATVP
+      - 77a7b25585c18af08f60b1547bb9b4fb # CC
+      - 36b72f59f4ea20aad9316f475f2d9fbb # DCU
+      - 89358767a60cc28783cdc3d0be9388a4 # DSNP
+      - a880d6abc21e7c16884f3ae393f84179 # HMAX
+      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
+      - f6cce30f1733d5c8194222a7507909bb # HULU
+      - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT
+      - 81d1fbf600e2540cee87f3a23f9d3c1c # MAX
+      - d34870697c9db575f17700212167be23 # NF
+      - c67a75ae4a1715f2bb4d492755ba4195 # PMTP
+      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
+      - ae58039e1319178e6be73caab5c42166 # SHO
+      - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN
+      - 9623c5c9cac8e939c1b9aedd32f640bf # SYFY
+      - 9623c5c9cac8e939c1b9aedd32f640bf # UHD Streaming Boost
+      - d2d299244a92b8a52d4921ce3897a256 # UHD Streaming Cut
+
+      # Release Group Tiers
+      - 9965a052eb87b0d10313b1cea89eb451 # Remux Tier 01
+      - 8a1d0c3d7497e741736761a1da866a2e # Remux Tier 02
+      - d6819cba26b1a6508138d25fb5e32293 # HD Bluray Tier 01
+      - c2216b7b8aa545dc1ce8388c618f8d57 # HD Bluray Tier 02
+      - e6258996055b9fbab7e9cb2f75819294 # WEB Tier 01
+      - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02
+      - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03
+      - d0c516558625b04b363fa6c5c2c7cfd4 # WEB Scene
+
+      # Audio Advanced
+      - 0d7824bb924701997f874e7ff7d4844a # TrueHD Atmos
+      - 9d00418ba386a083fbf4d58235fc37ef # DTS:X
+      - b6fbafa7942952a13e17e2b1152b539a # Atmos (undefined)
+      - 4232a509ce60c4e208d13825b7c06264 # DDPlus Atmos
+      - 1808e4b9cee74e064dfae3f1db99dbfe # TrueHD
+      - c429417a57ea8c41d57e6990a8b0033f # DTS-HD MA
+      - 851bd64e04c9374c51102be3dd9ae4cc # FLAC
+      - 30f70576671ca933adbdcfc736a69718 # PCM
+      - cfa5fbd8f02a86fc55d8d223d06a5e1f # DTS-HD HRA
+      - 63487786a8b01b7f20dd2bc90dd4a477 # DDPlus
+      - c1a25cd67b5d2e08287c957b1eb903ec # DTS-ES
+      - 5964f2a8b3be407d083498e4459d05d0 # DTS
+      - a50b8a0c62274a7c38b09a9619ba9d86 # AAC
+      - dbe00161b08a25ac6154c55f95e6318d # DD
+      - 3e8b714263b26f486972ee1e0fe7606c # MP3
+      - 28f6ef16d61e2d1adfce3156ed8257e3 # Opus
+      - bd6dd5e043aa27ff4696a08d011c7d96 # 1.0 Mono
+      - 834e534f103938853ffced4203b53e72 # 2.0 Stereo
+      - 42cba7e38c7947a6d1d0a62580ee6d62 # 3.0 Sound
+      - 1895195e84767de180653914ce207245 # 4.0 Sound
+      - 3fbafa924f361e66fbc6187af82dfa85 # 5.1 Surround
+      - 9fb6d778592c293467437593ef394bf1 # 6.1 Surround
+      - 204c8c3e7315bb0ea81332774fa888d6 # 7.1 Surround
+
+      # Unwanted
+      - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
+      - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
+      - e2315f990da2e2cbfc9fa5b7a6fcfe48 # LQ (Release Title)
+      - 9b64dff695c2115facf1b6ea59c9bd07 # x265 (no HDR/DV)
+      - 83304f261cf516bb208c18c54c0adf97 # SDR (no WEBDL)
+      - fbcb31d8dabd2a319072b84fc0b7249c # Extras
+      - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1
+      - 32b367365729d530ca1c124a0b180c64 # Bad Dual Groups
+      - 82d40da2bc6923f41e14394075dd4b03 # No-RlsGroup
+      - e1a997ddb54e3ecbfe06341ad323c458 # Obfuscated
+      - 06d66ab109d4d2eddb2794d21526d140 # Retags
+      - b735f09d3c025cbb7d75a5d38325b73b # Upscaled
+    assign_scores_to:
+      - name: 'Web - Season Pack'
+
+  - trash_ids:
+      - e0c1a67f23908a55b6ae9834e8ed6727 # Single Episode
+    assign_scores_to:
+      - name: 'Web - Season Pack'
+        score: -10000

ansible/roles/recyclarr/files/includes/sonarr-web_season_pack-qualities.yml

@@ -1,19 +1,13 @@
 quality_profiles:
-  - name: Web
-    reset_unmatched_scores:
-      enabled: true
+  - name: 'Web - Season Pack'
     upgrade:
       allowed: true
-      until_quality: WEB 2160p
+      until_quality: 'WEB 2160p'
       until_score: 10000
     min_format_score: 0
+    score_set: default
+    quality_sort: top
     qualities:
-      - name: Remux-2160p
-        enabled: false
-      - name: Bluray-2160p
-        enabled: false
-      - name: Remux-1080p
-        enabled: false
       - name: WEB 2160p
         qualities:
           - WEBDL-2160p

ansible/roles/recyclarr/handlers/main.yml

@@ -1,4 +1,4 @@
 - name: restart recyclarr
   community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
-    restarted: true
+    state: restarted

ansible/roles/recyclarr/tasks/main.yml

@@ -30,18 +30,21 @@
     mode: "{{ docker_compose_directory_mask }}"
   become: true
 
-- name: Install main configuration
+- name: Install main configuration files
   template:
-    src: recyclarr.yml
-    dest: "{{ data_dir }}/recyclarr/configs"
+    src: "{{ item }}"
+    dest: "{{ data_dir }}/recyclarr/configs/"
     owner: "{{ service_user.uid }}"
+  loop:
+    - sonarr.yml
+    - radarr.yml
   become: true
   notify: restart recyclarr
 
 - name: Install config includes
   copy:
     src: includes/
-    dest: "{{ data_dir }}/recyclarr/configs/includes"
+    dest: "{{ data_dir }}/recyclarr/includes/"
   become: true
   notify: restart recyclarr
 

ansible/roles/recyclarr/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   starr:
@@ -7,8 +6,9 @@ networks:
 services:
   recyclarr:
     container_name: recyclarr
-    image: ghcr.io/recyclarr/recyclarr:latest
+    image: ghcr.io/recyclarr/recyclarr:7
     restart: unless-stopped
+    security_opt: ['no-new-privileges:true'] # Prevents privilege escalation - https://recyclarr.dev/wiki/installation/docker/#prevent-in-container-privilege-escalation
     user: "{{ service_user.uid }}:{{ service_user.uid }}"
     networks:
       - starr

ansible/roles/recyclarr/templates/radarr.yml

@@ -0,0 +1,35 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/recyclarr/recyclarr/master/schemas/config-schema.json
+radarr:
+  movies:
+    base_url: "https://radarr.local.{{ personal_domain }}"
+    api_key: "{{ radarr_api_key }}"
+    delete_old_custom_formats: true
+    replace_existing_custom_formats: true
+    media_naming:
+      folder: jellyfin-tmdb
+      movie:
+        rename: true
+        standard: default
+
+    include:
+      - template: radarr-quality-definition-movie
+
+      # Remux
+      - config: radarr-remux-qualities.yml
+      - config: radarr-remux-custom_formats.yml
+
+      # Web
+      - config: radarr-web-qualities.yml
+      - config: radarr-web-custom_formats.yml
+
+      # Old
+      - config: radarr-old-qualities.yml
+      - config: radarr-old-custom_formats.yml
+
+      # Anime
+      - config: radarr-anime-qualities.yml
+      - config: radarr-anime-custom_formats.yml
+
+      # Not 4k
+      - config: radarr-not_4k-qualities.yml
+      - config: radarr-not_4k-qualities.yml

ansible/roles/recyclarr/templates/recyclarr.yml

@@ -1,56 +0,0 @@
-sonarr:
-  series:
-    base_url: "https://sonarr.local.{{ personal_domain }}"
-    api_key: "{{ sonarr_api_key }}"
-    delete_old_custom_formats: true
-    quality_definition:
-      type: series
-    media_naming:
-      series: plex
-      season: default
-      episodes:
-        rename: true
-        standard: default
-        daily: default
-        anime: default
-    include:
-      # Remux Quality Profile
-      - config: includes/qualities/sonarr-remux-qualities.yml
-      - config: includes/sonarr-remux.yml
-      # Web Quality Profile
-      - config: includes/qualities/sonarr-web-qualities.yml
-      - config: includes/sonarr-web.yml
-      # Season Pack Profile
-      - config: includes/qualities/sonarr-seasonpack-qualities.yml
-      - config: includes/sonarr-seasonpack.yml
-      # Anime Quality Profile
-      - config: includes/qualities/sonarr-anime-qualities.yml
-      - config: includes/sonarr-anime.yml
-
-
-radarr:
-  movies:
-    base_url: "https://radarr.local.{{ personal_domain }}"
-    api_key: "{{ radarr_api_key }}"
-    delete_old_custom_formats: true
-    quality_definition:
-      type: movie
-    media_naming:
-      folder: plex
-      movie:
-        rename: true
-        standard: anime
-    include:
-      # Remux Quality Profile
-      - config: includes/qualities/radarr-remux-qualities.yml
-      - config: includes/radarr-remux.yml
-      # Web Quality Profile
-      - config: includes/qualities/radarr-web-qualities.yml
-      - config: includes/radarr-web.yml
-      # Anime Quality Profile
-      - config: includes/qualities/radarr-anime-qualities.yml
-      - config: includes/radarr-anime.yml
-      # Not 4k Quality Profile
-      - config: includes/qualities/radarr-not4k-qualities.yml
-      - config: includes/radarr-not4k.yml
-

ansible/roles/recyclarr/templates/sonarr.yml

@@ -0,0 +1,46 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/recyclarr/recyclarr/master/schemas/config-schema.json
+sonarr:
+  tv:
+    base_url: "https://sonarr.local.{{ personal_domain }}"
+    api_key: "{{ sonarr_api_key }}"
+    delete_old_custom_formats: true
+    replace_existing_custom_formats: true
+    media_naming:
+      series: jellyfin-tvdb
+      season: default
+      episodes:
+        rename: true
+        standard: default
+        daily: default
+        anime: default
+
+    include:
+      - template: sonarr-quality-definition-anime
+
+      # Remux
+      - config: sonarr-remux-qualities.yml
+      - config: sonarr-remux-custom_formats.yml
+
+      # Remux - Season Pack
+      - config: sonarr-remux_season_pack-qualities.yml
+      - config: sonarr-remux_season_pack-custom_formats.yml
+
+      # Web
+      - config: sonarr-web-qualities.yml
+      - config: sonarr-web-custom_formats.yml
+
+      # Web - Season Pack
+      - config: sonarr-web_season_pack-qualities.yml
+      - config: sonarr-web_season_pack-custom_formats.yml
+
+      # Anime
+      - config: sonarr-anime-qualities.yml
+      - config: sonarr-anime-custom_formats.yml
+
+      # Old
+      - config: sonarr-old-qualities.yml
+      - config: sonarr-old-custom_formats.yml
+
+      # Old - Season Pack
+      - config: sonarr-old_season_pack-qualities.yml
+      - config: sonarr-old_season_pack-custom_formats.yml

ansible/roles/redlib/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/renovate/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   docker-socket-proxy:

ansible/roles/rimgo/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/sabnzbd/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/searxng/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/slskd/handlers/main.yml

@@ -1,4 +1,4 @@
 - name: restart service
   community.docker.docker_compose_v2:
     project_src: "{{ install_directory }}/{{ role_name }}"
-    restarted: true
+    state: restarted

ansible/roles/slskd/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 services:
   slskd:
@@ -9,7 +8,7 @@ services:
     user: "{{ service_user.uid }}:{{ media_gid }}"
     volumes:
       - "{{ data_dir }}/{{ role_name }}:/app"
-      - "{{ media_storage_mnt }}/data/import/music/soulseek:/downloads"
+      - "{{ media_storage_mnt }}/data/ddl/soulseek:/downloads"
       - "{{ media_storage_mnt }}/data/media/music:/music:ro"
     labels:
       traefik.enable: true

ansible/roles/slskd/templates/slskd.yml

@@ -1,5 +1,5 @@
 # debug: false
-remote_configuration: true
+remote_configuration: false
 
 directories:
   downloads: /downloads
@@ -34,3 +34,8 @@ web:
   port: 5030
   url_base: /
   logging: false
+  authentication:
+    api_keys:
+      my_api_key:
+        key: "{{ slskd_api_key }}"
+        #cidr: 10.0.0.0/24,172.16.0.0/12

ansible/roles/sonarr/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/soularr/handlers/main.yml

@@ -0,0 +1,4 @@
+- name: restart service
+  community.docker.docker_compose_v2:
+    project_src: "{{ install_directory }}/{{ role_name }}"
+    state: restarted

ansible/roles/soularr/tasks/main.yml

@@ -0,0 +1,44 @@
+- name: Create service user
+  user:
+    name: "{{ role_name }}"
+    system: true
+  register: service_user
+  become: true
+
+- name: Create install directory
+  file:
+    path: "{{ install_directory }}/{{ role_name }}"
+    state: directory
+    owner: "{{ docker_user }}"
+    mode: "{{ docker_compose_directory_mask }}"
+  become: true
+
+- name: Create config directory
+  file:
+    path: "{{ data_dir }}/{{ role_name }}"
+    state: directory
+    owner: "{{ service_user.uid }}"
+    group: "{{ media_gid }}"
+    mode: "{{ docker_compose_directory_mask }}"
+  become: true
+
+- name: Copy docker-compose file to destination
+  template:
+    src: docker-compose.yml
+    dest: "{{ install_directory }}/{{ role_name }}/docker-compose.yml"
+    owner: "{{ docker_user }}"
+    mode: "{{ docker_compose_file_mask }}"
+    validate: docker compose -f %s config
+  become: true
+
+- name: Install config.ini
+  ansible.builtin.template:
+    src: config.ini
+    dest: "{{ data_dir }}/{{ role_name }}/config.ini"
+  notify: restart service
+
+- name: Start docker container
+  community.docker.docker_compose_v2:
+    project_src: "{{ install_directory }}/{{ role_name }}"
+    pull: always
+    remove_orphans: yes

ansible/roles/soularr/templates/config.ini

@@ -0,0 +1,44 @@
+[Lidarr]
+api_key = {{ lidarr_api_key }}
+host_url = https://lidarr.local.{{ personal_domain }}
+# This is the soulseek downloads directory as lidarr sees it
+download_dir = /data/ddl/soulseek
+disable_sync = False
+
+[Slskd]
+api_key = {{ slskd_api_key }}
+host_url = https://soulseek.local.{{ personal_domain }}
+url_base = /
+download_dir = /downloads
+delete_searches = False
+stalled_timeout = 3600
+
+[Release Settings]
+use_most_common_tracknum = True
+allow_multi_disc = True
+accepted_countries = Europe,Japan,United Kingdom,United States,[Worldwide],Australia,Canada
+skip_region_check = False
+accepted_formats = CD,Digital Media,Vinyl
+
+[Search Settings]
+search_timeout = 5000
+maximum_peer_queue = 50
+minimum_peer_upload_speed = 0
+minimum_filename_match_ratio = 0.8
+allowed_filetypes = flac 24/192,flac 16/44.1,flac
+ignored_users = User1,User2,Fred,Bob
+search_for_tracks = True
+album_prepend_artist = False
+track_prepend_artist = True
+search_type = incrementing_page
+number_of_albums_to_grab = 10
+remove_wanted_on_failure = False
+title_blacklist = BlacklistWord1,blacklistword2
+search_source = missing
+
+[Logging]
+level = INFO
+# https://docs.python.org/3/library/logging.html#logrecord-attributes
+format = [%(levelname)s|%(module)s|L%(lineno)d] %(asctime)s: %(message)s
+# https://docs.python.org/3/library/time.html#time.strftime
+datefmt = %Y-%m-%dT%H:%M:%S%z

ansible/roles/soularr/templates/docker-compose.yml

@@ -0,0 +1,11 @@
+services:
+  soularr:
+    container_name: "soularr"
+    image: mrusse08/soularr:latest
+    restart: unless-stopped
+    user: "{{ service_user.uid }}:{{ media_gid }}"
+    environment:
+      - "TZ={{ timezone }}"
+    volumes:
+      - "{{ data_dir }}/{{ role_name }}:/data"
+      - "{{ media_storage_mnt }}/data/ddl/soulseek:/downloads"

ansible/roles/synapse/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/tautulli/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/traefik/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/unifi-controller/templates/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "{{ docker_compose_version }}"
 
 networks:
   traefik:

ansible/roles/wger/files/nginx.conf

@@ -0,0 +1,28 @@
+upstream wger {
+    server web:8000;
+}
+
+server {
+
+    listen 80;
+
+    location / {
+        proxy_pass http://wger;
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
+        proxy_set_header X-Forwarded-Host $host:$server_port;
+        proxy_redirect off;
+    }
+
+    location /static/ {
+        alias /wger/static/;
+    }
+
+    location /media/ {
+        alias /wger/media/;
+    }
+
+    # Increase max body size to allow for video uploads
+    client_max_body_size 100M;
+}

ansible/roles/wger/tasks/main.yml

@@ -0,0 +1,60 @@
+- name: Create install directory
+  file:
+    path: "{{ install_directory }}/{{ role_name }}"
+    state: directory
+    owner: "{{ docker_user }}"
+    mode: "{{ docker_compose_directory_mask }}"
+  become: true
+
+- name: Create database data directory
+  file:
+    path: "{{ data_dir }}/postgres/{{ role_name }}"
+    state: directory
+    owner: "{{ docker_user }}"
+    mode: "{{ docker_compose_directory_mask }}"
+  become: true
+
+- name: Create redis data directory
+  file:
+    path: "{{ data_dir }}/redis/{{ role_name }}"
+    state: directory
+    owner: "{{ docker_user }}"
+    mode: "{{ docker_compose_directory_mask }}"
+  become: true
+
+- name: Create data and config directories
+  file:
+    path: "{{ data_dir }}/{{ role_name }}/{{ item }}"
+    state: directory
+    owner: "{{ docker_user }}"
+    mode: "{{ docker_compose_directory_mask }}"
+  loop:
+    - config
+    - static
+    - media
+    - celery-beat
+
+- name: Install wger config file (templatized)
+  template:
+    src: prod.env
+    dest: "{{ data_dir }}/{{ role_name }}/config/prod.env"
+
+- name: Install config files
+  copy:
+    src: ./
+    dest: "{{ data_dir }}/{{ role_name }}/config"
+
+- name: Copy docker-compose file to destination
+  template:
+    src: docker-compose.yml
+    dest: "{{ install_directory }}/{{ role_name }}/docker-compose.yml"
+    owner: "{{ docker_user }}"
+    mode: "{{ docker_compose_file_mask }}"
+    validate: docker compose -f %s config
+  become: true
+
+- name: Start docker container
+  community.docker.docker_compose_v2:
+    project_src: "{{ install_directory }}/{{ role_name }}"
+    pull: always
+    remove_orphans: yes

ansible/roles/wger/templates/docker-compose.yml

@@ -0,0 +1,132 @@
+networks:
+  traefik:
+    external: true
+
+services:
+  web:
+    image: wger/server:latest
+    depends_on:
+      db:
+        condition: service_healthy
+      cache:
+        condition: service_healthy
+    networks:
+      - default
+    env_file:
+      - {{ data_dir }}/{{ role_name }}/config/prod.env
+    volumes:
+      - {{ data_dir }}/{{ role_name }}/static:/home/wger/static
+      - {{ data_dir }}/{{ role_name }}/media:/home/wger/media
+    expose:
+      - 8000
+    healthcheck:
+      test: wget --no-verbose --tries=1 --spider http://localhost:8000
+      interval: 10s
+      timeout: 5s
+      start_period: 300s
+      retries: 5
+    restart: unless-stopped
+
+  nginx:
+    image: nginx:stable
+    depends_on:
+      - web
+    networks:
+      - traefik
+      - default
+    volumes:
+      - {{ data_dir }}/{{ role_name }}/config/nginx.conf:/etc/nginx/conf.d/default.conf
+      - {{ data_dir }}/{{ role_name }}/static:/wger/static:ro
+      - {{ data_dir }}/{{ role_name }}/media:/wger/media:ro
+    healthcheck:
+      test: service nginx status
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
+    restart: unless-stopped
+    labels:
+      traefik.enable: true
+      traefik.http.routers.wger.rule: "Host(`wger.{{ personal_domain }}`)"
+      #traefik.http.services.wger.loadbalancer.server.port: 8000
+      #traefik.http.routers.wger.middlewares: lan-whitelist@file
+
+  db:
+    image: postgres:15-alpine
+    environment:
+      - POSTGRES_USER=wger
+      - POSTGRES_PASSWORD=wger
+      - POSTGRES_DB=wger
+      - "TZ={{ timezone }}"
+    networks:
+      - default
+    volumes:
+      - {{ data_dir }}/postgres/{{ role_name }}:/var/lib/postgresql/data/
+    expose:
+      - 5432
+    healthcheck:
+      test: pg_isready -U wger
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
+    restart: unless-stopped
+
+  cache:
+    image: redis
+    expose:
+      - 6379
+    networks:
+      - default
+    volumes:
+      - {{ data_dir }}/{{ role_name }}/config/redis.conf:/usr/local/etc/redis/redis.conf
+      - {{ data_dir }}/redis/{{ role_name }}/data:/data
+    command: [ "redis-server", "/usr/local/etc/redis/redis.conf"]
+    healthcheck:
+      test: redis-cli ping
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
+    restart: unless-stopped
+
+    # You probably want to limit the memory usage of the cache, otherwise it might
+    # hog all the available memory. Remove or change according to your needs.
+    #mem_limit: 2gb
+
+  celery_worker:
+    image: wger/server:latest
+    command: /start-worker
+    networks:
+      - default
+    env_file:
+      - {{ data_dir }}/{{ role_name }}/config/prod.env
+    volumes:
+      - {{ data_dir }}/{{ role_name }}/media:/home/wger/media
+    depends_on:
+      web:
+        condition: service_healthy
+    healthcheck:
+      test: celery -A wger inspect ping
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
+
+  celery_beat:
+    image: wger/server:latest
+    command: /start-beat
+    networks:
+      - default
+    volumes:
+      - {{ data_dir }}/{{ role_name }}/celery-beat:/home/wger/beat/
+    env_file:
+      - {{ data_dir }}/{{ role_name }}/config/prod.env
+    depends_on:
+      celery_worker:
+        condition: service_healthy
+
+
+  # Heads up, if you remove these volumes and use folders directly you need to chown them
+  # to the UID and GID 1000 even if it doesn't exist on your system. Also, they should
+  # be readable by everyone.

ansible/roles/wger/templates/prod.env

@@ -0,0 +1,172 @@
+SECRET_KEY="{{ DJANGO_SECRET }}"
+SIGNING_KEY="{{ JWT_SECRET }}"
+
+TIME_ZONE=America/New_York
+TZ=America/New_York
+
+CSRF_TRUSTED_ORIGINS="https://wger.{{ personal_domain }}"
+X_FORWARDED_PROTO_HEADER_SET=True
+
+MEDIA_URL="https://wger.{{ personal_domain }}/media/"
+STATIC_URL="https://wger.{{ personal_domain }}/static/"
+
+#
+# These settings usually don't need changing
+#
+
+#
+# Application
+WGER_INSTANCE=https://wger.de # Wger instance from which to sync exercises, images, etc.
+ALLOW_REGISTRATION=True
+ALLOW_GUEST_USERS=True
+ALLOW_UPLOAD_VIDEOS=True
+# Users won't be able to contribute to exercises if their account age is
+# lower than this amount in days.
+MIN_ACCOUNT_AGE_TO_TRUST=21
+# Synchronzing exercises
+# It is recommended to keep the local database synchronized with the wger
+# instance specified in WGER_INSTANCE since there are new added or translations
+# improved. For this you have different possibilities:
+# - Sync exercises on startup:
+# SYNC_EXERCISES_ON_STARTUP=True
+# DOWNLOAD_EXERCISE_IMAGES_ON_STARTUP=True
+# - Sync them in the background with celery. This will setup a job that will run
+#   once a week at a random time (this time is selected once when starting the server)
+SYNC_EXERCISES_CELERY=True
+SYNC_EXERCISE_IMAGES_CELERY=True
+SYNC_EXERCISE_VIDEOS_CELERY=True
+# - Manually trigger the process as needed:
+#   docker compose exec web python3 manage.py sync-exercises
+#   docker compose exec web python3 manage.py download-exercise-images
+#   docker compose exec web python3 manage.py download-exercise-videos
+
+# Synchronzing ingredients
+# You can also syncronize the ingredients from a remote wger instance, and have
+# basically the same options as for the ingredients:
+# - Sync them in the background with celery. This will setup a job that will run
+#   once a week at a random time (this time is selected once when starting the server)
+SYNC_INGREDIENTS_CELERY=True
+# - Manually trigger the process as needed:
+#   docker compose exec web python3 manage.py sync-ingredients
+
+# This option controls whether to download ingredients and their images from the
+# configured wger instance. When scanning products with the barcode scanner, it is
+# possible to dynamically fetch the ingredient if it is not known in the local database.
+# Possible values: WGER or None. Requires USE_CELERY to be set to true.
+DOWNLOAD_INGREDIENTS_FROM=WGER
+
+# Whether celery is configured and should be used. Can be left to true with
+# this setup but can be deactivated if you are using the app in some other way
+USE_CELERY=True
+
+#
+# Celery
+CELERY_BROKER=redis://cache:6379/2
+CELERY_BACKEND=redis://cache:6379/2
+CELERY_FLOWER_PASSWORD=adminadmin
+
+#
+# Database
+DJANGO_DB_ENGINE=django.db.backends.postgresql
+DJANGO_DB_DATABASE=wger
+DJANGO_DB_USER=wger
+DJANGO_DB_PASSWORD=wger
+DJANGO_DB_HOST=db
+DJANGO_DB_PORT=5432
+DJANGO_PERFORM_MIGRATIONS=True # Perform any new database migrations on startup
+
+#
+# Cache
+DJANGO_CACHE_BACKEND=django_redis.cache.RedisCache
+DJANGO_CACHE_LOCATION=redis://cache:6379/1
+DJANGO_CACHE_TIMEOUT=1296000 # in seconds - 60*60*24*15, 15 Days
+DJANGO_CACHE_CLIENT_CLASS=django_redis.client.DefaultClient
+# DJANGO_CACHE_CLIENT_PASSWORD=abcde... # Only if you changed the redis config
+# DJANGO_CACHE_CLIENT_SSL_KEYFILE=/path/to/ssl_keyfile # Path to an ssl private key.
+# DJANGO_CACHE_CLIENT_SSL_CERTFILE=/path/to/ssl_certfile # Path to an ssl certificate.
+# DJANGO_CACHE_CLIENT_SSL_CERT_REQS=<none | optional | required> # The string value for the verify_mode.
+# DJANGO_CACHE_CLIENT_SSL_CHECK_HOSTNAME=False # If set, match the hostname during the SSL handshake.
+
+#
+# Brute force login attacks
+# https://django-axes.readthedocs.io/en/latest/index.html
+AXES_ENABLED=True
+AXES_FAILURE_LIMIT=10
+AXES_COOLOFF_TIME=30 # in minutes
+AXES_HANDLER=axes.handlers.cache.AxesCacheHandler
+AXES_LOCKOUT_PARAMETERS=ip_address
+AXES_IPWARE_PROXY_COUNT=1
+AXES_IPWARE_META_PRECEDENCE_ORDER=HTTP_X_FORWARDED_FOR,REMOTE_ADDR
+#
+# Others
+DJANGO_DEBUG=False
+WGER_USE_GUNICORN=True
+EXERCISE_CACHE_TTL=18000 # in seconds - 5*60*60, 5 hours
+SITE_URL=http://localhost
+
+#
+# JWT auth
+ACCESS_TOKEN_LIFETIME=10 # The lifetime duration of the access token, in minutes
+REFRESH_TOKEN_LIFETIME=24 # The lifetime duration of the refresh token, in hours
+
+#
+# Auth Proxy Authentication
+#
+# Please read the documentation before enabling this feature:
+# https://wger.readthedocs.io/en/latest/administration/auth_proxy.html
+AUTH_PROXY_HEADER=''
+AUTH_PROXY_TRUSTED_IPS=''
+AUTH_PROXY_CREATE_UNKNOWN_USER=False
+AUTH_PROXY_USER_EMAIL_HEADER=''
+AUTH_PROXY_USER_NAME_HEADER=''
+
+#
+# Other possible settings
+
+# Recaptcha keys. You will need to create an account and register your domain
+# https://www.google.com/recaptcha/
+# RECAPTCHA_PUBLIC_KEY=abcde...
+# RECAPTCHA_PRIVATE_KEY=abcde...
+USE_RECAPTCHA=False
+
+# Clears the static files before copying the new ones (i.e. just calls collectstatic
+# with the appropriate flag: "manage.py collectstatic --no-input --clear"). Usually
+# This can be left like this but if you have problems and new static files are not
+# being copied correctly, clearing everything might help
+DJANGO_CLEAR_STATIC_FIRST=False
+
+#
+# Email
+# https://docs.djangoproject.com/en/4.1/topics/email/#smtp-backend
+# ENABLE_EMAIL=False
+# EMAIL_HOST=email.example.com
+# EMAIL_PORT=587
+# EMAIL_HOST_USER=username
+# EMAIL_HOST_PASSWORD=password
+# EMAIL_USE_TLS=True
+# EMAIL_USE_SSL=False
+FROM_EMAIL='wger Workout Manager <wger@example.com>'
+
+# Set your name and email to be notified if an internal server error occurs.
+# Needs a working email configuration
+# DJANGO_ADMINS=your name,email@example.com
+
+# Whether to compress css and js files into one (of each)
+# COMPRESS_ENABLED=True
+
+#
+# Django Rest Framework
+# The number of proxies in front of the application. In the default configuration
+# only nginx is. Change as approtriate if your setup differs. Also note that this
+# is only used when throttling API requests.
+NUMBER_OF_PROXIES=1
+
+#
+# Gunicorn
+#
+# Additional gunicorn options, change as needed.
+# For the number of workers to spawn, a usually recommended value is (2 x $num_cores) + 1
+# see:
+#   - https://docs.gunicorn.org/en/stable/settings.html
+#   - https://github.com/wger-project/wger/blob/master/extras/docker/production/entrypoint.sh#L95
+GUNICORN_CMD_ARGS="--workers 3 --threads 2 --worker-class gthread --proxy-protocol True --timeout 240"

ansible/roles/wger/vars/main.yml

@@ -0,0 +1,16 @@
+DJANGO_SECRET: !vault |
+  $ANSIBLE_VAULT;1.1;AES256
+  64326466343139613339363438386534363564626662366266353732383831613735613130666663
+  6464623832646233653332313434303939666633613261640a393132616662326637356263373966
+  30623465363333306430636462653738353737376635393366623162383437343430336163373832
+  3931363133376466330a373565353636353932653436306165303664366539333263626566393436
+  35386366633735373137616238303462616162636362306563343064383764383136
+
+JWT_SECRET: !vault |
+  $ANSIBLE_VAULT;1.1;AES256
+  36306265373261313533313237653432663230666162373062373166323061373932366434616532
+  6538393830396535633434373530626566316538313732620a636439363632666430613938326164
+  36363432363361653665303965353566623861323331306630316265633430616266363462636362
+  6132636138306335620a393662663431623566663165383362663138356237343063363239353063
+  61336633373963356533396132316432356534373930613434326235346639326634
+