From f56bb7e40e0dc96d3f383493fa0356fc2a69019f Mon Sep 17 00:00:00 2001 From: nuxen Date: Thu, 25 Aug 2022 01:24:20 +0200 Subject: [PATCH 01/18] Fixed: `E-AC3` detection again Added word boundaries to the `Dolby Digital Plus` Conditions. --- docs/json/radarr/cf/aac.json | 2 +- docs/json/radarr/cf/atmos-undefined.json | 2 +- docs/json/radarr/cf/dd.json | 2 +- docs/json/radarr/cf/ddplus-atmos.json | 2 +- docs/json/radarr/cf/ddplus.json | 2 +- docs/json/radarr/cf/dts-es.json | 2 +- docs/json/radarr/cf/dts-hd-hra.json | 2 +- docs/json/radarr/cf/dts-hd-ma.json | 2 +- docs/json/radarr/cf/dts-x.json | 2 +- docs/json/radarr/cf/dts.json | 2 +- docs/json/radarr/cf/flac.json | 2 +- docs/json/radarr/cf/pcm.json | 2 +- docs/json/radarr/cf/truehd-atmos.json | 2 +- docs/json/radarr/cf/truehd.json | 2 +- docs/json/sonarr/cf/aac.json | 2 +- docs/json/sonarr/cf/atmos-undefined.json | 2 +- docs/json/sonarr/cf/dd.json | 2 +- docs/json/sonarr/cf/ddplus-atmos.json | 2 +- docs/json/sonarr/cf/ddplus.json | 2 +- docs/json/sonarr/cf/dts-es.json | 2 +- docs/json/sonarr/cf/dts-hd-hra.json | 2 +- docs/json/sonarr/cf/dts-hd-ma.json | 2 +- docs/json/sonarr/cf/dts-x.json | 2 +- docs/json/sonarr/cf/dts.json | 2 +- docs/json/sonarr/cf/flac.json | 2 +- docs/json/sonarr/cf/pcm.json | 2 +- docs/json/sonarr/cf/truehd-atmos.json | 2 +- docs/json/sonarr/cf/truehd.json | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/docs/json/radarr/cf/aac.json b/docs/json/radarr/cf/aac.json index b1ea4fa6a..4ba0c1ddd 100644 --- a/docs/json/radarr/cf/aac.json +++ b/docs/json/radarr/cf/aac.json @@ -27,7 +27,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/radarr/cf/atmos-undefined.json b/docs/json/radarr/cf/atmos-undefined.json index cfa289170..4c830d7d3 100644 --- a/docs/json/radarr/cf/atmos-undefined.json +++ b/docs/json/radarr/cf/atmos-undefined.json @@ -10,7 +10,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/radarr/cf/dd.json b/docs/json/radarr/cf/dd.json index 9d0f5e738..1e2b32206 100644 --- a/docs/json/radarr/cf/dd.json +++ b/docs/json/radarr/cf/dd.json @@ -18,7 +18,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/radarr/cf/ddplus-atmos.json b/docs/json/radarr/cf/ddplus-atmos.json index 7dfed5785..9b197cbc1 100644 --- a/docs/json/radarr/cf/ddplus-atmos.json +++ b/docs/json/radarr/cf/ddplus-atmos.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/radarr/cf/ddplus.json b/docs/json/radarr/cf/ddplus.json index dda60b8a6..f7ccf9db0 100644 --- a/docs/json/radarr/cf/ddplus.json +++ b/docs/json/radarr/cf/ddplus.json @@ -9,7 +9,7 @@ "negate": false, "required": true, "fields": { - "value": "[^-]DD[P+](?!A)|e[-_. ]?ac3" + "value": "\\bDD[P+](?!A)|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/radarr/cf/dts-es.json b/docs/json/radarr/cf/dts-es.json index c098daf0c..9d10f3d54 100644 --- a/docs/json/radarr/cf/dts-es.json +++ b/docs/json/radarr/cf/dts-es.json @@ -27,7 +27,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/radarr/cf/dts-hd-hra.json b/docs/json/radarr/cf/dts-hd-hra.json index 75ec8a8dc..a6341dd30 100644 --- a/docs/json/radarr/cf/dts-hd-hra.json +++ b/docs/json/radarr/cf/dts-hd-hra.json @@ -27,7 +27,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/radarr/cf/dts-hd-ma.json b/docs/json/radarr/cf/dts-hd-ma.json index 04f20caa5..0a48f8c67 100644 --- a/docs/json/radarr/cf/dts-hd-ma.json +++ b/docs/json/radarr/cf/dts-hd-ma.json @@ -28,7 +28,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/radarr/cf/dts-x.json b/docs/json/radarr/cf/dts-x.json index b357aab5e..0aac2423c 100644 --- a/docs/json/radarr/cf/dts-x.json +++ b/docs/json/radarr/cf/dts-x.json @@ -36,7 +36,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/radarr/cf/dts.json b/docs/json/radarr/cf/dts.json index 22267cce1..7a55b9112 100644 --- a/docs/json/radarr/cf/dts.json +++ b/docs/json/radarr/cf/dts.json @@ -36,7 +36,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/radarr/cf/flac.json b/docs/json/radarr/cf/flac.json index e274a43b2..d15824569 100644 --- a/docs/json/radarr/cf/flac.json +++ b/docs/json/radarr/cf/flac.json @@ -63,7 +63,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } } ] diff --git a/docs/json/radarr/cf/pcm.json b/docs/json/radarr/cf/pcm.json index 546e2195d..12c3e4c3d 100644 --- a/docs/json/radarr/cf/pcm.json +++ b/docs/json/radarr/cf/pcm.json @@ -63,7 +63,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } } ] diff --git a/docs/json/radarr/cf/truehd-atmos.json b/docs/json/radarr/cf/truehd-atmos.json index 077d618a0..68e6b79ca 100644 --- a/docs/json/radarr/cf/truehd-atmos.json +++ b/docs/json/radarr/cf/truehd-atmos.json @@ -28,7 +28,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/radarr/cf/truehd.json b/docs/json/radarr/cf/truehd.json index 7d3618ac5..5e9a6e7c4 100644 --- a/docs/json/radarr/cf/truehd.json +++ b/docs/json/radarr/cf/truehd.json @@ -28,7 +28,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/sonarr/cf/aac.json b/docs/json/sonarr/cf/aac.json index a10d49918..2f18afee6 100644 --- a/docs/json/sonarr/cf/aac.json +++ b/docs/json/sonarr/cf/aac.json @@ -27,7 +27,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/sonarr/cf/atmos-undefined.json b/docs/json/sonarr/cf/atmos-undefined.json index 96dab5335..a6295ae2c 100644 --- a/docs/json/sonarr/cf/atmos-undefined.json +++ b/docs/json/sonarr/cf/atmos-undefined.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/sonarr/cf/dd.json b/docs/json/sonarr/cf/dd.json index 2e1febf61..f829dc144 100644 --- a/docs/json/sonarr/cf/dd.json +++ b/docs/json/sonarr/cf/dd.json @@ -18,7 +18,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/sonarr/cf/ddplus-atmos.json b/docs/json/sonarr/cf/ddplus-atmos.json index db9112e67..e92c07cbe 100644 --- a/docs/json/sonarr/cf/ddplus-atmos.json +++ b/docs/json/sonarr/cf/ddplus-atmos.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/sonarr/cf/ddplus.json b/docs/json/sonarr/cf/ddplus.json index ead6567e0..71ae1118f 100644 --- a/docs/json/sonarr/cf/ddplus.json +++ b/docs/json/sonarr/cf/ddplus.json @@ -9,7 +9,7 @@ "negate": false, "required": true, "fields": { - "value": "[^-]DD[P+](?!A)|e[-_. ]?ac3" + "value": "\\bDD[P+](?!A)|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/sonarr/cf/dts-es.json b/docs/json/sonarr/cf/dts-es.json index b1de9dd63..1e3c5b011 100644 --- a/docs/json/sonarr/cf/dts-es.json +++ b/docs/json/sonarr/cf/dts-es.json @@ -27,7 +27,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/sonarr/cf/dts-hd-hra.json b/docs/json/sonarr/cf/dts-hd-hra.json index 9551d7a87..325eeac31 100644 --- a/docs/json/sonarr/cf/dts-hd-hra.json +++ b/docs/json/sonarr/cf/dts-hd-hra.json @@ -27,7 +27,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/sonarr/cf/dts-hd-ma.json b/docs/json/sonarr/cf/dts-hd-ma.json index f37a99eb2..ff473fafe 100644 --- a/docs/json/sonarr/cf/dts-hd-ma.json +++ b/docs/json/sonarr/cf/dts-hd-ma.json @@ -28,7 +28,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/sonarr/cf/dts-x.json b/docs/json/sonarr/cf/dts-x.json index 4c903f83c..4e63ca069 100644 --- a/docs/json/sonarr/cf/dts-x.json +++ b/docs/json/sonarr/cf/dts-x.json @@ -36,7 +36,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/sonarr/cf/dts.json b/docs/json/sonarr/cf/dts.json index eab497030..b1f6d41d2 100644 --- a/docs/json/sonarr/cf/dts.json +++ b/docs/json/sonarr/cf/dts.json @@ -36,7 +36,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/sonarr/cf/flac.json b/docs/json/sonarr/cf/flac.json index e2cca2711..7a0194002 100644 --- a/docs/json/sonarr/cf/flac.json +++ b/docs/json/sonarr/cf/flac.json @@ -63,7 +63,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } } ] diff --git a/docs/json/sonarr/cf/pcm.json b/docs/json/sonarr/cf/pcm.json index 3aba591b7..c9602e14f 100644 --- a/docs/json/sonarr/cf/pcm.json +++ b/docs/json/sonarr/cf/pcm.json @@ -63,7 +63,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } } ] diff --git a/docs/json/sonarr/cf/truehd-atmos.json b/docs/json/sonarr/cf/truehd-atmos.json index 7eeaeaeb2..b9fdccead 100644 --- a/docs/json/sonarr/cf/truehd-atmos.json +++ b/docs/json/sonarr/cf/truehd-atmos.json @@ -28,7 +28,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } }, { diff --git a/docs/json/sonarr/cf/truehd.json b/docs/json/sonarr/cf/truehd.json index 2a0a30ea7..3c45d89a5 100644 --- a/docs/json/sonarr/cf/truehd.json +++ b/docs/json/sonarr/cf/truehd.json @@ -28,7 +28,7 @@ "negate": true, "required": true, "fields": { - "value": "[^-]DD[P+]|e[-_. ]?ac3" + "value": "\\bDD[P+]|\\b(e[-_. ]?ac3)\\b" } }, { From 0e4572bcc96d7ac59d8ef772966f8aa89d38b112 Mon Sep 17 00:00:00 2001 From: ItsME6969 <89707006+ItsME6969@users.noreply.github.com> Date: Wed, 24 Aug 2022 23:10:01 -0700 Subject: [PATCH 02/18] Update br-disk.json Fixed: 1080p HEVC encodes --- docs/json/radarr/cf/br-disk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/json/radarr/cf/br-disk.json b/docs/json/radarr/cf/br-disk.json index 18471c092..9e9c4ef6d 100644 --- a/docs/json/radarr/cf/br-disk.json +++ b/docs/json/radarr/cf/br-disk.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?!.*\\b((? Date: Wed, 24 Aug 2022 23:19:50 -0700 Subject: [PATCH 03/18] Update br-disk.json --- docs/json/radarr/cf/br-disk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/json/radarr/cf/br-disk.json b/docs/json/radarr/cf/br-disk.json index 9e9c4ef6d..965f3472c 100644 --- a/docs/json/radarr/cf/br-disk.json +++ b/docs/json/radarr/cf/br-disk.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?!.*\\b((? Date: Thu, 25 Aug 2022 17:47:45 +0200 Subject: [PATCH 04/18] Added: `MZABI` to `HQ-WEBDL` and `WEB Tier 02` Added `MZABI` to both the `HQ-WEBDL` and `WEB Tier 02` CF according to the spreadsheet. --- docs/json/radarr/cf/hq-webdl.json | 9 +++++++++ docs/json/radarr/cf/web-tier-02.json | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/docs/json/radarr/cf/hq-webdl.json b/docs/json/radarr/cf/hq-webdl.json index ae2ba425d..fa9be5d18 100644 --- a/docs/json/radarr/cf/hq-webdl.json +++ b/docs/json/radarr/cf/hq-webdl.json @@ -157,6 +157,15 @@ "value": "\\bmonkee\\b" } }, + { + "name": "MZABI", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\bMZABI\\b" + } + }, { "name": "NOSiViD", "implementation": "ReleaseTitleSpecification", diff --git a/docs/json/radarr/cf/web-tier-02.json b/docs/json/radarr/cf/web-tier-02.json index f0393e72b..d4f03f0c9 100644 --- a/docs/json/radarr/cf/web-tier-02.json +++ b/docs/json/radarr/cf/web-tier-02.json @@ -58,6 +58,15 @@ "value": "\\b(monkee)\\b" } }, + { + "name": "MZABI", + "implementation": "ReleaseGroupSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(MZABI)\\b" + } + }, { "name": "PHOENiX", "implementation": "ReleaseGroupSpecification", From 881466aac3c34f5aa99e222fbb3efc2aaea0c9b1 Mon Sep 17 00:00:00 2001 From: nuxen Date: Thu, 25 Aug 2022 21:46:23 +0200 Subject: [PATCH 05/18] Fixed: `DV` with other metadata Fixed combinations of `DV` with `SDR` and `HLG`. --- docs/json/radarr/cf/dv-hdr10.json | 4 ++-- docs/json/radarr/cf/dv-hlg.json | 6 +++--- docs/json/radarr/cf/dv-sdr.json | 4 ++-- docs/json/radarr/cf/dv.json | 4 ++-- docs/json/sonarr/cf/dv-hdr10.json | 4 ++-- docs/json/sonarr/cf/dv-hlg.json | 6 +++--- docs/json/sonarr/cf/dv-sdr.json | 4 ++-- docs/json/sonarr/cf/dv.json | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/json/radarr/cf/dv-hdr10.json b/docs/json/radarr/cf/dv-hdr10.json index 1b7d8153a..23585f329 100644 --- a/docs/json/radarr/cf/dv-hdr10.json +++ b/docs/json/radarr/cf/dv-hdr10.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(DV[ ]HLG)\\b" + "value": "\\b(DV[ .]HLG)\\b" } }, { @@ -28,7 +28,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(DV[ ]SDR)\\b" + "value": "\\b(DV[ .]SDR)\\b" } } ] diff --git a/docs/json/radarr/cf/dv-hlg.json b/docs/json/radarr/cf/dv-hlg.json index 1a2c69450..486edd28b 100644 --- a/docs/json/radarr/cf/dv-hlg.json +++ b/docs/json/radarr/cf/dv-hlg.json @@ -10,11 +10,11 @@ "negate": false, "required": true, "fields": { - "value": "\\b(DV[ ]HLG)\\b" + "value": "\\b(DV[ .]HLG)\\b" } }, { - "name": "not DV HDR10", + "name": "Not DV HDR10", "implementation": "ReleaseTitleSpecification", "negate": true, "required": true, @@ -28,7 +28,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(DV[ ]SDR)\\b" + "value": "\\b(DV[ .]SDR)\\b" } } ] diff --git a/docs/json/radarr/cf/dv-sdr.json b/docs/json/radarr/cf/dv-sdr.json index 295a1cd23..aeecdeb69 100644 --- a/docs/json/radarr/cf/dv-sdr.json +++ b/docs/json/radarr/cf/dv-sdr.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\b(DV[ ]SDR)\\b" + "value": "\\b(DV[ .]SDR)\\b" } }, { @@ -28,7 +28,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(DV[ ]HLG)\\b" + "value": "\\b(DV[ .]HLG)\\b" } } ] diff --git a/docs/json/radarr/cf/dv.json b/docs/json/radarr/cf/dv.json index e94240f1a..bc9784fe5 100644 --- a/docs/json/radarr/cf/dv.json +++ b/docs/json/radarr/cf/dv.json @@ -28,7 +28,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(DV[ ]HLG)\\b" + "value": "\\b(DV[ .]HLG)\\b" } }, { @@ -37,7 +37,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(DV[ ]SDR)\\b" + "value": "\\b(DV[ .]SDR)\\b" } } ] diff --git a/docs/json/sonarr/cf/dv-hdr10.json b/docs/json/sonarr/cf/dv-hdr10.json index d91a5de7c..cfa22f045 100644 --- a/docs/json/sonarr/cf/dv-hdr10.json +++ b/docs/json/sonarr/cf/dv-hdr10.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(DV[ ]HLG)\\b" + "value": "\\b(DV[ .]HLG)\\b" } }, { @@ -28,7 +28,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(DV[ ]SDR)\\b" + "value": "\\b(DV[ .]SDR)\\b" } } ] diff --git a/docs/json/sonarr/cf/dv-hlg.json b/docs/json/sonarr/cf/dv-hlg.json index 4fbc45628..7a931c664 100644 --- a/docs/json/sonarr/cf/dv-hlg.json +++ b/docs/json/sonarr/cf/dv-hlg.json @@ -10,11 +10,11 @@ "negate": false, "required": true, "fields": { - "value": "\\b(DV[ ]HLG)\\b" + "value": "\\b(DV[ .]HLG)\\b" } }, { - "name": "not DV HDR10", + "name": "Not DV HDR10", "implementation": "ReleaseTitleSpecification", "negate": true, "required": true, @@ -28,7 +28,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(DV[ ]SDR)\\b" + "value": "\\b(DV[ .]SDR)\\b" } } ] diff --git a/docs/json/sonarr/cf/dv-sdr.json b/docs/json/sonarr/cf/dv-sdr.json index 3d1ab8698..95e1cd3a1 100644 --- a/docs/json/sonarr/cf/dv-sdr.json +++ b/docs/json/sonarr/cf/dv-sdr.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\b(DV[ ]SDR)\\b" + "value": "\\b(DV[ .]SDR)\\b" } }, { @@ -28,7 +28,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(DV[ ]HLG)\\b" + "value": "\\b(DV[ .]HLG)\\b" } } ] diff --git a/docs/json/sonarr/cf/dv.json b/docs/json/sonarr/cf/dv.json index e1166badc..3ce658bbf 100644 --- a/docs/json/sonarr/cf/dv.json +++ b/docs/json/sonarr/cf/dv.json @@ -28,7 +28,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(DV[ ]HLG)\\b" + "value": "\\b(DV[ .]HLG)\\b" } }, { @@ -37,7 +37,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(DV[ ]SDR)\\b" + "value": "\\b(DV[ .]SDR)\\b" } } ] From 8e42d6dc20ee65db5372a04f43664a7f55b9b592 Mon Sep 17 00:00:00 2001 From: nuxen Date: Thu, 25 Aug 2022 22:01:33 +0200 Subject: [PATCH 06/18] Fixed: `DV HDR10` to be more flexible changed the regex for all `DV HDR10` conditions to be more flexible. --- docs/json/radarr/cf/dv-hdr10.json | 2 +- docs/json/radarr/cf/dv-hlg.json | 2 +- docs/json/radarr/cf/dv-sdr.json | 2 +- docs/json/radarr/cf/dv.json | 2 +- docs/json/radarr/cf/hdr10.json | 2 +- docs/json/radarr/cf/hdr10plus.json | 2 +- docs/json/sonarr/cf/dv-hdr10.json | 2 +- docs/json/sonarr/cf/dv-hlg.json | 2 +- docs/json/sonarr/cf/dv-sdr.json | 2 +- docs/json/sonarr/cf/dv.json | 2 +- docs/json/sonarr/cf/hdr10.json | 2 +- docs/json/sonarr/cf/hdr10plus.json | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/json/radarr/cf/dv-hdr10.json b/docs/json/radarr/cf/dv-hdr10.json index 23585f329..76d4757bc 100644 --- a/docs/json/radarr/cf/dv-hdr10.json +++ b/docs/json/radarr/cf/dv-hdr10.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\b(DV[ .]HDR10|HDR10[ .]DV)\\b" + "value": "^(?=.*\\b(HDR(10)?)\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/radarr/cf/dv-hlg.json b/docs/json/radarr/cf/dv-hlg.json index 486edd28b..8c125f5e5 100644 --- a/docs/json/radarr/cf/dv-hlg.json +++ b/docs/json/radarr/cf/dv-hlg.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(DV[ .]HDR10|HDR10[ .]DV)\\b" + "value": "^(?=.*\\b(HDR(10)?)\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/radarr/cf/dv-sdr.json b/docs/json/radarr/cf/dv-sdr.json index aeecdeb69..0ddcbff83 100644 --- a/docs/json/radarr/cf/dv-sdr.json +++ b/docs/json/radarr/cf/dv-sdr.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(DV[ .]HDR10|HDR10[ .]DV)\\b" + "value": "^(?=.*\\b(HDR(10)?)\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/radarr/cf/dv.json b/docs/json/radarr/cf/dv.json index bc9784fe5..e40114b78 100644 --- a/docs/json/radarr/cf/dv.json +++ b/docs/json/radarr/cf/dv.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(DV[ .]HDR10|HDR10[ .]DV)\\b" + "value": "^(?=.*\\b(HDR(10)?)\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/radarr/cf/hdr10.json b/docs/json/radarr/cf/hdr10.json index a260bad50..8cf747936 100644 --- a/docs/json/radarr/cf/hdr10.json +++ b/docs/json/radarr/cf/hdr10.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(DV[ .]HDR10|HDR10[ .]DV)\\b" + "value": "^(?=.*\\b(HDR(10)?)\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/radarr/cf/hdr10plus.json b/docs/json/radarr/cf/hdr10plus.json index f2cba80ec..41d514e81 100644 --- a/docs/json/radarr/cf/hdr10plus.json +++ b/docs/json/radarr/cf/hdr10plus.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(DV[ .]HDR10|HDR10[ .]DV)\\b" + "value": "^(?=.*\\b(HDR(10)?)\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/sonarr/cf/dv-hdr10.json b/docs/json/sonarr/cf/dv-hdr10.json index cfa22f045..cc7fe08e1 100644 --- a/docs/json/sonarr/cf/dv-hdr10.json +++ b/docs/json/sonarr/cf/dv-hdr10.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\b(DV[ .]HDR10|HDR10[ .]DV)\\b" + "value": "^(?=.*\\b(HDR(10)?)\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/sonarr/cf/dv-hlg.json b/docs/json/sonarr/cf/dv-hlg.json index 7a931c664..9502f5024 100644 --- a/docs/json/sonarr/cf/dv-hlg.json +++ b/docs/json/sonarr/cf/dv-hlg.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(DV[ .]HDR10|HDR10[ .]DV)\\b" + "value": "^(?=.*\\b(HDR(10)?)\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/sonarr/cf/dv-sdr.json b/docs/json/sonarr/cf/dv-sdr.json index 95e1cd3a1..52e766b6e 100644 --- a/docs/json/sonarr/cf/dv-sdr.json +++ b/docs/json/sonarr/cf/dv-sdr.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(DV[ .]HDR10|HDR10[ .]DV)\\b" + "value": "^(?=.*\\b(HDR(10)?)\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/sonarr/cf/dv.json b/docs/json/sonarr/cf/dv.json index 3ce658bbf..4571f3a94 100644 --- a/docs/json/sonarr/cf/dv.json +++ b/docs/json/sonarr/cf/dv.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(DV[ .]HDR10|HDR10[ .]DV)\\b" + "value": "^(?=.*\\b(HDR(10)?)\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/sonarr/cf/hdr10.json b/docs/json/sonarr/cf/hdr10.json index dce8aef92..5c1a366c1 100644 --- a/docs/json/sonarr/cf/hdr10.json +++ b/docs/json/sonarr/cf/hdr10.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(DV[ .]HDR10|HDR10[ .]DV)\\b" + "value": "^(?=.*\\b(HDR(10)?)\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { diff --git a/docs/json/sonarr/cf/hdr10plus.json b/docs/json/sonarr/cf/hdr10plus.json index 4348c8866..0c3b8f8d0 100644 --- a/docs/json/sonarr/cf/hdr10plus.json +++ b/docs/json/sonarr/cf/hdr10plus.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(DV[ .]HDR10|HDR10[ .]DV)\\b" + "value": "^(?=.*\\b(HDR(10)?)\\b)(?=.*\\b(DV|DoVi)\\b)" } }, { From cd04244dc884151038de1f85bf0db848a1c93380 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Thu, 25 Aug 2022 22:02:54 +0200 Subject: [PATCH 07/18] Added: regex test case info - Added: regex test case info, from now on when updating or adding a new CF the test case url needs to be added to the json. --- .github/CONTRIBUTING.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 1068b9997..8a64dc171 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -22,6 +22,22 @@ These are mostly guidelines, not rules. Use your best judgment, and feel free to - When adding the hashcode for Sonarr Anime use the following naming `Sonarr Anime CF_name` on the following [link+example](https://md5.gromweb.com/?string=Sonarr+Anime+BR-DISK). - Provide a link to your regex example of your Custom Format using the following [Template](https://regex101.com/r/fXmQQm/1). +When adding a regex test case +- Replace the actual movie name with `Movie`. +- Replace the actual series name with `Series`. +- Remove the actual Series title. +- Replace the actual group name with `RlsGrp` + +When updating or adding a new CF the test case url needs to be added to the json. + +```json +{ + "trash_id": "hashcode", + "trash_score": "score", + "trash_regex": "https://regex101.com/r/pADWJD/5", + "name": "CF_name", +``` + ## Recommendations - use [VSCode](https://code.visualstudio.com/) for editing with the following extension [markdownlint](https://marketplace.visualstudio.com/items?itemName=DavidAnson.vscode-markdownlint) From 32c0ad66466e329feaaeffcacd65928c1ac3e067 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Thu, 25 Aug 2022 22:05:26 +0200 Subject: [PATCH 08/18] Fix: MD032 --- .github/CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 8a64dc171..404ceac4f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -23,6 +23,7 @@ These are mostly guidelines, not rules. Use your best judgment, and feel free to - Provide a link to your regex example of your Custom Format using the following [Template](https://regex101.com/r/fXmQQm/1). When adding a regex test case + - Replace the actual movie name with `Movie`. - Replace the actual series name with `Series`. - Remove the actual Series title. From 7f9b3c35d7ad49358874ead6b510403313c71e00 Mon Sep 17 00:00:00 2001 From: nuxen Date: Thu, 25 Aug 2022 22:12:18 +0200 Subject: [PATCH 09/18] Added: `playWEB` to `HQ-WEBDL` and `WEB Tier 02` Added `playWEB` to both the `HQ-WEBDL` and `WEB Tier 02` CF according to the spreadsheet. --- docs/json/radarr/cf/hq-webdl.json | 9 +++++++++ docs/json/radarr/cf/web-tier-02.json | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/docs/json/radarr/cf/hq-webdl.json b/docs/json/radarr/cf/hq-webdl.json index fa9be5d18..d7c64f441 100644 --- a/docs/json/radarr/cf/hq-webdl.json +++ b/docs/json/radarr/cf/hq-webdl.json @@ -202,6 +202,15 @@ "value": "-PHOENiX\\b" } }, + { + "name": "playWEB", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\bplayWEB\\b" + } + }, { "name": "ROCCaT", "implementation": "ReleaseTitleSpecification", diff --git a/docs/json/radarr/cf/web-tier-02.json b/docs/json/radarr/cf/web-tier-02.json index d4f03f0c9..de2a64e05 100644 --- a/docs/json/radarr/cf/web-tier-02.json +++ b/docs/json/radarr/cf/web-tier-02.json @@ -76,6 +76,15 @@ "value": "\\b(PHOENiX)\\b" } }, + { + "name": "playWEB", + "implementation": "ReleaseGroupSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(playWEB)\\b" + } + }, { "name": "SMURF", "implementation": "ReleaseGroupSpecification", From bc08662cd2489cc813428b2470a1663b7c38cf32 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Thu, 25 Aug 2022 22:50:11 +0200 Subject: [PATCH 10/18] Added: Own Score warning - Added: Own Score warning --- includes/cf/score-attention.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 includes/cf/score-attention.md diff --git a/includes/cf/score-attention.md b/includes/cf/score-attention.md new file mode 100644 index 000000000..c4b548046 --- /dev/null +++ b/includes/cf/score-attention.md @@ -0,0 +1,8 @@ +!!! attention "Attention" + All the used scores and combination of Custom Formats in this Guide are tested to get the desired results and prevent download loops as much as possible. + + From experience most of the time when people change scores or leave out certain CF that work together they end up with undesired results. + + If you're unsure or have questions do not hesitate to ask for help on Discord + + [![Discord chat](https://img.shields.io/discord/492590071455940612?style=for-the-badge&color=4051B5&logo=discord)](https://trash-guides.info/discord){:target="_blank" rel="noopener noreferrer"} From 384e33fa3b7c366240ec2c7329868b1985381deb Mon Sep 17 00:00:00 2001 From: TRaSH Date: Thu, 25 Aug 2022 22:54:09 +0200 Subject: [PATCH 11/18] Added: Hint for setups that doesn't support DV - Added: Hint If you have a setup that doesn't support Dolby Vision --- includes/cf/hdr-metadata.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/includes/cf/hdr-metadata.md b/includes/cf/hdr-metadata.md index 76e7b0468..880ab89d3 100644 --- a/includes/cf/hdr-metadata.md +++ b/includes/cf/hdr-metadata.md @@ -11,3 +11,6 @@ | [{{ radarr['cf']['hdr-undefined']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hdr-undefined) | {{ radarr['cf']['hdr-undefined']['trash_score'] }} | {{ radarr['cf']['hdr-undefined']['trash_id'] }} | | [{{ radarr['cf']['pq']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#pq) | {{ radarr['cf']['pq']['trash_score'] }} | {{ radarr['cf']['pq']['trash_id'] }} | | [{{ radarr['cf']['hlg']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hlg) | {{ radarr['cf']['hlg']['trash_score'] }} | {{ radarr['cf']['hlg']['trash_id'] }} | + + !!! hint + If you (or family members you share your collection with) have a setup that doesn't support Dolby Vision then it's best to add **ALL** the HDR Metadata even the ones with DV in it, and then make sure you make use of the [{{ radarr['cf']['dv-webdl']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#dv-webdl) Custom Format with a score of {{ radarr['cf']['dv-webdl']['trash_score'] }} From 786d3f3d114cd1a60726f8a5d6bd17e2d53be22a Mon Sep 17 00:00:00 2001 From: TRaSH Date: Thu, 25 Aug 2022 22:55:52 +0200 Subject: [PATCH 12/18] Added: optional message to the unwanted list - Added: optional message to the unwanted list --- includes/cf/unwanted.md | 54 ++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 20 deletions(-) diff --git a/includes/cf/unwanted.md b/includes/cf/unwanted.md index ad32932e2..5f1e22056 100644 --- a/includes/cf/unwanted.md +++ b/includes/cf/unwanted.md @@ -1,28 +1,42 @@ ??? summary "Unwanted - [CLICK TO EXPAND]" - | Custom Format | Score | Trash ID | - | ------------------------------------------------------------------------------------------------------- | ---------------------------------------------- | ------------------------------------------- | - | [{{ radarr['cf']['br-disk']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#br-disk) | {{ radarr['cf']['br-disk']['trash_score'] }} | {{ radarr['cf']['br-disk']['trash_id'] }} | - | [{{ radarr['cf']['evo-no-webdl']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#evo-no-webdl) | {{ radarr['cf']['evo-no-webdl']['trash_score'] }} | {{ radarr['cf']['evo-no-webdl']['trash_id'] }} | - | [{{ radarr['cf']['lq']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#lq) | {{ radarr['cf']['lq']['trash_score'] }} | {{ radarr['cf']['lq']['trash_id'] }} | - | [{{ radarr['cf']['x265-7201080p']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-7201080p) | {{ radarr['cf']['x265-7201080p']['trash_score'] }} | {{ radarr['cf']['x265-7201080p']['trash_id'] }} | - | [{{ radarr['cf']['3d']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#3d) | {{ radarr['cf']['3d']['trash_score'] }} | {{ radarr['cf']['3d']['trash_id'] }} | - | [{{ radarr['cf']['no-rlsgroup']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#no-rlsgroup) | {{ radarr['cf']['no-rlsgroup']['trash_score'] }} | {{ radarr['cf']['no-rlsgroup']['trash_id'] }} | - | [{{ radarr['cf']['obfuscated']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#obfuscated) | {{ radarr['cf']['obfuscated']['trash_score'] }} | {{ radarr['cf']['obfuscated']['trash_id'] }} | - | [{{ radarr['cf']['retags']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#retags) | {{ radarr['cf']['retags']['trash_score'] }} | {{ radarr['cf']['retags']['trash_id'] }} | - | [{{ radarr['cf']['bad-dual-groups']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#bad-dual-groups) | {{ radarr['cf']['bad-dual-groups']['trash_score'] }} | {{ radarr['cf']['bad-dual-groups']['trash_id'] }} | - | [{{ radarr['cf']['dv-webdl']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#dv-webdl) | ?????? | {{ radarr['cf']['dv-webdl']['trash_id'] }} | - - ??? example "Breakdown and Why - [CLICK TO EXPAND]" + | Custom Format | Score | Trash ID | + | -------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------- | ------------------------------------------------- | + | [{{ radarr['cf']['br-disk']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#br-disk) | {{ radarr['cf']['br-disk']['trash_score'] }} | {{ radarr['cf']['br-disk']['trash_id'] }} | + | [{{ radarr['cf']['evo-no-webdl']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#evo-no-webdl) | {{ radarr['cf']['evo-no-webdl']['trash_score'] }} | {{ radarr['cf']['evo-no-webdl']['trash_id'] }} | + | [{{ radarr['cf']['lq']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#lq) | {{ radarr['cf']['lq']['trash_score'] }} | {{ radarr['cf']['lq']['trash_id'] }} | + | [{{ radarr['cf']['x265-hd']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-hd) :bangbang: | {{ radarr['cf']['x265-hd']['trash_score'] }} | {{ radarr['cf']['x265-hd']['trash_id'] }} | + | [{{ radarr['cf']['x265-no-hdrdv']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-no-hdrdv) :bangbang: | {{ radarr['cf']['x265-no-hdrdv']['trash_score'] }} | {{ radarr['cf']['x265-no-hdrdv']['trash_id'] }} | + | [{{ radarr['cf']['3d']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#3d) | {{ radarr['cf']['3d']['trash_score'] }} | {{ radarr['cf']['3d']['trash_id'] }} | + | [{{ radarr['cf']['no-rlsgroup']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#no-rlsgroup) | {{ radarr['cf']['no-rlsgroup']['trash_score'] }} | {{ radarr['cf']['no-rlsgroup']['trash_id'] }} | + | [{{ radarr['cf']['obfuscated']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#obfuscated) | {{ radarr['cf']['obfuscated']['trash_score'] }} | {{ radarr['cf']['obfuscated']['trash_id'] }} | + | [{{ radarr['cf']['retags']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#retags) | {{ radarr['cf']['retags']['trash_score'] }} | {{ radarr['cf']['retags']['trash_id'] }} | + | [{{ radarr['cf']['bad-dual-groups']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#bad-dual-groups) | {{ radarr['cf']['bad-dual-groups']['trash_score'] }} | {{ radarr['cf']['bad-dual-groups']['trash_id'] }} | + | [{{ radarr['cf']['dv-webdl']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#dv-webdl) | ?????? | {{ radarr['cf']['dv-webdl']['trash_id'] }} | + + !!! example "Breakdown and Why" - **{{ radarr['cf']['br-disk']['name'] }} :** This is a custom format to help Radarr recognize & ignore BR-DISK (ISO's and Blu-ray folder structure) in addition to the standard BR-DISK quality. - **{{ radarr['cf']['evo-no-webdl']['name'] }}:** This group is often banned for the low quality Blu-ray releases, but their WEB-DL are okay. - **{{ radarr['cf']['lq']['name'] }}:** A collection of known Low Quality groups that are often banned from the the top trackers because the lack of quality or other reasons. - - **{{ radarr['cf']['x265-7201080p']['name'] }}:** This blocks/ignores 720/1080p releases that are encoded in x265 - More info [HERE](/Misc/x265-4k/){:target="_blank" rel="noopener noreferrer"}. + - **{{ radarr['cf']['x265-hd']['name'] }}:** This blocks/ignores 720/1080p releases that are encoded in x265 - More info [HERE](/Misc/x265-4k/){:target="_blank" rel="noopener noreferrer"}. + + !!! Danger "Don't use this together with the following Custom Format [{{ radarr['cf']['x265-no-hdrdv']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-no-hdrdv) :bangbang:" + + - **{{ radarr['cf']['x265-no-hdrdv']['name'] }}:** This blocks/ignores 720/1080p (HD) releases that are encoded in x265. - More info [HERE](/Misc/x265-4k/){:target="_blank" rel="noopener noreferrer"}. + + **but it will allow to exclude/bypass if it has HDR and/or DV** + + *Being that some NF releases won't be released as 4k, but you want to have DV/HDR releases.* + + In your quality profile use the following score for this Custom Format: `{{ radarr['cf']['x265-no-hdrdv']['trash_score'] }}` + + !!! Danger "Don't use this together with the following Custom Format [{{ radarr['cf']['x265-hd']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-hd) :bangbang:" + - **{{ radarr['cf']['3d']['name'] }}:** Is 3D still a thing for home use ? - - **{{ radarr['cf']['no-rlsgroup']['name'] }}:** [Optional] Some indexers strip out the release group what could result in LQ groups getting a higher score. For example a lot of EVO releases end up stripping the group name, so they appear as "upgrades", and they end up getting a decent score if other things match. - - **{{ radarr['cf']['obfuscated']['name'] }}:** [Optional] (use these only if you dislike renamed releases) - - **{{ radarr['cf']['retags']['name'] }}:** [Optional] (use these only if you dislike retagged releases) - - **{{ radarr['cf']['bad-dual-groups']['name'] }}:** These groups take the original release, then they add their own preferred language (ex. Portuguese) as the main audio track (AAC 2.0), What results after renaming and FFprobe that the media file will be recognized as Portuguese AAC audio. It's a common rule that you add the best audio as first. + - **{{ radarr['cf']['no-rlsgroup']['name'] }}:** [*Optional*] Some indexers strip out the release group what could result in LQ groups getting a higher score. For example a lot of EVO releases end up stripping the group name, so they appear as "upgrades", and they end up getting a decent score if other things match. + - **{{ radarr['cf']['obfuscated']['name'] }}:** [*Optional*] (use these only if you dislike renamed releases) + - **{{ radarr['cf']['retags']['name'] }}:** [*Optional*] (use these only if you dislike retagged releases) + - **{{ radarr['cf']['bad-dual-groups']['name'] }}:** [*Optional*] These groups take the original release, then they add their own preferred language (ex. Portuguese) as the main audio track (AAC 2.0), What results after renaming and FFprobe that the media file will be recognized as Portuguese AAC audio. It's a common rule that you add the best audio as first. Also they often even rename the release name in to Portuguese. - **{{ radarr['cf']['dv-webdl']['name'] }}:** This is a special Custom Format that Block WEBDL with Dolby Vision but without HDR10 fallback. @@ -36,4 +50,4 @@ `[DV WEBDL]` = This custom format you need to score depending of your personal use and setup. - If you only watch your movies on a setup that completely supports Dolby Vision from start to end then give it a score of `0` or just don't add it. - - If you (or family members you share your collection with) have a setup that doesn't support Dolby Vision then you should add this with a score of `-10000`. \ No newline at end of file + - If you (or family members you share your collection with) have a setup that doesn't support Dolby Vision then you should add this with a score of `{{ radarr['cf']['dv-webdl']['trash_score'] }}`. From c02654fcf57d8309143b8aae52a3f977cc7551b7 Mon Sep 17 00:00:00 2001 From: nuxen Date: Thu, 25 Aug 2022 23:23:04 +0200 Subject: [PATCH 13/18] Added: `trash_regex` to relevant CFs Added the `trash_regex` link to the relevant CFs that changed to give some examples of things that should match and things that shouldn't. --- docs/json/radarr/cf/dv-hdr10.json | 1 + docs/json/sonarr/cf/dv-hdr10.json | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/json/radarr/cf/dv-hdr10.json b/docs/json/radarr/cf/dv-hdr10.json index 76d4757bc..db39dc94d 100644 --- a/docs/json/radarr/cf/dv-hdr10.json +++ b/docs/json/radarr/cf/dv-hdr10.json @@ -1,6 +1,7 @@ { "trash_id": "e23edd2482476e595fb990b12e7c609c", "trash_score": "1500", + "trash_regex": "https://regex101.com/r/pADWJD/5", "name": "DV HDR10", "includeCustomFormatWhenRenaming": false, "specifications": [ diff --git a/docs/json/sonarr/cf/dv-hdr10.json b/docs/json/sonarr/cf/dv-hdr10.json index cc7fe08e1..4878b2242 100644 --- a/docs/json/sonarr/cf/dv-hdr10.json +++ b/docs/json/sonarr/cf/dv-hdr10.json @@ -1,6 +1,7 @@ { "trash_id": "7878c33f1963fefb3d6c8657d46c2f0a", "trash_score": "1500", + "trash_regex": "https://regex101.com/r/pADWJD/5", "name": "DV HDR10", "includeCustomFormatWhenRenaming": false, "specifications": [ From 7d1497349206718b046626cc6335f8725ea66c01 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Thu, 25 Aug 2022 23:32:28 +0200 Subject: [PATCH 14/18] Renamed: CF [x265 (720/1080p)] to [x265 (HD)] - Renamed: CF [x265 (720/1080p)] to [x265 (HD)] - Added: Optional Category - Moved: Several CF to Optional --- docs/Misc/x265-4k.md | 2 +- .../Radarr-collection-of-custom-formats.md | 160 +++++++++--------- .../cf/{x265-7201080p.json => x265-hd.json} | 0 3 files changed, 84 insertions(+), 78 deletions(-) rename docs/json/radarr/cf/{x265-7201080p.json => x265-hd.json} (100%) diff --git a/docs/Misc/x265-4k.md b/docs/Misc/x265-4k.md index 6ba764115..bf5e33e59 100644 --- a/docs/Misc/x265-4k.md +++ b/docs/Misc/x265-4k.md @@ -8,7 +8,7 @@ ### How to accomplish the Golden Rule - For Sonarr check [HERE](/Sonarr/Sonarr-Release-Profile-RegEx/#golden-rule){:target="_blank" rel="noopener noreferrer"} -- For Radarr check [HERE](/Radarr/Radarr-collection-of-custom-formats/#x265-7201080p){:target="_blank" rel="noopener noreferrer"} +- For Radarr check [HERE](/Radarr/Radarr-collection-of-custom-formats/#x265-hd){:target="_blank" rel="noopener noreferrer"} ## Some extra info about 4K/X265 diff --git a/docs/Radarr/Radarr-collection-of-custom-formats.md b/docs/Radarr/Radarr-collection-of-custom-formats.md index 76755aad5..97186eadf 100644 --- a/docs/Radarr/Radarr-collection-of-custom-formats.md +++ b/docs/Radarr/Radarr-collection-of-custom-formats.md @@ -51,30 +51,28 @@ I also made 3 guides related to this one. | Movie Versions | Unwanted | HQ Source Groups | Streaming Services | | --------------------------------------------- | ----------------------------------- | --------------------- | ---------------------- | | [Hybrid](#hybrid) | [BR-DISK](#br-disk) | [HQ-Remux](#hq-remux) | [Amazon](#amzn) | -| [Remaster](#remaster) | [EVO (no WEBDL)](#evo-no-webdl) | [HQ](#hq) | [Apple TV+](#aptv) | -| [4K Remaster](#4k-remaster) | [LQ](#lq) | [HQ-WEBDL](#hq-webdl) | [Disney+](#dsnp) | -| [Special Editions](#special-edition) | [3D](#3d) | | [HBO Max](#hmax) | -| [Criterion Collection](#criterion-collection) | [No-RlsGroup](#no-rlsgroup) | | [Hulu](#hulu) | -| [Theatrical Cut](#theatrical-cut) | [Obfuscated](#obfuscated) | | [Netflix](#nf) | -| [IMAX](#imax) | [Retags](#retags) | | [Peacock TV](#pcok) | -| [IMAX Enhanced](#imax-enhanced) | [DV (WEBDL)](#dv-webdl) | | [Paramount+](#pmtp) | -| | [Bad Dual Groups](#bad-dual-groups) | | [Movies Anywhere](#ma) | -| | [x265 (720/1080p)](#x265-7201080p) | | | -| | [x265 (no HDR/DV)](#x265-no-hdrdv) | | | - ------- - -| Misc |   |   |   | -| ------------------------------------- | ------ | ------ | ------ | -| [Repack/Proper](#repack-proper) |   |   |   | -| [Repack2](#repack2) |   |   |   | -| [Multi](#multi) |   |   |   | -| [x264](#x264) |   |   |   | -| [x265](#x265) |   |   |   | -| [MPEG2](#mpeg2) |   |   |   | -| [FreeLeech](#freeleech) |   |   |   | -| [Dutch Groups](#dutch-groups) |   |   |   | -| [Anime Dual Audio](#anime-dual-audio) |   |   |   | +| [Remaster](#remaster) | [LQ](#lq) | [HQ](#hq) | [Apple TV+](#aptv) | +| [4K Remaster](#4k-remaster) | [3D](#3d) | [HQ-WEBDL](#hq-webdl) | [Disney+](#dsnp) | +| [Special Editions](#special-edition) | [DV (WEBDL)](#dv-webdl) | | [HBO Max](#hmax) | +| [Criterion Collection](#criterion-collection) | [Bad Dual Groups](#bad-dual-groups) | | [Hulu](#hulu) | +| [Theatrical Cut](#theatrical-cut) | [x265 (HD)](#x265-hd) | | [Netflix](#nf) | +| [IMAX](#imax) | [x265 (no HDR/DV)](#x265-no-hdrdv) | | [Peacock TV](#pcok) | +| [IMAX Enhanced](#imax-enhanced) | | | [Paramount+](#pmtp) | +| | | | [Movies Anywhere](#ma) | + +------ + +| Misc | Optional |   |   | +| ------------------------------------- | ------------------------------- | ------ | ------ | +| [Repack/Proper](#repack-proper) | [EVO (no WEBDL)](#evo-no-webdl) |   |   | +| [Repack2](#repack2) | [No-RlsGroup](#no-rlsgroup) |   |   | +| [Multi](#multi) | [Obfuscated](#obfuscated) |   |   | +| [x264](#x264) | [Retags](#retags) |   |   | +| [x265](#x265) | |   |   | +| [MPEG2](#mpeg2) | |   |   | +| [FreeLeech](#freeleech) | |   |   | +| [Dutch Groups](#dutch-groups) | |   |   | +| [Anime Dual Audio](#anime-dual-audio) | |   |   | ## Audio Advanced @@ -853,24 +851,6 @@ I also made 3 guides related to this one. ------ -### EVO (no WEBDL) - -??? faq "EVO (no WEBDL) - [CLICK TO EXPAND]" - - This group is often banned for the low quality Blu-ray releases, but their WEB-DLs are okay. - - You will need to add the following to your new Custom Format when created in your Quality Profile (`Setting` => `Profiles`) and then set the score to `-1000` or even `-10000` - -??? example "JSON - [CLICK TO EXPAND]" - - ```json - [[% filter indent(width=4) %]][[% include 'json/radarr/cf/evo-no-webdl.json' %]][[% endfilter %]] - ``` - -[TOP](#index) - ------- - ### LQ Low Quality Releases = LQ @@ -901,23 +881,27 @@ I also made 3 guides related to this one. ------ -### x265 (720/1080p) +### x265 (HD) -720/1080p no x265 = x265 (720/1080p) +720/1080p no x265 = x265 (720/1080p) = x265 (HD) -??? faq "720/1080p no x265 - [CLICK TO EXPAND]" +??? faq "x265 (HD) - [CLICK TO EXPAND]" - This blocks/ignores 720/1080p(HD) releases that are encoded in x265 + This blocks/ignores 720/1080p(HD) releases that are encoded in x265. In your quality profile use the following score for this Custom Format: `-10000` !!! fail "" --8<-- "includes/docker/x265.md" + !!! Danger + + Don't use this together with the following Custom Format [{{ radarr['cf']['x265-no-hdrdv']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-no-hdrdv) + ??? example "JSON - [CLICK TO EXPAND]" ```json - [[% filter indent(width=4) %]][[% include 'json/radarr/cf/x265-7201080p.json' %]][[% endfilter %]] + [[% filter indent(width=4) %]][[% include 'json/radarr/cf/x265-hd.json' %]][[% endfilter %]] ``` [TOP](#index) @@ -938,7 +922,7 @@ I also made 3 guides related to this one. !!! Danger - Don't use this together with the following Custom Format [x265 (720/1080p)](#x265-7201080p) + Don't use this together with the following Custom Format [{{ radarr['cf']['x265-hd']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-hd) ??? example "JSON - [CLICK TO EXPAND]" @@ -968,92 +952,114 @@ I also made 3 guides related to this one. ------ -### No-RlsGroup +### DV (WEBDL) -??? faq "No-RlsGroup - [CLICK TO EXPAND]" +Dolby Vision = DoVi = DV - Some indexers strip out the release group which could result in LQ groups getting a higher score. - For example a lot of EVO releases end up stripping the group name, so they appear as "upgrades", and they end up getting a decent score if other things match +??? faq "DV (WEBDL) - [CLICK TO EXPAND]" + This is a special Custom Format that block WEBDLs **with** Dolby Vision but **without** HDR10 fallback. - !!! warning + This Custom Format works together with the normal [DV](#dv) Custom Format that you can use to prefer Dolby Vision. - If you don't use decent filenames (like not adding release groups) don't add this Custom Format, except if you want to upgrade them. + Most WEBDL from Streaming Services don't have the fallback to HDR10, What can results in playback issues like weird colors if you want to play it on a not Dolby Vision compatible setup. + + Remuxes and Bluray have a fallback to HDR10. ??? example "JSON - [CLICK TO EXPAND]" ```json - [[% filter indent(width=4) %]][[% include 'json/radarr/cf/no-rlsgroup.json' %]][[% endfilter %]] + [[% filter indent(width=4) %]][[% include 'json/radarr/cf/dv-webdl.json' %]][[% endfilter %]] ``` [TOP](#index) ------ -### Obfuscated - -??? faq "Obfuscated - [CLICK TO EXPAND]" +### Bad Dual Groups - Optional (use these only if you dislike renamed releases) +??? faq "Bad dual groups - [CLICK TO EXPAND]" + These groups take the original release, then they add their own preferred language (ex. Portuguese) as the main audio track (AAC 2.0), What results after renaming and FFprobe that the media file will be recognized as Portuguese AAC audio. It's a common rule that you add the best audio as first. + Also they often even rename the release name in to Portuguese. ??? example "JSON - [CLICK TO EXPAND]" ```json - [[% filter indent(width=4) %]][[% include 'json/radarr/cf/obfuscated.json' %]][[% endfilter %]] + [[% filter indent(width=4) %]][[% include 'json/radarr/cf/bad-dual-groups.json' %]][[% endfilter %]] ``` [TOP](#index) ------ -### Retags +## Optional -??? faq "Retags - [CLICK TO EXPAND]" +------ - Optional (use these only if you dislike retagged releases) +### EVO (no WEBDL) + +??? faq "EVO (no WEBDL) - [CLICK TO EXPAND]" + + This group is often banned for the low quality Blu-ray releases, but their WEB-DLs are okay. + + You will need to add the following to your new Custom Format when created in your Quality Profile (`Setting` => `Profiles`) and then set the score to `-1000` or even `-10000` ??? example "JSON - [CLICK TO EXPAND]" ```json - [[% filter indent(width=4) %]][[% include 'json/radarr/cf/retags.json' %]][[% endfilter %]] + [[% filter indent(width=4) %]][[% include 'json/radarr/cf/evo-no-webdl.json' %]][[% endfilter %]] ``` [TOP](#index) ------ -### DV (WEBDL) +### No-RlsGroup -Dolby Vision = DoVi = DV +??? faq "No-RlsGroup - [CLICK TO EXPAND]" -??? faq "DV (WEBDL) - [CLICK TO EXPAND]" - This is a special Custom Format that block WEBDLs **with** Dolby Vision but **without** HDR10 fallback. + Some indexers strip out the release group which could result in LQ groups getting a higher score. + For example a lot of EVO releases end up stripping the group name, so they appear as "upgrades", and they end up getting a decent score if other things match - This Custom Format works together with the normal [DV](#dv) Custom Format that you can use to prefer Dolby Vision. + !!! warning - Most WEBDL from Streaming Services don't have the fallback to HDR10, What can results in playback issues like weird colors if you want to play it on a not Dolby Vision compatible setup. + If you don't use decent filenames (like not adding release groups) don't add this Custom Format, except if you want to upgrade them. - Remuxes and Bluray have a fallback to HDR10. +??? example "JSON - [CLICK TO EXPAND]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/radarr/cf/no-rlsgroup.json' %]][[% endfilter %]] + ``` + +[TOP](#index) + +------ + +### Obfuscated + +??? faq "Obfuscated - [CLICK TO EXPAND]" + + Optional (use these only if you dislike renamed releases) ??? example "JSON - [CLICK TO EXPAND]" ```json - [[% filter indent(width=4) %]][[% include 'json/radarr/cf/dv-webdl.json' %]][[% endfilter %]] + [[% filter indent(width=4) %]][[% include 'json/radarr/cf/obfuscated.json' %]][[% endfilter %]] ``` [TOP](#index) ------ -### Bad Dual Groups +### Retags -??? faq "Bad dual groups - [CLICK TO EXPAND]" - These groups take the original release, then they add their own preferred language (ex. Portuguese) as the main audio track (AAC 2.0), What results after renaming and FFprobe that the media file will be recognized as Portuguese AAC audio. It's a common rule that you add the best audio as first. - Also they often even rename the release name in to Portuguese. +??? faq "Retags - [CLICK TO EXPAND]" + + Optional (use these only if you dislike retagged releases) ??? example "JSON - [CLICK TO EXPAND]" ```json - [[% filter indent(width=4) %]][[% include 'json/radarr/cf/bad-dual-groups.json' %]][[% endfilter %]] + [[% filter indent(width=4) %]][[% include 'json/radarr/cf/retags.json' %]][[% endfilter %]] ``` [TOP](#index) diff --git a/docs/json/radarr/cf/x265-7201080p.json b/docs/json/radarr/cf/x265-hd.json similarity index 100% rename from docs/json/radarr/cf/x265-7201080p.json rename to docs/json/radarr/cf/x265-hd.json From e8fc2c2de5989e2422f9bd91e6e8c539b1c521c7 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Thu, 25 Aug 2022 23:35:26 +0200 Subject: [PATCH 15/18] Tried to make the How to more clear and easier to read. - Tried to make the How to more clear and easier to read. - Added: Own Score warning - Added: Hint If you have a setup that doesn't support Dolby Vision - Added: optional message to the unwanted list - Renamed: CF [x265 (720/1080p)] to [x265 (HD)] - Added: Optional Category - Moved: Several CF to Optional --- docs/Radarr/Radarr-setup-custom-formats.md | 80 ++++++++++------------ 1 file changed, 35 insertions(+), 45 deletions(-) diff --git a/docs/Radarr/Radarr-setup-custom-formats.md b/docs/Radarr/Radarr-setup-custom-formats.md index 958c78059..639a90f86 100644 --- a/docs/Radarr/Radarr-setup-custom-formats.md +++ b/docs/Radarr/Radarr-setup-custom-formats.md @@ -2,28 +2,28 @@ So what's the best way to setup the Custom Profiles and which one to use with which scores? -There isn't a best score setup, being that everyone has their own personal preferences. Some prefer high quality audio, others high quality video. Many prefer both. +There isn't a best setup, being that everyone has their own personal preferences. Some prefer high quality audio, others high quality video. Many prefer both. Here I will try to explain with some personal used examples how to make the most use of Custom Formats that you can use to get an idea how to setup yours. +--8<-- "includes/cf/score-attention.md" + ------ ## Basics -Here we're going to explain where to setup the Custom Formats after you've added them, as explained in [How to import Custom Formats](/Radarr/Radarr-import-custom-formats/){:target="_blank" rel="noopener noreferrer"}. -You will also see a short description of what each setting means. +After you've added the Custom Formats, as explained in [How to import Custom Formats](/Radarr/Radarr-import-custom-formats/){:target="_blank" rel="noopener noreferrer"}. +You will need to set it up in the quality Profile you want to use/prefer to make use of the Custom Formats. `Settings` => `Profiles` -??? check "example - [CLICK TO EXPAND]" - ![!cf-settings-profiles](images/cf-settings-profiles.png) +![!cf-settings-profiles](images/cf-settings-profiles.png) -Select the profile that you use/prefer. +!!! info "Radarr Custom Formats can be set per profile and isn't global" +Select the profile that you want to use/prefer. ![!cf-quality-profiles](images/cf-quality-profiles.png) -!!! info "Radarr Custom Formats can be set per profile and isn't global" - ![!cf-profile-selected](images/cf-profile-selected.png) 1. Profile name. @@ -35,7 +35,7 @@ Select the profile that you use/prefer. At the bottom in your chosen profile you will see the added Custom Formats where you can start setting up the scores. -??? check "example - [CLICK TO EXPAND]" +??? check "Screenshot example - [CLICK TO EXPAND]" ![!cf-quality-profile-cf](images/cf-quality-profile-cf.png) !!! attention @@ -44,21 +44,7 @@ At the bottom in your chosen profile you will see the added Custom Formats where - Always follow the data described in the guide. - If you got any questions or aren't sure just click the chat badge to join the Discord Channel where you can ask your questions directly. ------- - -!!! attention - Keep in mind Custom Formats are made to fine tune your Quality Profile - - Generally, quality trumps all - -{! include-markdown "../../includes/merge-quality/radarr-current-logic.md" !} - - -My suggestion is to create tiers of scores based on what things matter to you. - -Personally, I would only add the Custom Formats that do what you actually prefer. Especially in the beginning, including the [Releases you should avoid](#releases-you-should-avoid) - -!!! info +!!! info "Keep in mind Custom Formats are made to fine tune your Quality Profile.
Generally, quality trumps all" Custom formats are controlled by Quality Profiles. @@ -67,6 +53,10 @@ Personally, I would only add the Custom Formats that do what you actually prefer - The Minimum score requires releases to reach this threshold otherwise they will be rejected. - Custom formats that match with undesirable attributes should be given a negative score to lower their appeal. - Outright rejections should be given a negative score low enough that even if all of the other formats with positive scores were added, the score would still fall below the minimum. +------ + +{! include-markdown "../../includes/merge-quality/radarr-current-logic.md" !} + ------ @@ -76,6 +66,8 @@ Here I will explain how to make the most use of Custom Formats and show you some All these examples make use of the [Collection of Custom Formats](/Radarr/Radarr-collection-of-custom-formats/){:target="_blank" rel="noopener noreferrer"} +--8<-- "includes/cf/score-attention.md" + ------ ### Releases you should avoid @@ -100,7 +92,7 @@ In this example I have lossy Atmos over lossless DTS because the object metadata #### Prefer HDR Metadata -Lets say you prefer HDR metadata +Lets say you prefer HDR metadata (HDR or Dolby Vision or Both) Then we would use the following order: @@ -109,9 +101,9 @@ Then we would use the following order: ------ -!!! important +!!! attention - I also suggest to change the Propers and Repacks settings in Radarr!!! + I also suggest to change the Propers and Repacks settings in Radarr :bangbang: Instructions can be found [HERE](#proper-and-repacks) @@ -135,10 +127,10 @@ For this Quality Profile we're going to make use of the following Custom Formats ??? summary "HQ Source Groups - [CLICK TO EXPAND]" - | Custom Format | Score | Trash ID | - | ----------------------------------------------------------------------------------------- | --------------------------------------- | ------------------------------------ | + | Custom Format | Score | Trash ID | + | ----------------------------------------------------------------------------------------------- | --------------------------------------------- | ------------------------------------------ | | [{{ radarr['cf']['hq-webdl']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hq-webdl) | {{ radarr['cf']['hq-webdl']['trash_score'] }} | {{ radarr['cf']['hq-webdl']['trash_id'] }} | - | [{{ radarr['cf']['hq-remux']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hq-remux) | 0 | {{ radarr['cf']['hq-remux']['trash_id'] }} | + | [{{ radarr['cf']['hq-remux']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hq-remux) | 0 | {{ radarr['cf']['hq-remux']['trash_id'] }} | | [{{ radarr['cf']['hq']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hq) | {{ radarr['cf']['hq']['trash_score'] }} | {{ radarr['cf']['hq']['trash_id'] }} | I decided not to add `Audio Advanced` Custom Formats to the encodes profile, being with encodes I prefer higher video quality. If you also want HD audio formats I would suggest to go for the Remuxes. @@ -147,9 +139,9 @@ Use the following main settings in your profile. ![!cf-profile-encodes](images/cf-profile-encodes.png) -!!! fail "" +!!! attention "Make sure you don't check the BR-DISK." - Make sure you don't check the BR-DISK. The reason why I didn't select the WEB-DL 720p is because you will hardly find any releases that aren't done as 1080p WEB-DL +The reason why I didn't select the WEB-DL 720p is because you will hardly find any releases that aren't done as 1080p WEB-DL. ??? example "The following workflow will be applied:" @@ -192,19 +184,19 @@ For this Quality Profile we're going to make use of the following Custom Formats ??? summary "HQ Source Groups - [CLICK TO EXPAND]" - | Custom Format | Score | Trash ID | - | ----------------------------------------------------------------------------------------- | --------------------------------------- | ------------------------------------ | + | Custom Format | Score | Trash ID | + | ----------------------------------------------------------------------------------------------- | --------------------------------------------- | ------------------------------------------ | | [{{ radarr['cf']['hq-webdl']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hq-webdl) | {{ radarr['cf']['hq-webdl']['trash_score'] }} | {{ radarr['cf']['hq-webdl']['trash_id'] }} | | [{{ radarr['cf']['hq-remux']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hq-remux) | {{ radarr['cf']['hq-remux']['trash_score'] }} | {{ radarr['cf']['hq-remux']['trash_id'] }} | - | [{{ radarr['cf']['hq']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hq) | 0 | {{ radarr['cf']['hq']['trash_id'] }} | + | [{{ radarr['cf']['hq']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hq) | 0 | {{ radarr['cf']['hq']['trash_id'] }} | Use the following main settings in your profile. ![!cf-profile-remux1080](images/cf-profile-remux1080.png) -!!! fail "" +!!! attention "Make sure you don't check the BR-DISK." - Make sure you don't check the BR-DISK. The reason why I didn't select the WEB-DL 720p is because you will hardly find any releases that aren't done as 1080p WEB-DL +The reason why I didn't select the WEB-DL 720p is because you will hardly find any releases that aren't done as 1080p WEB-DL. ??? example "The following workflow will be applied:" @@ -243,19 +235,17 @@ For this Quality Profile we're going to make use of the following Custom Formats ??? summary "HQ Source Groups - [CLICK TO EXPAND]" - | Custom Format | Score | Trash ID | - | ----------------------------------------------------------------------------------------- | --------------------------------------- | ------------------------------------ | + | Custom Format | Score | Trash ID | + | ----------------------------------------------------------------------------------------------- | --------------------------------------------- | ------------------------------------------ | | [{{ radarr['cf']['hq-webdl']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hq-webdl) | {{ radarr['cf']['hq-webdl']['trash_score'] }} | {{ radarr['cf']['hq-webdl']['trash_id'] }} | | [{{ radarr['cf']['hq-remux']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hq-remux) | {{ radarr['cf']['hq-remux']['trash_score'] }} | {{ radarr['cf']['hq-remux']['trash_id'] }} | - | [{{ radarr['cf']['hq']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hq) | 0 | {{ radarr['cf']['hq']['trash_id'] }} | + | [{{ radarr['cf']['hq']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hq) | 0 | {{ radarr['cf']['hq']['trash_id'] }} | Use the following main settings in your profile. ![!cf-profile-remux2160](images/cf-profile-remux2160.png) -!!! fail "" - - Make sure you don't check the BR-DISK. +!!! attention "Make sure you don't check the BR-DISK." ??? example "The following workflow will be applied:" @@ -318,11 +308,11 @@ Use the following main settings in your profile. ??? tip "Avoid using the x264/x265 Custom Format - [CLICK TO EXPAND]" - Avoid using the x264/x265 Custom Format with a score if possible, it's smarter to use the [720/1080p no x265](/Radarr/Radarr-collection-of-custom-formats/#x265-7201080p){:target="_blank" rel="noopener noreferrer"} Custom Format. + Avoid using the x264/x265 Custom Format with a score if possible, it's smarter to use the [{{ radarr['cf']['x265-hd']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-hd){:target="_blank" rel="noopener noreferrer"} Custom Format. Something like 95% of video files are x264 and have much better direct play support. If you have more than a of couple users, you will notice much more transcoding. - Use x265 only for 4k releases and the [720/1080p no x265](/Radarr/Radarr-collection-of-custom-formats/#x265-7201080p){:target="_blank" rel="noopener noreferrer"} makes sure you still get the x265 releases. + Use x265 only for 4k releases and the [{{ radarr['cf']['x265-hd']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-hd){:target="_blank" rel="noopener noreferrer"} makes sure you still get the x265 releases. ## Thanks From 865802a9ba77602491664f38ac3c8906a4aec6b6 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Thu, 25 Aug 2022 23:44:01 +0200 Subject: [PATCH 16/18] Fixed: MD032 --- docs/Radarr/Radarr-setup-custom-formats.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Radarr/Radarr-setup-custom-formats.md b/docs/Radarr/Radarr-setup-custom-formats.md index 639a90f86..b42f3f780 100644 --- a/docs/Radarr/Radarr-setup-custom-formats.md +++ b/docs/Radarr/Radarr-setup-custom-formats.md @@ -53,6 +53,7 @@ At the bottom in your chosen profile you will see the added Custom Formats where - The Minimum score requires releases to reach this threshold otherwise they will be rejected. - Custom formats that match with undesirable attributes should be given a negative score to lower their appeal. - Outright rejections should be given a negative score low enough that even if all of the other formats with positive scores were added, the score would still fall below the minimum. + ------ {! include-markdown "../../includes/merge-quality/radarr-current-logic.md" !} From 5b954b302f99cdf1ed95e98786a376ab98042c59 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Fri, 26 Aug 2022 00:35:18 +0200 Subject: [PATCH 17/18] Pulled: Update form Radarr CF [BR-DISK] - Pulled: Update form Radarr CF [BR-DISK] Thnx @ItsME6969 --- docs/json/sonarr/cf/br-disk.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/json/sonarr/cf/br-disk.json b/docs/json/sonarr/cf/br-disk.json index 6f17d4be3..0c32a2324 100644 --- a/docs/json/sonarr/cf/br-disk.json +++ b/docs/json/sonarr/cf/br-disk.json @@ -10,8 +10,9 @@ "negate": false, "required": true, "fields": { - "value": "^(?!.*\\b((? Date: Fri, 26 Aug 2022 01:31:01 +0200 Subject: [PATCH 18/18] Reverted: updates.txt location - Reverted: updates.txt location --- updates.txt => docs/updates.txt | 0 mkdocs.yml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename updates.txt => docs/updates.txt (100%) diff --git a/updates.txt b/docs/updates.txt similarity index 100% rename from updates.txt rename to docs/updates.txt diff --git a/mkdocs.yml b/mkdocs.yml index 7bf8b5dba..2aec0485f 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -62,7 +62,7 @@ plugins: j2_variable_end_string: "]]" - redirects: redirect_maps: - # updates.txt: updates.txt + updates.txt: updates.txt discord.md: https://discord.gg/Vau8dZ3 syno-script.md: https://github.com/TRaSH-/Guides-Synology-Templates/blob/main/script/trash_syno_installer.sh # Radarr old redirects