From ade7ae90d7a6ae804bd9d01dc680e1610bb6e846 Mon Sep 17 00:00:00 2001 From: Sam Chau Date: Mon, 15 Apr 2024 15:22:28 +0930 Subject: [PATCH] New Profile - Balanced (HEVC) (#41) * Added Balanced (HEVC) Profile + accompanying custom formats * removed legacy h265 profile --- develop/docker-compose.yml | 9 +- .../custom formats (radarr - master).json | 1015 ++++++++++++++++- ...nced (HEVC) [Beta] (radarr - master).json} | 106 +- 3 files changed, 1104 insertions(+), 26 deletions(-) rename imports/quality_profiles/radarr/{1080p h265 Balanced (radarr - master).json => Balanced (HEVC) [Beta] (radarr - master).json} (92%) diff --git a/develop/docker-compose.yml b/develop/docker-compose.yml index 3d50531..e8936bc 100644 --- a/develop/docker-compose.yml +++ b/develop/docker-compose.yml @@ -2,8 +2,8 @@ version: "3.3" x-common-settings: &common-settings environment: - PUID: 1000 # user id, change as necessary - PGID: 1000 # group id, change as necessary + PUID: 0 # user id, change as necessary + PGID: 0 # group id, change as necessary TZ: Europe/London # timezone, change as necessary restart: unless-stopped @@ -14,6 +14,8 @@ services: container_name: radarr ports: - "7887:7878" # change the left value to the desired host port for Radarr + volumes: + - radarr_movies:/movies radarr2: <<: *common-settings @@ -35,3 +37,6 @@ services: container_name: sonarr2 ports: - "8999:8989" # change the left value to the desired host port for Sonarr + +volumes: + radarr_movies: # Docker managed volume for movies diff --git a/imports/custom_formats/radarr/custom formats (radarr - master).json b/imports/custom_formats/radarr/custom formats (radarr - master).json index 54ba7bc..2c4b313 100644 --- a/imports/custom_formats/radarr/custom formats (radarr - master).json +++ b/imports/custom_formats/radarr/custom formats (radarr - master).json @@ -3007,6 +3007,27 @@ "isFloat": false } ] + }, + { + "name": "x265", + "implementation": "ReleaseTitleSpecification", + "implementationName": "Release Title", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": true, + "required": true, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Regular Expression", + "helpText": "Custom Format RegEx is Case Insensitive", + "value": "^(?!.*(?i:remux)).*([x]\\s?(\\.?265))", + "type": "textbox", + "advanced": false, + "privacy": "normal", + "isFloat": false + } + ] } ] }, @@ -4980,6 +5001,88 @@ "isFloat": false } ] + }, + { + "name": "Bluray", + "implementation": "SourceSpecification", + "implementationName": "Source", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": false, + "required": true, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Source", + "value": 9, + "type": "select", + "advanced": false, + "selectOptions": [ + { + "value": 0, + "name": "UNKNOWN", + "order": 0, + "dividerAfter": false + }, + { + "value": 1, + "name": "CAM", + "order": 1, + "dividerAfter": false + }, + { + "value": 2, + "name": "TELESYNC", + "order": 2, + "dividerAfter": false + }, + { + "value": 3, + "name": "TELECINE", + "order": 3, + "dividerAfter": false + }, + { + "value": 4, + "name": "WORKPRINT", + "order": 4, + "dividerAfter": false + }, + { + "value": 5, + "name": "DVD", + "order": 5, + "dividerAfter": false + }, + { + "value": 6, + "name": "TV", + "order": 6, + "dividerAfter": false + }, + { + "value": 7, + "name": "WEBDL", + "order": 7, + "dividerAfter": false + }, + { + "value": 8, + "name": "WEBRIP", + "order": 8, + "dividerAfter": false + }, + { + "value": 9, + "name": "BLURAY", + "order": 9, + "dividerAfter": false + } + ], + "privacy": "normal", + "isFloat": false + } + ] } ] }, @@ -11945,27 +12048,6 @@ } ] }, - { - "name": "Tigole", - "implementation": "ReleaseGroupSpecification", - "implementationName": "Release Group", - "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", - "negate": false, - "required": false, - "fields": [ - { - "order": 0, - "name": "value", - "label": "Regular Expression", - "helpText": "Custom Format RegEx is Case Insensitive", - "value": "^(Tigole)$", - "type": "textbox", - "advanced": false, - "privacy": "normal", - "isFloat": false - } - ] - }, { "name": "TIKO", "implementation": "ReleaseGroupSpecification", @@ -14011,5 +14093,896 @@ ] } ] + }, + { + "name": "HONE", + "includeCustomFormatWhenRenaming": true, + "specifications": [ + { + "name": "HONE", + "implementation": "ReleaseGroupSpecification", + "implementationName": "Release Group", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": false, + "required": true, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Regular Expression", + "helpText": "Custom Format RegEx is Case Insensitive", + "value": "(?<=^|[\\s.-])HONE\\b", + "type": "textbox", + "advanced": false, + "privacy": "normal", + "isFloat": false + } + ] + }, + { + "name": "WEB", + "implementation": "SourceSpecification", + "implementationName": "Source", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": true, + "required": true, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Source", + "value": 7, + "type": "select", + "advanced": false, + "selectOptions": [ + { + "value": 0, + "name": "UNKNOWN", + "order": 0, + "dividerAfter": false + }, + { + "value": 1, + "name": "CAM", + "order": 1, + "dividerAfter": false + }, + { + "value": 2, + "name": "TELESYNC", + "order": 2, + "dividerAfter": false + }, + { + "value": 3, + "name": "TELECINE", + "order": 3, + "dividerAfter": false + }, + { + "value": 4, + "name": "WORKPRINT", + "order": 4, + "dividerAfter": false + }, + { + "value": 5, + "name": "DVD", + "order": 5, + "dividerAfter": false + }, + { + "value": 6, + "name": "TV", + "order": 6, + "dividerAfter": false + }, + { + "value": 7, + "name": "WEBDL", + "order": 7, + "dividerAfter": false + }, + { + "value": 8, + "name": "WEBRIP", + "order": 8, + "dividerAfter": false + }, + { + "value": 9, + "name": "BLURAY", + "order": 9, + "dividerAfter": false + } + ], + "privacy": "normal", + "isFloat": false + } + ] + } + ] + }, + { + "name": "NAN0", + "includeCustomFormatWhenRenaming": false, + "specifications": [ + { + "name": "NAN0", + "implementation": "ReleaseGroupSpecification", + "implementationName": "Release Group", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": false, + "required": true, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Regular Expression", + "helpText": "Custom Format RegEx is Case Insensitive", + "value": "(?<=^|[\\s.-])NAN0\\b", + "type": "textbox", + "advanced": false, + "privacy": "normal", + "isFloat": false + } + ] + } + ] + }, + { + "name": "TimeDistortion", + "includeCustomFormatWhenRenaming": false, + "specifications": [ + { + "name": "TimeDistortion", + "implementation": "ReleaseGroupSpecification", + "implementationName": "Release Group", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": false, + "required": true, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Regular Expression", + "helpText": "Custom Format RegEx is Case Insensitive", + "value": "(?<=^|[\\s.-])TimeDistortion\\b", + "type": "textbox", + "advanced": false, + "privacy": "normal", + "isFloat": false + } + ] + } + ] + }, + { + "name": "Chivaman", + "includeCustomFormatWhenRenaming": true, + "specifications": [ + { + "name": "Chivaman", + "implementation": "ReleaseGroupSpecification", + "implementationName": "Release Group", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": false, + "required": true, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Regular Expression", + "helpText": "Custom Format RegEx is Case Insensitive", + "value": "(?<=^|[\\s.-])Chivaman\\b", + "type": "textbox", + "advanced": false, + "privacy": "normal", + "isFloat": false + } + ] + } + ] + }, + { + "name": "GRiMM", + "includeCustomFormatWhenRenaming": true, + "specifications": [ + { + "name": "GRiMM", + "implementation": "ReleaseGroupSpecification", + "implementationName": "Release Group", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": false, + "required": true, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Regular Expression", + "helpText": "Custom Format RegEx is Case Insensitive", + "value": "(?<=^|[\\s.-])GRiMM\\b", + "type": "textbox", + "advanced": false, + "privacy": "normal", + "isFloat": false + } + ] + }, + { + "name": "Bluray", + "implementation": "SourceSpecification", + "implementationName": "Source", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": false, + "required": true, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Source", + "value": 9, + "type": "select", + "advanced": false, + "selectOptions": [ + { + "value": 0, + "name": "UNKNOWN", + "order": 0, + "dividerAfter": false + }, + { + "value": 1, + "name": "CAM", + "order": 1, + "dividerAfter": false + }, + { + "value": 2, + "name": "TELESYNC", + "order": 2, + "dividerAfter": false + }, + { + "value": 3, + "name": "TELECINE", + "order": 3, + "dividerAfter": false + }, + { + "value": 4, + "name": "WORKPRINT", + "order": 4, + "dividerAfter": false + }, + { + "value": 5, + "name": "DVD", + "order": 5, + "dividerAfter": false + }, + { + "value": 6, + "name": "TV", + "order": 6, + "dividerAfter": false + }, + { + "value": 7, + "name": "WEBDL", + "order": 7, + "dividerAfter": false + }, + { + "value": 8, + "name": "WEBRIP", + "order": 8, + "dividerAfter": false + }, + { + "value": 9, + "name": "BLURAY", + "order": 9, + "dividerAfter": false + } + ], + "privacy": "normal", + "isFloat": false + } + ] + } + ] + }, + { + "name": "TAoE", + "includeCustomFormatWhenRenaming": true, + "specifications": [ + { + "name": "TAoE", + "implementation": "ReleaseTitleSpecification", + "implementationName": "Release Title", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": false, + "required": false, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Regular Expression", + "helpText": "Custom Format RegEx is Case Insensitive", + "value": "TAoE", + "type": "textbox", + "advanced": false, + "privacy": "normal", + "isFloat": false + } + ] + } + ] + }, + { + "name": "Vyndros", + "includeCustomFormatWhenRenaming": true, + "specifications": [ + { + "name": "Vyndros", + "implementation": "ReleaseGroupSpecification", + "implementationName": "Release Group", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": false, + "required": true, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Regular Expression", + "helpText": "Custom Format RegEx is Case Insensitive", + "value": "(?<=^|[\\s.-])Vyndros\\b", + "type": "textbox", + "advanced": false, + "privacy": "normal", + "isFloat": false + } + ] + } + ] + }, + { + "name": "Ralphy", + "includeCustomFormatWhenRenaming": true, + "specifications": [ + { + "name": "Ralphy", + "implementation": "ReleaseGroupSpecification", + "implementationName": "Release Group", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": false, + "required": true, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Regular Expression", + "helpText": "Custom Format RegEx is Case Insensitive", + "value": "(?<=^|[\\s.-])Ralphy\\b", + "type": "textbox", + "advanced": false, + "privacy": "normal", + "isFloat": false + } + ] + } + ] + }, + { + "name": "QxR", + "includeCustomFormatWhenRenaming": true, + "specifications": [ + { + "name": "QxR", + "implementation": "ReleaseTitleSpecification", + "implementationName": "Release Title", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": false, + "required": true, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Regular Expression", + "helpText": "Custom Format RegEx is Case Insensitive", + "value": "(?<=^|[\\s.-])QxR\\b", + "type": "textbox", + "advanced": false, + "privacy": "normal", + "isFloat": false + } + ] + } + ] + }, + { + "name": "R1GY3B / B3YG1R", + "includeCustomFormatWhenRenaming": true, + "specifications": [ + { + "name": "R1GY3B / B3YG1R", + "implementation": "ReleaseGroupSpecification", + "implementationName": "Release Group", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": false, + "required": true, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Regular Expression", + "helpText": "Custom Format RegEx is Case Insensitive", + "value": "(?<=^|[\\s.-])(R1GY3B|B3YG1R)\\b", + "type": "textbox", + "advanced": false, + "privacy": "normal", + "isFloat": false + } + ] + } + ] + }, + { + "name": "dkore", + "includeCustomFormatWhenRenaming": true, + "specifications": [ + { + "name": "dkore", + "implementation": "ReleaseGroupSpecification", + "implementationName": "Release Group", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": false, + "required": true, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Regular Expression", + "helpText": "Custom Format RegEx is Case Insensitive", + "value": "(?<=^|[\\s.-])dkore\\b", + "type": "textbox", + "advanced": false, + "privacy": "normal", + "isFloat": false + } + ] + } + ] + }, + { + "name": "AnoZu", + "includeCustomFormatWhenRenaming": true, + "specifications": [ + { + "name": "AnoZu", + "implementation": "ReleaseTitleSpecification", + "implementationName": "Release Title", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": false, + "required": true, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Regular Expression", + "helpText": "Custom Format RegEx is Case Insensitive", + "value": "(?<=^|[\\s.-])AnoZu\\b", + "type": "textbox", + "advanced": false, + "privacy": "normal", + "isFloat": false + } + ] + } + ] + }, + { + "name": "LSt", + "includeCustomFormatWhenRenaming": false, + "specifications": [ + { + "name": "LSt", + "implementation": "ReleaseGroupSpecification", + "implementationName": "Release Group", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": false, + "required": true, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Regular Expression", + "helpText": "Custom Format RegEx is Case Insensitive", + "value": "(?<=^|[\\s.-])LSt\\b", + "type": "textbox", + "advanced": false, + "privacy": "normal", + "isFloat": false + } + ] + } + ] + }, + { + "name": "SEV", + "includeCustomFormatWhenRenaming": false, + "specifications": [ + { + "name": "SEV", + "implementation": "ReleaseGroupSpecification", + "implementationName": "Release Group", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": false, + "required": true, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Regular Expression", + "helpText": "Custom Format RegEx is Case Insensitive", + "value": "(?<=^|[\\s.-])SEV\\b", + "type": "textbox", + "advanced": false, + "privacy": "normal", + "isFloat": false + } + ] + } + ] + }, + { + "name": "LEGi0N (x265)", + "includeCustomFormatWhenRenaming": true, + "specifications": [ + { + "name": "LEGi0N", + "implementation": "ReleaseGroupSpecification", + "implementationName": "Release Group", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": false, + "required": true, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Regular Expression", + "helpText": "Custom Format RegEx is Case Insensitive", + "value": "(?<=^|[\\s.-])LEGi0N\\b", + "type": "textbox", + "advanced": false, + "privacy": "normal", + "isFloat": false + } + ] + }, + { + "name": "x265", + "implementation": "ReleaseTitleSpecification", + "implementationName": "Release Title", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": false, + "required": true, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Regular Expression", + "helpText": "Custom Format RegEx is Case Insensitive", + "value": "^(?!.*(?i:remux)).*([x]\\s?(\\.?265))", + "type": "textbox", + "advanced": false, + "privacy": "normal", + "isFloat": false + } + ] + } + ] + }, + { + "name": "MainFrame", + "includeCustomFormatWhenRenaming": false, + "specifications": [ + { + "name": "MainFrame", + "implementation": "ReleaseGroupSpecification", + "implementationName": "Release Group", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": false, + "required": true, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Regular Expression", + "helpText": "Custom Format RegEx is Case Insensitive", + "value": "(?<=^|[\\s.-])MainFrame\\b", + "type": "textbox", + "advanced": false, + "privacy": "normal", + "isFloat": false + } + ] + } + ] + }, + { + "name": "x265 (Web)", + "includeCustomFormatWhenRenaming": false, + "specifications": [ + { + "name": "x265", + "implementation": "ReleaseTitleSpecification", + "implementationName": "Release Title", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": false, + "required": true, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Regular Expression", + "helpText": "Custom Format RegEx is Case Insensitive", + "value": "^(?!.*(?i:remux)).*([x]\\s?(\\.?265))", + "type": "textbox", + "advanced": false, + "privacy": "normal", + "isFloat": false + } + ] + }, + { + "name": "Disc", + "implementation": "ReleaseTitleSpecification", + "implementationName": "Release Title", + "infoLink": "https://wiki.servarr.com/radarr/settings#custom-formats-2", + "negate": true, + "required": true, + "fields": [ + { + "order": 0, + "name": "value", + "label": "Regular Expression", + "helpText": "Custom Format RegEx is Case Insensitive", + "value": "^(?!.*\\b((?