From ca95584fbbb4bb95d9b1877dd1bcdaf42dfa8c8d Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Thu, 1 Jun 2023 17:38:52 +0200 Subject: [PATCH 01/23] Fixed Canal+ CF Thanks to #1227 comment --- docs/json/sonarr/cf/french-canalplus.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/json/sonarr/cf/french-canalplus.json b/docs/json/sonarr/cf/french-canalplus.json index a9b3b9cbb..df8868e71 100644 --- a/docs/json/sonarr/cf/french-canalplus.json +++ b/docs/json/sonarr/cf/french-canalplus.json @@ -1,5 +1,6 @@ { "trash_id": "f27d46a831e6b16fa3fee2c4e5d10984", + "trash_regex": "https://regex101.com/r/UYB7E7/1", "name": "CANAL+", "includeCustomFormatWhenRenaming": true, "specifications": [ @@ -27,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(C(ANAL)?[ .]?(\\+|Plus))\\b" + "value": "\\b(C(?:anal)?[ .-]?(Plus|\\+))[ .]" } }, { From eea8bfaa19a6b3399f64f26ed31f8e3c837ec3e5 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Thu, 1 Jun 2023 17:39:29 +0200 Subject: [PATCH 02/23] Fix Multi-Audio CFs to not match `Multi-Subs` --- docs/json/radarr/cf/multi-audio.json | 4 ++-- docs/json/sonarr/cf/multi-audio.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/json/radarr/cf/multi-audio.json b/docs/json/radarr/cf/multi-audio.json index 994208036..d9caa5e3f 100644 --- a/docs/json/radarr/cf/multi-audio.json +++ b/docs/json/radarr/cf/multi-audio.json @@ -1,7 +1,7 @@ { "trash_id": "72b1548df1ac3175ca105a9ce7043c91", "trash_score": "300", - "trash_regex": "https://regex101.com/r/hcMa1f/1", + "trash_regex": "https://regex101.com/r/hcMa1f/2", "name": "Multi-Audio", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +11,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MULTi)(\\d|\\b)" + "value": "\\b(MULTi(?![ .-]subs?))(\\d|\\b)" } }, { diff --git a/docs/json/sonarr/cf/multi-audio.json b/docs/json/sonarr/cf/multi-audio.json index 48e68d4e8..a6026f563 100644 --- a/docs/json/sonarr/cf/multi-audio.json +++ b/docs/json/sonarr/cf/multi-audio.json @@ -1,7 +1,7 @@ { "trash_id": "2f6e84efc47246ec9071e311e71c4953", "trash_score": "300", - "trash_regex": "https://regex101.com/r/hcMa1f/1", + "trash_regex": "https://regex101.com/r/hcMa1f/2", "name": "Multi-Audio", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -11,7 +11,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MULTi)(\\d|\\b)" + "value": "\\b(MULTi(?![ .-]subs?))(\\d|\\b)" } }, { From 112843970c7d8ad15639a1f19e63e8bd11cabede Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Thu, 1 Jun 2023 17:40:06 +0200 Subject: [PATCH 03/23] Fix VF2 id in recyclarr sonarr config --- docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml | 2 +- docs/recyclarr-configs/sonarr/french-web-2160p-multi-v4.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml b/docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml index 1cb5aa4eb..30960aa3c 100644 --- a/docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml @@ -102,7 +102,7 @@ sonarr: - name: FR-MULTi-WEB-1080p # score: 101 - trash_ids: - - b6816a0e1d4b64bf3550ad3b74b009b6 # VF2 + - 34789ec3caa819f087e23bbf9999daf7 # VF2 quality_profiles: - name: FR-MULTi-WEB-1080p # score: 101 diff --git a/docs/recyclarr-configs/sonarr/french-web-2160p-multi-v4.yml b/docs/recyclarr-configs/sonarr/french-web-2160p-multi-v4.yml index e66a9ee24..d5d129374 100644 --- a/docs/recyclarr-configs/sonarr/french-web-2160p-multi-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-web-2160p-multi-v4.yml @@ -117,7 +117,7 @@ sonarr: - name: FR-MULTi-WEB-2160p # score: 101 - trash_ids: - - b6816a0e1d4b64bf3550ad3b74b009b6 # VF2 + - 34789ec3caa819f087e23bbf9999daf7 # VF2 quality_profiles: - name: FR-MULTi-WEB-2160p # score: 101 From 832d7bb85c4f1fbd2490661401274e0a694605b9 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Thu, 1 Jun 2023 17:40:56 +0200 Subject: [PATCH 04/23] Added `MAX` and `Remux Tier 03` to recyclarr configs --- docs/recyclarr-configs/radarr/french-hd-bluray-web-multi.yml | 1 + docs/recyclarr-configs/radarr/french-hd-bluray-web-vostfr.yml | 1 + docs/recyclarr-configs/radarr/french-remux-web-1080p-multi.yml | 2 ++ docs/recyclarr-configs/radarr/french-remux-web-1080p-vostfr.yml | 2 ++ docs/recyclarr-configs/radarr/french-remux-web-2160p-multi.yml | 2 ++ docs/recyclarr-configs/radarr/french-remux-web-2160p-vostfr.yml | 2 ++ docs/recyclarr-configs/radarr/french-uhd-bluray-web-multi.yml | 1 + docs/recyclarr-configs/radarr/french-uhd-bluray-web-vostfr.yml | 1 + docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml | 1 + docs/recyclarr-configs/sonarr/french-web-1080p-vostfr-v4.yml | 1 + docs/recyclarr-configs/sonarr/french-web-2160p-multi-v4.yml | 1 + docs/recyclarr-configs/sonarr/french-web-2160p-vostfr-v4.yml | 1 + 12 files changed, 16 insertions(+) diff --git a/docs/recyclarr-configs/radarr/french-hd-bluray-web-multi.yml b/docs/recyclarr-configs/radarr/french-hd-bluray-web-multi.yml index 1a22c0e6a..ca0f0f75e 100644 --- a/docs/recyclarr-configs/radarr/french-hd-bluray-web-multi.yml +++ b/docs/recyclarr-configs/radarr/french-hd-bluray-web-multi.yml @@ -54,6 +54,7 @@ radarr: - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX - 526d445d4c16214309f0fd2b3be18a89 # Hulu - 2a6039655313bf5dab1e43523b62c374 # MA + - 6a061313d22e51e0f25b7cd4dc065233 # MAX - 170b1d363bd8516fbf3a3eb05d4faff6 # NF - bf7e73dd1d85b12cc527dc619761c840 # Pathe - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK diff --git a/docs/recyclarr-configs/radarr/french-hd-bluray-web-vostfr.yml b/docs/recyclarr-configs/radarr/french-hd-bluray-web-vostfr.yml index c996970a4..f360c95c4 100644 --- a/docs/recyclarr-configs/radarr/french-hd-bluray-web-vostfr.yml +++ b/docs/recyclarr-configs/radarr/french-hd-bluray-web-vostfr.yml @@ -50,6 +50,7 @@ radarr: - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX - 526d445d4c16214309f0fd2b3be18a89 # Hulu - 2a6039655313bf5dab1e43523b62c374 # MA + - 6a061313d22e51e0f25b7cd4dc065233 # MAX - 170b1d363bd8516fbf3a3eb05d4faff6 # NF - bf7e73dd1d85b12cc527dc619761c840 # Pathe - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK diff --git a/docs/recyclarr-configs/radarr/french-remux-web-1080p-multi.yml b/docs/recyclarr-configs/radarr/french-remux-web-1080p-multi.yml index f4ae07b81..65f6937c4 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-1080p-multi.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-1080p-multi.yml @@ -73,6 +73,7 @@ radarr: - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX - 526d445d4c16214309f0fd2b3be18a89 # Hulu - 2a6039655313bf5dab1e43523b62c374 # MA + - 6a061313d22e51e0f25b7cd4dc065233 # MAX - 170b1d363bd8516fbf3a3eb05d4faff6 # NF - bf7e73dd1d85b12cc527dc619761c840 # Pathe - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK @@ -91,6 +92,7 @@ radarr: # Il est tout de fois possible que dans ce cas Radarr récupére une release VO au lieu d'un MULTi/DUAL car celle-ci possède un score plus important. # - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01 # - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02 + # - 8baaf0b3142bf4d94c42a724f034e27a # Remux Tier 03 # - c20f169ef63c5f40c2def54abaf4438e # WEB Tier 01 # - 403816d65392c79236dcb6dd591aeda4 # WEB Tier 02 # - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03 diff --git a/docs/recyclarr-configs/radarr/french-remux-web-1080p-vostfr.yml b/docs/recyclarr-configs/radarr/french-remux-web-1080p-vostfr.yml index 2fcde159e..4ffd730a7 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-1080p-vostfr.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-1080p-vostfr.yml @@ -67,6 +67,7 @@ radarr: - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX - 526d445d4c16214309f0fd2b3be18a89 # Hulu - 2a6039655313bf5dab1e43523b62c374 # MA + - 6a061313d22e51e0f25b7cd4dc065233 # MAX - 170b1d363bd8516fbf3a3eb05d4faff6 # NF - bf7e73dd1d85b12cc527dc619761c840 # Pathe - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK @@ -82,6 +83,7 @@ radarr: # Les tiers suivant sont les tiers originaux du guide (groupes anglophones) - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01 - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02 + - 8baaf0b3142bf4d94c42a724f034e27a # Remux Tier 03 - c20f169ef63c5f40c2def54abaf4438e # WEB Tier 01 - 403816d65392c79236dcb6dd591aeda4 # WEB Tier 02 - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03 diff --git a/docs/recyclarr-configs/radarr/french-remux-web-2160p-multi.yml b/docs/recyclarr-configs/radarr/french-remux-web-2160p-multi.yml index 439521974..13cac0f5b 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-2160p-multi.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-2160p-multi.yml @@ -91,6 +91,7 @@ radarr: - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX - 526d445d4c16214309f0fd2b3be18a89 # Hulu - 2a6039655313bf5dab1e43523b62c374 # MA + - 6a061313d22e51e0f25b7cd4dc065233 # MAX - 170b1d363bd8516fbf3a3eb05d4faff6 # NF - bf7e73dd1d85b12cc527dc619761c840 # Pathe - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK @@ -109,6 +110,7 @@ radarr: # Il est tout de fois possible que dans ce cas Radarr récupére une release VO au lieu d'un MULTi/DUAL car celle-ci possède un score plus important. # - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01 # - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02 + # - 8baaf0b3142bf4d94c42a724f034e27a # Remux Tier 03 # - c20f169ef63c5f40c2def54abaf4438e # WEB Tier 01 # - 403816d65392c79236dcb6dd591aeda4 # WEB Tier 02 # - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03 diff --git a/docs/recyclarr-configs/radarr/french-remux-web-2160p-vostfr.yml b/docs/recyclarr-configs/radarr/french-remux-web-2160p-vostfr.yml index 2d64c9bd1..94867cc89 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-2160p-vostfr.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-2160p-vostfr.yml @@ -85,6 +85,7 @@ radarr: - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX - 526d445d4c16214309f0fd2b3be18a89 # Hulu - 2a6039655313bf5dab1e43523b62c374 # MA + - 6a061313d22e51e0f25b7cd4dc065233 # MAX - 170b1d363bd8516fbf3a3eb05d4faff6 # NF - bf7e73dd1d85b12cc527dc619761c840 # Pathe - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK @@ -100,6 +101,7 @@ radarr: # Les tiers suivant sont les tiers originaux du guide (groupes anglophones) - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01 - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02 + - 8baaf0b3142bf4d94c42a724f034e27a # Remux Tier 03 - c20f169ef63c5f40c2def54abaf4438e # WEB Tier 01 - 403816d65392c79236dcb6dd591aeda4 # WEB Tier 02 - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03 diff --git a/docs/recyclarr-configs/radarr/french-uhd-bluray-web-multi.yml b/docs/recyclarr-configs/radarr/french-uhd-bluray-web-multi.yml index 6c57dc2b7..176ae664d 100644 --- a/docs/recyclarr-configs/radarr/french-uhd-bluray-web-multi.yml +++ b/docs/recyclarr-configs/radarr/french-uhd-bluray-web-multi.yml @@ -91,6 +91,7 @@ radarr: - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX - 526d445d4c16214309f0fd2b3be18a89 # Hulu - 2a6039655313bf5dab1e43523b62c374 # MA + - 6a061313d22e51e0f25b7cd4dc065233 # MAX - 170b1d363bd8516fbf3a3eb05d4faff6 # NF - bf7e73dd1d85b12cc527dc619761c840 # Pathe - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK diff --git a/docs/recyclarr-configs/radarr/french-uhd-bluray-web-vostfr.yml b/docs/recyclarr-configs/radarr/french-uhd-bluray-web-vostfr.yml index 476013051..e06ad9234 100644 --- a/docs/recyclarr-configs/radarr/french-uhd-bluray-web-vostfr.yml +++ b/docs/recyclarr-configs/radarr/french-uhd-bluray-web-vostfr.yml @@ -85,6 +85,7 @@ radarr: - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX - 526d445d4c16214309f0fd2b3be18a89 # Hulu - 2a6039655313bf5dab1e43523b62c374 # MA + - 6a061313d22e51e0f25b7cd4dc065233 # MAX - 170b1d363bd8516fbf3a3eb05d4faff6 # NF - bf7e73dd1d85b12cc527dc619761c840 # Pathe - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK diff --git a/docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml b/docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml index 30960aa3c..62b222f34 100644 --- a/docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml @@ -43,6 +43,7 @@ sonarr: - a880d6abc21e7c16884f3ae393f84179 # HMAX - f6cce30f1733d5c8194222a7507909bb # HULU - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT + - 81d1fbf600e2540cee87f3a23f9d3c1c # MAX - d34870697c9db575f17700212167be23 # NF - b2b980877494b560443631eb1f473867 # NLZ - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK diff --git a/docs/recyclarr-configs/sonarr/french-web-1080p-vostfr-v4.yml b/docs/recyclarr-configs/sonarr/french-web-1080p-vostfr-v4.yml index 4b1138770..c38ab25a7 100644 --- a/docs/recyclarr-configs/sonarr/french-web-1080p-vostfr-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-web-1080p-vostfr-v4.yml @@ -39,6 +39,7 @@ sonarr: - a880d6abc21e7c16884f3ae393f84179 # HMAX - f6cce30f1733d5c8194222a7507909bb # HULU - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT + - 81d1fbf600e2540cee87f3a23f9d3c1c # MAX - d34870697c9db575f17700212167be23 # NF - b2b980877494b560443631eb1f473867 # NLZ - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK diff --git a/docs/recyclarr-configs/sonarr/french-web-2160p-multi-v4.yml b/docs/recyclarr-configs/sonarr/french-web-2160p-multi-v4.yml index d5d129374..79fd75ce9 100644 --- a/docs/recyclarr-configs/sonarr/french-web-2160p-multi-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-web-2160p-multi-v4.yml @@ -58,6 +58,7 @@ sonarr: - a880d6abc21e7c16884f3ae393f84179 # HMAX - f6cce30f1733d5c8194222a7507909bb # HULU - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT + - 81d1fbf600e2540cee87f3a23f9d3c1c # MAX - d34870697c9db575f17700212167be23 # NF - b2b980877494b560443631eb1f473867 # NLZ - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK diff --git a/docs/recyclarr-configs/sonarr/french-web-2160p-vostfr-v4.yml b/docs/recyclarr-configs/sonarr/french-web-2160p-vostfr-v4.yml index 664b0ec07..1c73622c6 100644 --- a/docs/recyclarr-configs/sonarr/french-web-2160p-vostfr-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-web-2160p-vostfr-v4.yml @@ -54,6 +54,7 @@ sonarr: - a880d6abc21e7c16884f3ae393f84179 # HMAX - f6cce30f1733d5c8194222a7507909bb # HULU - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT + - 81d1fbf600e2540cee87f3a23f9d3c1c # MAX - d34870697c9db575f17700212167be23 # NF - b2b980877494b560443631eb1f473867 # NLZ - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK From 55384980bf7e45303235113293f425861b642092 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Sun, 4 Jun 2023 20:09:05 +0200 Subject: [PATCH 05/23] Updated French Anime CFs - Added a French Anime Tier 03 to better score some groups - Moved existing groups to fitting tier - Added `GundamGuy` and `OECUF` to Tier 02 - Added `Galactic`, `KushEnthusiast` and `TheFantastics` to Tier 03 - Deleted `KFR` and `Otaku-Attitude` from FanSub tier as their releases are no more available - Fixe `Team-Arcedo` not recognising `Arcedo` --- .../sonarr-collection-of-custom-formats.md | 27 +++- docs/json/sonarr/cf/french-anime-fansub.json | 20 +-- docs/json/sonarr/cf/french-anime-tier-01.json | 20 +-- docs/json/sonarr/cf/french-anime-tier-02.json | 45 ++----- docs/json/sonarr/cf/french-anime-tier-03.json | 116 ++++++++++++++++++ .../sonarr-cf-french-anime-scoring-en.md | 1 + .../sonarr-cf-french-anime-scoring-fr.md | 1 + 7 files changed, 151 insertions(+), 79 deletions(-) create mode 100644 docs/json/sonarr/cf/french-anime-tier-03.json diff --git a/docs/Sonarr/sonarr-collection-of-custom-formats.md b/docs/Sonarr/sonarr-collection-of-custom-formats.md index eb85dc5f5..d858129cb 100644 --- a/docs/Sonarr/sonarr-collection-of-custom-formats.md +++ b/docs/Sonarr/sonarr-collection-of-custom-formats.md @@ -81,10 +81,10 @@ I also made 3 guides related to this one. | [MPEG2](#mpeg2) | [Obfuscated](#obfuscated) | [VOF](#vof) | [FR WEB Tier 03](#fr-web-tier-03) | | [x264](#x264) | [Retags](#retags) | [VFI](#vfi) | [FR Anime Tier 01](#fr-anime-tier-01) | | [x265](#x265) | [Scene](#scene) | [VF2](#vf2) | [FR Anime Tier 02](#fr-anime-tier-02) | -| | [Season Packs](#season-pack) | [VFQ](#vfq) | [FR Anime FanSub](#fr-anime-fansub) | -| | [x265 (no HDR/DV)](#x265-no-hdrdv) | [VQ](#vq) | [FR Scene Groups](#fr-scene-groups) | -| | [AV1](#av1) | [VFB](#vfb) | [FR LQ](#fr-lq) | -| | [SDR](#sdr) | [VOSTFR](#vostfr) | | +| | [Season Packs](#season-pack) | [VFQ](#vfq) | [FR Anime Tier 03](#fr-anime-tier-02) | +| | [x265 (no HDR/DV)](#x265-no-hdrdv) | [VQ](#vq) | [FR Anime FanSub](#fr-anime-fansub) | +| | [AV1](#av1) | [VFB](#vfb) | [FR Scene Groups](#fr-scene-groups) | +| | [SDR](#sdr) | [VOSTFR](#vostfr) | [FR LQ](#fr-lq) | | | [DV (FEL)](#dv-fel) | [FanSUB](#fansub) | | | | [HFR](#hfr) | [FastSUB](#fastsub) | | | | [VP9](#vp9) | | | @@ -2562,13 +2562,30 @@ I also made 3 guides related to this one. - WIP - Groups that are known to be still active and doing only Anime but with few releases per year. - Groups that are known to be still active and doing Anime and other type of release. + +??? example "JSON - [CLICK TO EXPAND]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/french-anime-tier-02.json' %]][[% endfilter %]] + ``` + +[TOP](#index) + +------ + +### FR Anime Tier 03 + +??? question "FR Anime Tier 03 - [CLICK TO EXPAND]" + + - WIP + - Groups with no or little activity that have at some point made an interesting release. Which is either the only one available (in VOSTFR/MULTi) or still top of its category. - Groups that haven't released much or are not well recognized. (yet) - Groups doing only anime, that have retired (or no longer exist) and may not have the best quality by todays standards. ??? example "JSON - [CLICK TO EXPAND]" ```json - [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/french-anime-tier-02.json' %]][[% endfilter %]] + [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/french-anime-tier-03.json' %]][[% endfilter %]] ``` [TOP](#index) diff --git a/docs/json/sonarr/cf/french-anime-fansub.json b/docs/json/sonarr/cf/french-anime-fansub.json index 097c09374..3f3373094 100644 --- a/docs/json/sonarr/cf/french-anime-fansub.json +++ b/docs/json/sonarr/cf/french-anime-fansub.json @@ -22,15 +22,6 @@ "value": "\\b(KaeriZaki)\\b" } }, - { - "name": "KFR", - "implementation": "ReleaseTitleSpecification", - "negate": false, - "required": false, - "fields": { - "value": "\\b(KFR)\\b" - } - }, { "name": "Natsumi-no-Sekai", "implementation": "ReleaseTitleSpecification", @@ -58,15 +49,6 @@ "value": "\\b(Onii[ .-]?ChanSub)\\b" } }, - { - "name": "Otaku-Attitude", - "implementation": "ReleaseTitleSpecification", - "negate": false, - "required": false, - "fields": { - "value": "\\b(Otaku[ .-]?Attitude)\\b" - } - }, { "name": "Owlolf", "implementation": "ReleaseTitleSpecification", @@ -91,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Team[ .-]?Arcedo)\\b" + "value": "\\b((Team[ .-])?Arcedo)\\b" } }, { diff --git a/docs/json/sonarr/cf/french-anime-tier-01.json b/docs/json/sonarr/cf/french-anime-tier-01.json index 1293cd46c..1f3f7da3e 100644 --- a/docs/json/sonarr/cf/french-anime-tier-01.json +++ b/docs/json/sonarr/cf/french-anime-tier-01.json @@ -1,6 +1,6 @@ { "trash_id": "db13a377f7afb29975ea39470434d2ef", - "trash_score": "1600", + "trash_score": "1650", "name": "FR Anime Tier 01", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -31,15 +31,6 @@ "value": "\\b(Fuceo)\\b" } }, - { - "name": "FUJiSAN", - "implementation": "ReleaseTitleSpecification", - "negate": false, - "required": false, - "fields": { - "value": "\\b(FUJiSAN)\\b" - } - }, { "name": "Good Job! Alexis", "implementation": "ReleaseTitleSpecification", @@ -49,15 +40,6 @@ "value": "\\b(Good[ .-]?(Job|Rip|Sub)!?[ .-]?Alexis)\\b" } }, - { - "name": "NeoSG", - "implementation": "ReleaseTitleSpecification", - "negate": false, - "required": false, - "fields": { - "value": "\\b(NeoSG)\\b" - } - }, { "name": "Punisher694", "implementation": "ReleaseTitleSpecification", diff --git a/docs/json/sonarr/cf/french-anime-tier-02.json b/docs/json/sonarr/cf/french-anime-tier-02.json index bbcda4337..3240b168b 100644 --- a/docs/json/sonarr/cf/french-anime-tier-02.json +++ b/docs/json/sonarr/cf/french-anime-tier-02.json @@ -1,6 +1,6 @@ { "trash_id": "4e6134a384dbc0ef166234cc0e45d26d", - "trash_score": "1550", + "trash_score": "1600", "name": "FR Anime Tier 02", "includeCustomFormatWhenRenaming": false, "specifications": [ @@ -14,30 +14,30 @@ } }, { - "name": "BLV", + "name": "Elecman", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(BLV)\\b" + "value": "\\b(Elecman)\\b" } }, { - "name": "D3T3R10R1TY", + "name": "FUJiSAN", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(D3T3R10R1TY)\\b" + "value": "\\b(FUJiSAN)\\b" } }, { - "name": "HANAMi", + "name": "GundamGuy", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(HANAMi)\\b" + "value": "\\b(GundamGuy)\\b" } }, { @@ -49,24 +49,6 @@ "value": "\\b(KAF)\\b" } }, - { - "name": "KHAYA", - "implementation": "ReleaseTitleSpecification", - "negate": false, - "required": false, - "fields": { - "value": "\\b(KHAYA)\\b" - } - }, - { - "name": "Monkey-D.Lulu", - "implementation": "ReleaseTitleSpecification", - "negate": false, - "required": false, - "fields": { - "value": "\\b(Monkey[ .-]?D[ .-]?Lulu)\\b" - } - }, { "name": "Nagutos", "implementation": "ReleaseTitleSpecification", @@ -77,21 +59,12 @@ } }, { - "name": "RONiN", - "implementation": "ReleaseTitleSpecification", - "negate": false, - "required": false, - "fields": { - "value": "\\b(RONiN)\\b" - } - }, - { - "name": "TTN", + "name": "OECUF", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(TTN)\\b" + "value": "\\b(OECUF)\\b" } }, { diff --git a/docs/json/sonarr/cf/french-anime-tier-03.json b/docs/json/sonarr/cf/french-anime-tier-03.json new file mode 100644 index 000000000..441c31e24 --- /dev/null +++ b/docs/json/sonarr/cf/french-anime-tier-03.json @@ -0,0 +1,116 @@ +{ + "trash_id": "db34d4357937fbfe89b63ba095f22155", + "trash_score": "1550", + "name": "FR Anime Tier 03", + "includeCustomFormatWhenRenaming": false, + "specifications": [ + { + "name": "BLV", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(BLV)\\b" + } + }, + { + "name": "D3T3R10R1TY", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(D3T3R10R1TY)\\b" + } + }, + { + "name": "Galactic", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(Galactic)\\b" + } + }, + { + "name": "HANAMi", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(HANAMi)\\b" + } + }, + { + "name": "KHAYA", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(KHAYA)\\b" + } + }, + { + "name": "KushEnthusiast", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(KushEnthusiast)\\b" + } + }, + { + "name": "matheousse", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(matheousse)\\b" + } + }, + { + "name": "Monkey-D.Lulu", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(Monkey[ .-]?D[ .-]?Lulu)\\b" + } + }, + { + "name": "NeoSG", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(NeoSG)\\b" + } + }, + { + "name": "RONiN", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(RONiN)\\b" + } + }, + { + "name": "TheFantastics", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(TheFantastics)\\b" + } + }, + { + "name": "TTN", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(TTN)\\b" + } + } + ] +} diff --git a/includes/french-guide/sonarr-cf-french-anime-scoring-en.md b/includes/french-guide/sonarr-cf-french-anime-scoring-en.md index 79d0aa5f4..d98be958f 100644 --- a/includes/french-guide/sonarr-cf-french-anime-scoring-en.md +++ b/includes/french-guide/sonarr-cf-french-anime-scoring-en.md @@ -3,6 +3,7 @@ | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------ | ------------------------------------------------------ | | [{{ sonarr['cf']['french-anime-tier-01']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#fr-anime-tier-01) | {{ sonarr['cf']['french-anime-tier-01']['trash_score'] }} | {{ sonarr['cf']['french-anime-tier-01']['trash_id'] }} | | [{{ sonarr['cf']['french-anime-tier-02']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#fr-anime-tier-02) | {{ sonarr['cf']['french-anime-tier-02']['trash_score'] }} | {{ sonarr['cf']['french-anime-tier-02']['trash_id'] }} | + | [{{ sonarr['cf']['french-anime-tier-03']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#fr-anime-tier-03) | {{ sonarr['cf']['french-anime-tier-03']['trash_score'] }} | {{ sonarr['cf']['french-anime-tier-03']['trash_id'] }} | | [{{ sonarr['cf']['french-scene']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#fr-scene-groups) | {{ sonarr['cf']['french-scene']['trash_score'] }} | {{ sonarr['cf']['french-scene']['trash_id'] }} | | [{{ sonarr['cf']['french-anime-fansub']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#fr-anime-fansub) | {{ sonarr['cf']['french-anime-fansub']['trash_score'] }} or `1000` | {{ sonarr['cf']['french-anime-fansub']['trash_id'] }} | | [{{ sonarr['cf']['french-web-tier-01']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#fr-web-tier-01) | (optional) `1100` | {{ sonarr['cf']['french-web-tier-01']['trash_id'] }} | diff --git a/includes/french-guide/sonarr-cf-french-anime-scoring-fr.md b/includes/french-guide/sonarr-cf-french-anime-scoring-fr.md index b9d08ec14..42b6b1f83 100644 --- a/includes/french-guide/sonarr-cf-french-anime-scoring-fr.md +++ b/includes/french-guide/sonarr-cf-french-anime-scoring-fr.md @@ -3,6 +3,7 @@ | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------ | ------------------------------------------------------ | | [{{ sonarr['cf']['french-anime-tier-01']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#fr-anime-tier-01) | {{ sonarr['cf']['french-anime-tier-01']['trash_score'] }} | {{ sonarr['cf']['french-anime-tier-01']['trash_id'] }} | | [{{ sonarr['cf']['french-anime-tier-02']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#fr-anime-tier-02) | {{ sonarr['cf']['french-anime-tier-02']['trash_score'] }} | {{ sonarr['cf']['french-anime-tier-02']['trash_id'] }} | + | [{{ sonarr['cf']['french-anime-tier-03']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#fr-anime-tier-03) | {{ sonarr['cf']['french-anime-tier-03']['trash_score'] }} | {{ sonarr['cf']['french-anime-tier-03']['trash_id'] }} | | [{{ sonarr['cf']['french-scene']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#fr-scene-groups) | {{ sonarr['cf']['french-scene']['trash_score'] }} | {{ sonarr['cf']['french-scene']['trash_id'] }} | | [{{ sonarr['cf']['french-anime-fansub']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#fr-anime-fansub) | {{ sonarr['cf']['french-anime-fansub']['trash_score'] }} ou `1000` | {{ sonarr['cf']['french-anime-fansub']['trash_id'] }} | | [{{ sonarr['cf']['french-web-tier-01']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#fr-web-tier-01) | (optionnel) `1100` | {{ sonarr['cf']['french-web-tier-01']['trash_id'] }} | From f49f04e2222fca094fe695e8a39c518c8e2f7673 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Sun, 4 Jun 2023 20:09:34 +0200 Subject: [PATCH 06/23] Added a warning concerning the scoring of FR French Scene CF --- .../french-guide/radarr-cf-french-hd-bluray-web-scoring-en.md | 4 ++-- .../french-guide/radarr-cf-french-hd-bluray-web-scoring-fr.md | 4 ++-- .../french-guide/radarr-cf-french-remux-web-scoring-en.md | 4 ++-- .../french-guide/radarr-cf-french-remux-web-scoring-fr.md | 4 ++-- .../radarr-cf-french-uhd-bluray-web-scoring-en.md | 4 ++-- .../radarr-cf-french-uhd-bluray-web-scoring-fr.md | 4 ++-- includes/french-guide/sonarr-cf-french-web-scoring-en.md | 4 ++-- includes/french-guide/sonarr-cf-french-web-scoring-fr.md | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/includes/french-guide/radarr-cf-french-hd-bluray-web-scoring-en.md b/includes/french-guide/radarr-cf-french-hd-bluray-web-scoring-en.md index cd240a268..14406af88 100644 --- a/includes/french-guide/radarr-cf-french-hd-bluray-web-scoring-en.md +++ b/includes/french-guide/radarr-cf-french-hd-bluray-web-scoring-en.md @@ -5,10 +5,10 @@ | [{{ radarr['cf']['french-hd-bluray-tier-02']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-hd-bluray-tier-02) | {{ radarr['cf']['french-hd-bluray-tier-02']['trash_score'] }} | {{ radarr['cf']['french-hd-bluray-tier-02']['trash_id'] }} | | [{{ radarr['cf']['french-web-tier-01']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-web-tier-01) | {{ radarr['cf']['french-web-tier-01']['trash_score'] }} | {{ radarr['cf']['french-web-tier-01']['trash_id'] }} | | [{{ radarr['cf']['french-web-tier-02']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-web-tier-02) | {{ radarr['cf']['french-web-tier-02']['trash_score'] }} | {{ radarr['cf']['french-web-tier-02']['trash_id'] }} | - | [{{ radarr['cf']['french-scene']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-scene-groups) | ?????? | {{ radarr['cf']['french-scene']['trash_id'] }} | + | [{{ radarr['cf']['french-scene']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-scene-groups) | ?????? :warning: | {{ radarr['cf']['french-scene']['trash_id'] }} | !!! tip - French Scene groups are included as a fallback if you really want MULTi release despite a potential loss in quality. Either score the CF to `{{ radarr['cf']['french-scene']['trash_score'] }}` (default) or `0` depending on what you want to achieve. + :warning: French Scene groups are included as a fallback if you really want MULTi release despite a potential loss in quality. Either score the CF to `{{ radarr['cf']['french-scene']['trash_score'] }}` (default) or `0` depending on what you want to achieve. ??? info "Original mix (optional)" {! include-markdown "../../includes/cf/radarr-cf-hd-bluray-web-scoring.md" !} diff --git a/includes/french-guide/radarr-cf-french-hd-bluray-web-scoring-fr.md b/includes/french-guide/radarr-cf-french-hd-bluray-web-scoring-fr.md index 36ead4b7a..9a75f342d 100644 --- a/includes/french-guide/radarr-cf-french-hd-bluray-web-scoring-fr.md +++ b/includes/french-guide/radarr-cf-french-hd-bluray-web-scoring-fr.md @@ -5,10 +5,10 @@ | [{{ radarr['cf']['french-hd-bluray-tier-02']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-hd-bluray-tier-02) | {{ radarr['cf']['french-hd-bluray-tier-02']['trash_score'] }} | {{ radarr['cf']['french-hd-bluray-tier-02']['trash_id'] }} | | [{{ radarr['cf']['french-web-tier-01']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-web-tier-01) | {{ radarr['cf']['french-web-tier-01']['trash_score'] }} | {{ radarr['cf']['french-web-tier-01']['trash_id'] }} | | [{{ radarr['cf']['french-web-tier-02']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-web-tier-02) | {{ radarr['cf']['french-web-tier-02']['trash_score'] }} | {{ radarr['cf']['french-web-tier-02']['trash_id'] }} | - | [{{ radarr['cf']['french-scene']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-scene-groups) | ?????? | {{ radarr['cf']['french-scene']['trash_id'] }} | + | [{{ radarr['cf']['french-scene']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-scene-groups) | ?????? :warning: | {{ radarr['cf']['french-scene']['trash_id'] }} | !!! tip - Les groupes de la Scène française sont inclus comme substitut si vous voulez vraiment une version MULTi malgré une éventuelle perte de qualité. Vous pouvez lui attribuer un score de `{{ radarr['cf']['french-scene']['trash_score'] }}` (par défaut) ou de `0` selon ce que vous voulez obtenir. + :warning: Les groupes de la Scène française sont inclus comme substitut si vous voulez vraiment une version MULTi malgré une éventuelle perte de qualité. Vous pouvez lui attribuer un score de `{{ radarr['cf']['french-scene']['trash_score'] }}` (par défaut) ou de `0` selon ce que vous voulez obtenir. ??? info "Mix original (optionnel)" {! include-markdown "../../includes/cf/radarr-cf-hd-bluray-web-scoring.md" !} diff --git a/includes/french-guide/radarr-cf-french-remux-web-scoring-en.md b/includes/french-guide/radarr-cf-french-remux-web-scoring-en.md index cfaf705e9..19f9f12cb 100644 --- a/includes/french-guide/radarr-cf-french-remux-web-scoring-en.md +++ b/includes/french-guide/radarr-cf-french-remux-web-scoring-en.md @@ -5,10 +5,10 @@ | [{{ radarr['cf']['french-remux-tier-02']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-remux-tier-02) | {{ radarr['cf']['french-remux-tier-02']['trash_score'] }} | {{ radarr['cf']['french-remux-tier-02']['trash_id'] }} | | [{{ radarr['cf']['french-web-tier-01']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-web-tier-01) | {{ radarr['cf']['french-web-tier-01']['trash_score'] }} | {{ radarr['cf']['french-web-tier-01']['trash_id'] }} | | [{{ radarr['cf']['french-web-tier-02']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-web-tier-02) | {{ radarr['cf']['french-web-tier-02']['trash_score'] }} | {{ radarr['cf']['french-web-tier-02']['trash_id'] }} | - | [{{ radarr['cf']['french-scene']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-scene-groups) | ?????? | {{ radarr['cf']['french-scene']['trash_id'] }} | + | [{{ radarr['cf']['french-scene']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-scene-groups) | ?????? :warning: | {{ radarr['cf']['french-scene']['trash_id'] }} | !!! tip - French Scene groups are included as a fallback if you really want MULTi release despite a potential loss in quality. Either score the CF to `{{ radarr['cf']['french-scene']['trash_score'] }}` (default) or `0` depending on what you want to achieve. + :warning: French Scene groups are included as a fallback if you really want MULTi release despite a potential loss in quality. Either score the CF to `{{ radarr['cf']['french-scene']['trash_score'] }}` (default) or `0` depending on what you want to achieve. ??? info "Original mix (optional)" {! include-markdown "../../includes/cf/radarr-cf-remux-web-scoring.md" !} diff --git a/includes/french-guide/radarr-cf-french-remux-web-scoring-fr.md b/includes/french-guide/radarr-cf-french-remux-web-scoring-fr.md index dbccb3ea6..084ecf85e 100644 --- a/includes/french-guide/radarr-cf-french-remux-web-scoring-fr.md +++ b/includes/french-guide/radarr-cf-french-remux-web-scoring-fr.md @@ -5,10 +5,10 @@ | [{{ radarr['cf']['french-remux-tier-02']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-remux-tier-02) | {{ radarr['cf']['french-remux-tier-02']['trash_score'] }} | {{ radarr['cf']['french-remux-tier-02']['trash_id'] }} | | [{{ radarr['cf']['french-web-tier-01']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-web-tier-01) | {{ radarr['cf']['french-web-tier-01']['trash_score'] }} | {{ radarr['cf']['french-web-tier-01']['trash_id'] }} | | [{{ radarr['cf']['french-web-tier-02']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-web-tier-02) | {{ radarr['cf']['french-web-tier-02']['trash_score'] }} | {{ radarr['cf']['french-web-tier-02']['trash_id'] }} | - | [{{ radarr['cf']['french-scene']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-scene-groups) | ?????? | {{ radarr['cf']['french-scene']['trash_id'] }} | + | [{{ radarr['cf']['french-scene']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-scene-groups) | ?????? :warning: | {{ radarr['cf']['french-scene']['trash_id'] }} | !!! tip - Les groupes de la Scène française sont inclus comme substitut si vous voulez vraiment une version MULTi malgré une éventuelle perte de qualité. Vous pouvez lui attribuer un score de `{{ radarr['cf']['french-scene']['trash_score'] }}` (par défaut) ou de `0` selon ce que vous voulez obtenir. + :warning: Les groupes de la Scène française sont inclus comme substitut si vous voulez vraiment une version MULTi malgré une éventuelle perte de qualité. Vous pouvez lui attribuer un score de `{{ radarr['cf']['french-scene']['trash_score'] }}` (par défaut) ou de `0` selon ce que vous voulez obtenir. ??? info "Mix original (optionnel)" {! include-markdown "../../includes/cf/radarr-cf-remux-web-scoring.md" !} diff --git a/includes/french-guide/radarr-cf-french-uhd-bluray-web-scoring-en.md b/includes/french-guide/radarr-cf-french-uhd-bluray-web-scoring-en.md index accaa64eb..5836342fb 100644 --- a/includes/french-guide/radarr-cf-french-uhd-bluray-web-scoring-en.md +++ b/includes/french-guide/radarr-cf-french-uhd-bluray-web-scoring-en.md @@ -5,10 +5,10 @@ | [{{ radarr['cf']['french-uhd-bluray-tier-02']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-uhd-bluray-tier-02) | {{ radarr['cf']['french-uhd-bluray-tier-02']['trash_score'] }} | {{ radarr['cf']['french-uhd-bluray-tier-02']['trash_id'] }} | | [{{ radarr['cf']['french-web-tier-01']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-web-tier-01) | {{ radarr['cf']['french-web-tier-01']['trash_score'] }} | {{ radarr['cf']['french-web-tier-01']['trash_id'] }} | | [{{ radarr['cf']['french-web-tier-02']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-web-tier-02) | {{ radarr['cf']['french-web-tier-02']['trash_score'] }} | {{ radarr['cf']['french-web-tier-02']['trash_id'] }} | - | [{{ radarr['cf']['french-scene']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-scene-groups) | ?????? | {{ radarr['cf']['french-scene']['trash_id'] }} | + | [{{ radarr['cf']['french-scene']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-scene-groups) | ?????? :warning: | {{ radarr['cf']['french-scene']['trash_id'] }} | !!! tip - French Scene groups are included as a fallback if you really want MULTi release despite a potential loss in quality. Either score the CF to `{{ radarr['cf']['french-scene']['trash_score'] }}` (default) or `0` depending on what you want to achieve. + :warning: French Scene groups are included as a fallback if you really want MULTi release despite a potential loss in quality. Either score the CF to `{{ radarr['cf']['french-scene']['trash_score'] }}` (default) or `0` depending on what you want to achieve. ??? info "Original mix (optional)" {! include-markdown "../../includes/cf/radarr-cf-uhd-bluray-web-scoring.md" !} diff --git a/includes/french-guide/radarr-cf-french-uhd-bluray-web-scoring-fr.md b/includes/french-guide/radarr-cf-french-uhd-bluray-web-scoring-fr.md index 86daeef8c..58e2ca6c1 100644 --- a/includes/french-guide/radarr-cf-french-uhd-bluray-web-scoring-fr.md +++ b/includes/french-guide/radarr-cf-french-uhd-bluray-web-scoring-fr.md @@ -5,10 +5,10 @@ | [{{ radarr['cf']['french-uhd-bluray-tier-02']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-uhd-bluray-tier-02) | {{ radarr['cf']['french-uhd-bluray-tier-02']['trash_score'] }} | {{ radarr['cf']['french-uhd-bluray-tier-02']['trash_id'] }} | | [{{ radarr['cf']['french-web-tier-01']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-web-tier-01) | {{ radarr['cf']['french-web-tier-01']['trash_score'] }} | {{ radarr['cf']['french-web-tier-01']['trash_id'] }} | | [{{ radarr['cf']['french-web-tier-02']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-web-tier-02) | {{ radarr['cf']['french-web-tier-02']['trash_score'] }} | {{ radarr['cf']['french-web-tier-02']['trash_id'] }} | - | [{{ radarr['cf']['french-scene']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-scene-groups) | ?????? | {{ radarr['cf']['french-scene']['trash_id'] }} | + | [{{ radarr['cf']['french-scene']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#fr-scene-groups) | ?????? :warning: | {{ radarr['cf']['french-scene']['trash_id'] }} | !!! tip - Les groupes de la Scène française sont inclus comme substitut si vous voulez vraiment une version MULTi malgré une éventuelle perte de qualité. Vous pouvez lui attribuer un score de `{{ radarr['cf']['french-scene']['trash_score'] }}` (par défaut) ou de `0` selon ce que vous voulez obtenir. + :warning: Les groupes de la Scène française sont inclus comme substitut si vous voulez vraiment une version MULTi malgré une éventuelle perte de qualité. Vous pouvez lui attribuer un score de `{{ radarr['cf']['french-scene']['trash_score'] }}` (par défaut) ou de `0` selon ce que vous voulez obtenir. ??? info "Mix original (optionnel)" {! include-markdown "../../includes/cf/radarr-cf-uhd-bluray-web-scoring.md" !} diff --git a/includes/french-guide/sonarr-cf-french-web-scoring-en.md b/includes/french-guide/sonarr-cf-french-web-scoring-en.md index 645084fb6..c15ed5bfc 100644 --- a/includes/french-guide/sonarr-cf-french-web-scoring-en.md +++ b/includes/french-guide/sonarr-cf-french-web-scoring-en.md @@ -4,10 +4,10 @@ | [{{ sonarr['cf']['french-web-tier-01']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#fr-web-tier-01) | {{ sonarr['cf']['french-web-tier-01']['trash_score'] }} | {{ sonarr['cf']['french-web-tier-01']['trash_id'] }} | | [{{ sonarr['cf']['french-web-tier-02']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#fr-web-tier-02) | {{ sonarr['cf']['french-web-tier-02']['trash_score'] }} | {{ sonarr['cf']['french-web-tier-02']['trash_id'] }} | | [{{ sonarr['cf']['french-web-tier-03']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#fr-web-tier-03) | {{ sonarr['cf']['french-web-tier-03']['trash_score'] }} | {{ sonarr['cf']['french-web-tier-03']['trash_id'] }} | - | [{{ sonarr['cf']['french-scene']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#fr-scene-groups) | ?????? | {{ sonarr['cf']['french-scene']['trash_id'] }} | + | [{{ sonarr['cf']['french-scene']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#fr-scene-groups) | ?????? :warning: | {{ sonarr['cf']['french-scene']['trash_id'] }} | !!! tip - French Scene groups are included as a fallback if you really want MULTi release despite a potential loss in quality. Either score the CF to `{{ sonarr['cf']['french-scene']['trash_score'] }}` (default) or `0` depending on what you want to achieve. + :warning: French Scene groups are included as a fallback if you really want MULTi release despite a potential loss in quality. Either score the CF to `{{ sonarr['cf']['french-scene']['trash_score'] }}` (default) or `0` depending on what you want to achieve. ??? info "Original mix (optional)" {! include-markdown "../../includes/cf/sonarr-hq-source-group.md" !} diff --git a/includes/french-guide/sonarr-cf-french-web-scoring-fr.md b/includes/french-guide/sonarr-cf-french-web-scoring-fr.md index a5542de37..6fea3d6ac 100644 --- a/includes/french-guide/sonarr-cf-french-web-scoring-fr.md +++ b/includes/french-guide/sonarr-cf-french-web-scoring-fr.md @@ -4,10 +4,10 @@ | [{{ sonarr['cf']['french-web-tier-01']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#fr-web-tier-01) | {{ sonarr['cf']['french-web-tier-01']['trash_score'] }} | {{ sonarr['cf']['french-web-tier-01']['trash_id'] }} | | [{{ sonarr['cf']['french-web-tier-02']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#fr-web-tier-02) | {{ sonarr['cf']['french-web-tier-02']['trash_score'] }} | {{ sonarr['cf']['french-web-tier-02']['trash_id'] }} | | [{{ sonarr['cf']['french-web-tier-03']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#fr-web-tier-03) | {{ sonarr['cf']['french-web-tier-03']['trash_score'] }} | {{ sonarr['cf']['french-web-tier-03']['trash_id'] }} | - | [{{ sonarr['cf']['french-scene']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#fr-scene-groups) | ?????? | {{ sonarr['cf']['french-scene']['trash_id'] }} | + | [{{ sonarr['cf']['french-scene']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#fr-scene-groups) | ?????? :warning: | {{ sonarr['cf']['french-scene']['trash_id'] }} | !!! tip - Les groupes de la Scène française sont inclus comme substitut si vous voulez vraiment une version MULTi malgré une éventuelle perte de qualité. Vous pouvez lui attribuer un score de `{{ radarr['cf']['french-scene']['trash_score'] }}` (par défaut) ou de `0` selon ce que vous voulez obtenir. + :warning: Les groupes de la Scène française sont inclus comme substitut si vous voulez vraiment une version MULTi malgré une éventuelle perte de qualité. Vous pouvez lui attribuer un score de `{{ radarr['cf']['french-scene']['trash_score'] }}` (par défaut) ou de `0` selon ce que vous voulez obtenir. ??? info "Mix original (optionnel)" {! include-markdown "../../includes/cf/sonarr-hq-source-group.md" !} From cc048c5768cfa139a78f555d0cedae8a0921a1e2 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Sun, 4 Jun 2023 20:27:03 +0200 Subject: [PATCH 07/23] Added `FR Anime Tier 03` CF to recyclarr configs --- docs/recyclarr-configs/sonarr/french-anime-multi-v4.yml | 1 + docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/recyclarr-configs/sonarr/french-anime-multi-v4.yml b/docs/recyclarr-configs/sonarr/french-anime-multi-v4.yml index b7eabe919..c76c2f016 100644 --- a/docs/recyclarr-configs/sonarr/french-anime-multi-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-anime-multi-v4.yml @@ -58,6 +58,7 @@ sonarr: # ===== HQ Source Groups ===== - db13a377f7afb29975ea39470434d2ef # FR Anime Tier 01 - 4e6134a384dbc0ef166234cc0e45d26d # FR Anime Tier 02 + - db34d4357937fbfe89b63ba095f22155 # FR Anime Tier 03 - 2f3422339d185eb227a324644a2fbfca # FR Scene Groups # Les tiers suivant sont les tiers originaux du guide (groupes SeaDex) # vous pouvez les activer si vous souhaitez aussi récupérer les releases en SeaDex diff --git a/docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml b/docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml index 10b2a128c..70898fe1f 100644 --- a/docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml @@ -51,6 +51,7 @@ sonarr: # ===== HQ Source Groups ===== - db13a377f7afb29975ea39470434d2ef # FR Anime Tier 01 - 4e6134a384dbc0ef166234cc0e45d26d # FR Anime Tier 02 + - db34d4357937fbfe89b63ba095f22155 # FR Anime Tier 03 - 2f3422339d185eb227a324644a2fbfca # FR Scene Groups # Les tiers suivant sont les tiers originaux du guide (groupes SeaDex) # vous pouvez les activer si vous souhaitez aussi récupérer les releases en SeaDex From dcdec23b9ed2cc84435185917fb49b37c303c8ab Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Sun, 4 Jun 2023 20:28:12 +0200 Subject: [PATCH 08/23] Fix wrong hyperlink --- docs/Sonarr/sonarr-collection-of-custom-formats.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Sonarr/sonarr-collection-of-custom-formats.md b/docs/Sonarr/sonarr-collection-of-custom-formats.md index d858129cb..c600fc119 100644 --- a/docs/Sonarr/sonarr-collection-of-custom-formats.md +++ b/docs/Sonarr/sonarr-collection-of-custom-formats.md @@ -81,7 +81,7 @@ I also made 3 guides related to this one. | [MPEG2](#mpeg2) | [Obfuscated](#obfuscated) | [VOF](#vof) | [FR WEB Tier 03](#fr-web-tier-03) | | [x264](#x264) | [Retags](#retags) | [VFI](#vfi) | [FR Anime Tier 01](#fr-anime-tier-01) | | [x265](#x265) | [Scene](#scene) | [VF2](#vf2) | [FR Anime Tier 02](#fr-anime-tier-02) | -| | [Season Packs](#season-pack) | [VFQ](#vfq) | [FR Anime Tier 03](#fr-anime-tier-02) | +| | [Season Packs](#season-pack) | [VFQ](#vfq) | [FR Anime Tier 03](#fr-anime-tier-03) | | | [x265 (no HDR/DV)](#x265-no-hdrdv) | [VQ](#vq) | [FR Anime FanSub](#fr-anime-fansub) | | | [AV1](#av1) | [VFB](#vfb) | [FR Scene Groups](#fr-scene-groups) | | | [SDR](#sdr) | [VOSTFR](#vostfr) | [FR LQ](#fr-lq) | From 584aedabfeb30b8896c5aa3315145ce1787985ba Mon Sep 17 00:00:00 2001 From: TRaSH Date: Wed, 7 Jun 2023 19:11:00 +0200 Subject: [PATCH 09/23] # 2023-06-07 19:10 --- docs/updates.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/docs/updates.txt b/docs/updates.txt index c49c3a4cd..2785130b5 100644 --- a/docs/updates.txt +++ b/docs/updates.txt @@ -1,3 +1,21 @@ +# 2023-06-07 19:10 +**[New]** +- [Star-FR] Updated French Anime Tiers CFs to better score groups +-- Added a French Anime Tier 03 +-- Moved existing groups to fitting tier +-- Added `GundamGuy` and `OECUF` to Tier 02 +-- Added `Galactic`, `KushEnthusiast` and `TheFantastics` to Tier 03 +-- Deleted `KFR` and `Otaku-Attitude` from FanSub tier as their releases are no more available +-- Fixed `Team-Arcedo` not recognising `Arcedo` +**[Updated]** +- [Starr-FR] Added a warning concerning the scoring of the `FR Scene Groups` CF +- [Star-FR] Updated Recyclarr configs with `MAX` and `Remux Tier 03` CFs +- [Sonarr-FR] Added `FR Anime Tier 03` CF to recyclarr configs +**[Fixes]** +- [Starr-FR] Fixed `Multi-Audio` CF to not match `Multi-Subs` +- [Sonar-FR] Fixed `Canal+` CF thanks to comment from #1227 +- [Sonar-FR] Fixed Recyclarr configs with wrong `VF2` ID + # 2023-06-01 22:25 **[New]** - None From a27023b01b3235c5bf2b4e2ad76761dc5423ff31 Mon Sep 17 00:00:00 2001 From: bokkoman Date: Thu, 8 Jun 2023 14:38:46 +0200 Subject: [PATCH 10/23] Update Synology.md --- docs/Hardlinks/How-to-setup-for/Synology.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Hardlinks/How-to-setup-for/Synology.md b/docs/Hardlinks/How-to-setup-for/Synology.md index e074e120f..a4deb4a92 100644 --- a/docs/Hardlinks/How-to-setup-for/Synology.md +++ b/docs/Hardlinks/How-to-setup-for/Synology.md @@ -21,7 +21,7 @@ This page will provide you with guidance on how to install several Docker images !!! Warning Though, we offer a short way out. This is intended as a quick way to do everything that is written on this page within one script. And is only for initial setup. After that, you need to manage it yourself. Rerunning the script will reset all personal changes made in the compose/env. - The script is only tested on Synology DSM7.1. + The script is only tested on Synology DSM7 and higher. **:bangbang: We are not held reliable if anything breaks on your system. Use at your own risk :bangbang:** From b76075a547c894cf12124de669dd5b8736a93052 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Sat, 10 Jun 2023 05:36:12 +0300 Subject: [PATCH 11/23] Added: `Extras` CF for Sonarr --- docs/Sonarr/Sonarr-Release-Profile-RegEx.md | 10 ++++++++++ docs/json/sonarr/cf/extras.json | 18 ++++++++++++++++++ docs/json/sonarr/rp/optionals.json | 4 ++++ 3 files changed, 32 insertions(+) create mode 100644 docs/json/sonarr/cf/extras.json diff --git a/docs/Sonarr/Sonarr-Release-Profile-RegEx.md b/docs/Sonarr/Sonarr-Release-Profile-RegEx.md index f0eb7885b..e5cbdff8d 100644 --- a/docs/Sonarr/Sonarr-Release-Profile-RegEx.md +++ b/docs/Sonarr/Sonarr-Release-Profile-RegEx.md @@ -466,6 +466,16 @@ Add this to your `Preferred (3)` with a score of [-10000] ------ +#### Optional - Dislike Extras + +Add this to your `Preferred (3)` with a score of [-10000] + +```bash +/(?<=\bS\d+\b).*\b(Extras|Bonus)\b/i +``` + +------ + #### Optional - Prefer Season Packs ??? question "Explanation - [CLICK TO EXPAND]" diff --git a/docs/json/sonarr/cf/extras.json b/docs/json/sonarr/cf/extras.json new file mode 100644 index 000000000..2a5de6c5d --- /dev/null +++ b/docs/json/sonarr/cf/extras.json @@ -0,0 +1,18 @@ +{ + "trash_id": "fbcb31d8dabd2a319072b84fc0b7249c", + "trash_score": "-10000", + "trash_regex": "https://regex101.com/r/lZ9iTm/1", + "name": "Extras", + "includeCustomFormatWhenRenaming": false, + "specifications": [ + { + "name": "Extras", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": true, + "fields": { + "value": "(?<=\\bS\\d+\\b).*\\b(Extras|Bonus)\\b" + } + } + ] +} diff --git a/docs/json/sonarr/rp/optionals.json b/docs/json/sonarr/rp/optionals.json index f8d5dec89..421b5bee6 100644 --- a/docs/json/sonarr/rp/optionals.json +++ b/docs/json/sonarr/rp/optionals.json @@ -66,6 +66,10 @@ "name": "Dislike release containing: 1-", "trash_id": "236a3626a07cacf5692c73cc947bc280", "term": "/(? Date: Sat, 10 Jun 2023 19:08:22 +0200 Subject: [PATCH 12/23] Added: to Sonarr v4 Guide - Added: to Sonarr v4 Guide --- .../sonarr-collection-of-custom-formats.md | 17 ++++++++++++++++- includes/cf/sonarr-unwanted-uhd.md | 10 ++++++---- includes/cf/sonarr-unwanted.md | 13 ++++++++----- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/docs/Sonarr/sonarr-collection-of-custom-formats.md b/docs/Sonarr/sonarr-collection-of-custom-formats.md index c600fc119..f13352079 100644 --- a/docs/Sonarr/sonarr-collection-of-custom-formats.md +++ b/docs/Sonarr/sonarr-collection-of-custom-formats.md @@ -50,7 +50,7 @@ I also made 3 guides related to this one. | [Hybrid](#hybrid) | [BR-DISK](#br-disk) | [Remux Tier 01](#remux-tier-01) | [Amazon](#amzn) | | [Remaster](#remaster) | [LQ](#lq) | [Remux Tier 02](#remux-tier-02) | [Apple TV+](#atvp) | | | [x265 (HD)](#x265-hd) | [HD Bluray Tier 01](#hd-bluray-tier-01) | [DC Universe](#dcu) | -| | | [HD Bluray Tier 02](#hd-bluray-tier-02) | [Disney+](#dsnp) | +| | [Extras](#extras) | [HD Bluray Tier 02](#hd-bluray-tier-02) | [Disney+](#dsnp) | | | | [WEB Tier 01](#web-tier-01) | [HBO Max](#hmax) | | | | [WEB Tier 02](#web-tier-02) | [HBO](#hbo) | | | | [WEB Tier 03](#web-tier-03) | [Max](#max) | @@ -816,6 +816,21 @@ I also made 3 guides related to this one. ------ +### Extras + +??? question "Extras - [CLICK TO EXPAND]" + + This blocks/ignores Extra's + +??? example "JSON - [CLICK TO EXPAND]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/extras-hd.json' %]][[% endfilter %]] + ``` + +[TOP](#index) +------ + ## Misc ------ diff --git a/includes/cf/sonarr-unwanted-uhd.md b/includes/cf/sonarr-unwanted-uhd.md index 0aa05b1b3..0b44491d8 100644 --- a/includes/cf/sonarr-unwanted-uhd.md +++ b/includes/cf/sonarr-unwanted-uhd.md @@ -1,8 +1,9 @@ ??? abstract "Unwanted UHD - [CLICK TO EXPAND]" - | Custom Format | Score | Trash ID | - | ------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------- | ------------------------------------------------- | - | [{{ sonarr['cf']['br-disk']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#br-disk) | {{ sonarr['cf']['br-disk']['trash_score'] }} | {{ sonarr['cf']['br-disk']['trash_id'] }} | - | [{{ sonarr['cf']['lq']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#lq) | {{ sonarr['cf']['lq']['trash_score'] }} | {{ sonarr['cf']['lq']['trash_id'] }} | + | Custom Format | Score | Trash ID | + | --------------------------------------------------------------------------------------------- | -------------------------------------------- | ----------------------------------------- | + | [{{ sonarr['cf']['br-disk']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#br-disk) | {{ sonarr['cf']['br-disk']['trash_score'] }} | {{ sonarr['cf']['br-disk']['trash_id'] }} | + | [{{ sonarr['cf']['lq']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#lq) | {{ sonarr['cf']['lq']['trash_score'] }} | {{ sonarr['cf']['lq']['trash_id'] }} | + | [{{ sonarr['cf']['extras']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#extras) | {{ sonarr['cf']['extras']['trash_score'] }} | {{ sonarr['cf']['extras']['trash_id'] }} | ------ @@ -10,3 +11,4 @@ - **{{ sonarr['cf']['br-disk']['name'] }} :** This is a custom format to help Sonarr recognize & ignore BR-DISK (ISO's and Blu-ray folder structure) in addition to the standard BR-DISK quality. - **{{ sonarr['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. + - **{{ sonarr['cf']['extras']['name'] }}:** This blocks/ignores extra's diff --git a/includes/cf/sonarr-unwanted.md b/includes/cf/sonarr-unwanted.md index f3b182a55..740974a89 100644 --- a/includes/cf/sonarr-unwanted.md +++ b/includes/cf/sonarr-unwanted.md @@ -1,9 +1,10 @@ ??? abstract "Unwanted - [CLICK TO EXPAND]" - | Custom Format | Score | Trash ID | - | ------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------- | ------------------------------------------------- | - | [{{ sonarr['cf']['br-disk']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#br-disk) | {{ sonarr['cf']['br-disk']['trash_score'] }} | {{ sonarr['cf']['br-disk']['trash_id'] }} | - | [{{ sonarr['cf']['lq']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#lq) | {{ sonarr['cf']['lq']['trash_score'] }} | {{ sonarr['cf']['lq']['trash_id'] }} | - | [{{ sonarr['cf']['x265-hd']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#x265-hd) :warning: | {{ sonarr['cf']['x265-hd']['trash_score'] }} | {{ sonarr['cf']['x265-hd']['trash_id'] }} | + | Custom Format | Score | Trash ID | + | ------------------------------------------------------------------------------------------------------- | -------------------------------------------- | ----------------------------------------- | + | [{{ sonarr['cf']['br-disk']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#br-disk) | {{ sonarr['cf']['br-disk']['trash_score'] }} | {{ sonarr['cf']['br-disk']['trash_id'] }} | + | [{{ sonarr['cf']['lq']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#lq) | {{ sonarr['cf']['lq']['trash_score'] }} | {{ sonarr['cf']['lq']['trash_id'] }} | + | [{{ sonarr['cf']['x265-hd']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#x265-hd) :warning: | {{ sonarr['cf']['x265-hd']['trash_score'] }} | {{ sonarr['cf']['x265-hd']['trash_id'] }} | + | [{{ sonarr['cf']['extras']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#extras) | {{ sonarr['cf']['extras']['trash_score'] }} | {{ sonarr['cf']['extras']['trash_id'] }} | ------ @@ -14,3 +15,5 @@ - **{{ sonarr['cf']['x265-hd']['name'] }}:** This blocks 720/1080p (HD) releases that are encoded in x265. - More info [HERE](/Misc/x265-4k/){:target="_blank" rel="noopener noreferrer"}. !!! Danger "Don't use this together with [{{ sonarr['cf']['x265-no-hdrdv']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#x265-no-hdrdv), Only ever include one of them :warning:" + + - **{{ sonarr['cf']['extras']['name'] }}:** This blocks/ignores extra's From 3bac25d12e3218debe2c55d34a043c2d6321cd47 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Sat, 10 Jun 2023 19:11:09 +0200 Subject: [PATCH 13/23] Fixed: MD003 Header style --- docs/Sonarr/sonarr-collection-of-custom-formats.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Sonarr/sonarr-collection-of-custom-formats.md b/docs/Sonarr/sonarr-collection-of-custom-formats.md index f13352079..79e574ea5 100644 --- a/docs/Sonarr/sonarr-collection-of-custom-formats.md +++ b/docs/Sonarr/sonarr-collection-of-custom-formats.md @@ -829,6 +829,7 @@ I also made 3 guides related to this one. ``` [TOP](#index) + ------ ## Misc From 9d29e42144d1bd11d91d4e2a499f6c6d91149f91 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Sat, 10 Jun 2023 20:37:05 +0300 Subject: [PATCH 14/23] Added: `EDITH` as scene group --- docs/Sonarr/Sonarr-Release-Profile-RegEx.md | 2 +- docs/json/radarr/cf/scene.json | 2 +- docs/json/sonarr/cf/scene.json | 2 +- docs/json/sonarr/rp/optionals.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/Sonarr/Sonarr-Release-Profile-RegEx.md b/docs/Sonarr/Sonarr-Release-Profile-RegEx.md index e5cbdff8d..1e38ee2cc 100644 --- a/docs/Sonarr/Sonarr-Release-Profile-RegEx.md +++ b/docs/Sonarr/Sonarr-Release-Profile-RegEx.md @@ -550,7 +550,7 @@ Add this to your `Must not contain (2)` Add this to your `Must not contain (2)` ```bash -/^(?!.*(web[ ]dl|-deflate|-inflate))(?=.*([_. ]WEB[_. ])(?!DL)\b)|\b(-CAKES|-GGEZ|-GGWP|-GLHF|-GOSSIP|-NAISU|-KOGI|-PECULATE|-SLOT).*/i +/^(?!.*(web[ ]dl|-deflate|-inflate))(?=.*([_. ]WEB[_. ])(?!DL)\b)|\b(-CAKES|-GGEZ|-GGWP|-GLHF|-GOSSIP|-NAISU|-KOGI|-PECULATE|-SLOT|-EDITH).*/i ``` diff --git a/docs/json/radarr/cf/scene.json b/docs/json/radarr/cf/scene.json index 9d1c20b67..72fb37ec2 100644 --- a/docs/json/radarr/cf/scene.json +++ b/docs/json/radarr/cf/scene.json @@ -11,7 +11,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*([_. ]WEB[_. ])(?!DL)\\b)|\\b(-CAKES|-GGEZ|-GGWP|-GLHF|-GOSSIP|-NAISU|-KOGI|-PECULATE|-SLOT)" + "value": "^(?=.*([_. ]WEB[_. ])(?!DL)\\b)|\\b(-CAKES|-GGEZ|-GGWP|-GLHF|-GOSSIP|-NAISU|-KOGI|-PECULATE|-SLOT|-EDITH)" } }, { diff --git a/docs/json/sonarr/cf/scene.json b/docs/json/sonarr/cf/scene.json index 0a1b3e2a4..a6366ea53 100644 --- a/docs/json/sonarr/cf/scene.json +++ b/docs/json/sonarr/cf/scene.json @@ -11,7 +11,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*([_. ]WEB[_. ])(?!DL)\\b)|\\b(-CAKES|-GGEZ|-GGWP|-GLHF|-GOSSIP|-NAISU|-KOGI|-PECULATE|-SLOT)" + "value": "^(?=.*([_. ]WEB[_. ])(?!DL)\\b)|\\b(-CAKES|-GGEZ|-GGWP|-GLHF|-GOSSIP|-NAISU|-KOGI|-PECULATE|-SLOT|-EDITH)" } }, { diff --git a/docs/json/sonarr/rp/optionals.json b/docs/json/sonarr/rp/optionals.json index 421b5bee6..2ec2bde66 100644 --- a/docs/json/sonarr/rp/optionals.json +++ b/docs/json/sonarr/rp/optionals.json @@ -16,7 +16,7 @@ }, { "name": "Ignore so called scene releases", "trash_id": "5bc23c3a055a1a5d8bbe4fb49d80e0cb", - "term": "/^(?!.*(web[ ]dl|-deflate|-inflate))(?=.*([_. ]WEB[_. ])(?!DL)\\b)|\\b(-CAKES|-GGEZ|-GGWP|-GLHF|-GOSSIP|-NAISU|-KOGI|-PECULATE|-SLOT).*/i" + "term": "/^(?!.*(web[ ]dl|-deflate|-inflate))(?=.*([_. ]WEB[_. ])(?!DL)\\b)|\\b(-CAKES|-GGEZ|-GGWP|-GLHF|-GOSSIP|-NAISU|-KOGI|-PECULATE|-SLOT|-EDITH).*/i" }, { "name": "Ignore Bad Dual Audio Groups", "trash_id": "538bad00ee6f8aced8e0db5218b8484c", From 494f2584aa3822c423558aa4c1ed8f3f38926a2e Mon Sep 17 00:00:00 2001 From: nuxen <47067662+nuxencs@users.noreply.github.com> Date: Sat, 10 Jun 2023 20:27:53 +0200 Subject: [PATCH 15/23] feat(radarr): add CiNEPHiLES to Remux Tier 03 --- docs/json/radarr/cf/remux-tier-03.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/json/radarr/cf/remux-tier-03.json b/docs/json/radarr/cf/remux-tier-03.json index ab25b8ca7..04c383cc5 100644 --- a/docs/json/radarr/cf/remux-tier-03.json +++ b/docs/json/radarr/cf/remux-tier-03.json @@ -13,6 +13,15 @@ "value": 5 } }, + { + "name": "CiNEPHiLES", + "implementation": "ReleaseGroupSpecification", + "negate": false, + "required": false, + "fields": { + "value": "^(CiNEPHiLES)$" + } + }, { "name": "decibeL", "implementation": "ReleaseGroupSpecification", From ac04b865385b3a9f95b100e4ba2989ad88a13e6c Mon Sep 17 00:00:00 2001 From: nuxen <47067662+nuxencs@users.noreply.github.com> Date: Sat, 10 Jun 2023 20:31:25 +0200 Subject: [PATCH 16/23] feat(radarr): add CiNE & SLOT to LQ --- docs/json/radarr/cf/lq.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/docs/json/radarr/cf/lq.json b/docs/json/radarr/cf/lq.json index a0350a142..d1a7574ea 100644 --- a/docs/json/radarr/cf/lq.json +++ b/docs/json/radarr/cf/lq.json @@ -112,6 +112,15 @@ "value": "^(CHD)$" } }, + { + "name": "CiNE", + "implementation": "ReleaseGroupSpecification", + "negate": false, + "required": false, + "fields": { + "value": "^(CiNE)$" + } + }, { "name": "CREATiVE24", "implementation": "ReleaseGroupSpecification", @@ -562,6 +571,15 @@ "value": "^(Scene)$" } }, + { + "name": "SLOT", + "implementation": "ReleaseGroupSpecification", + "negate": false, + "required": false, + "fields": { + "value": "^(SLOT)$" + } + }, { "name": "STUTTERSHIT", "implementation": "ReleaseGroupSpecification", From 1ea26505ad6c4d43197d54a1a26a061a3eb12b38 Mon Sep 17 00:00:00 2001 From: nuxen <47067662+nuxencs@users.noreply.github.com> Date: Sat, 10 Jun 2023 20:36:03 +0200 Subject: [PATCH 17/23] fix(starr): match PQ in x265 (no HDR/DV) CF --- docs/json/radarr/cf/x265-no-hdrdv.json | 2 +- docs/json/sonarr/cf/x265-no-hdrdv.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/json/radarr/cf/x265-no-hdrdv.json b/docs/json/radarr/cf/x265-no-hdrdv.json index 391e500a1..3a5289589 100644 --- a/docs/json/radarr/cf/x265-no-hdrdv.json +++ b/docs/json/radarr/cf/x265-no-hdrdv.json @@ -20,7 +20,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(dv|dovi|dolby[ .]?vision|hdr(10(P(lus)?)?)?)\\b" + "value": "\\b(dv|dovi|dolby[ .]?vision|hdr(10(P(lus)?)?)?|pq)\\b" } }, { diff --git a/docs/json/sonarr/cf/x265-no-hdrdv.json b/docs/json/sonarr/cf/x265-no-hdrdv.json index 0ac2fd6bf..60963ff8d 100644 --- a/docs/json/sonarr/cf/x265-no-hdrdv.json +++ b/docs/json/sonarr/cf/x265-no-hdrdv.json @@ -20,7 +20,7 @@ "negate": true, "required": true, "fields": { - "value": "\\b(dv|dovi|dolby[ .]?vision|hdr(10(P(lus)?)?)?)\\b" + "value": "\\b(dv|dovi|dolby[ .]?vision|hdr(10(P(lus)?)?)?|pq)\\b" } }, { From 04a33e184e233b8e010b9322962aeafdbb4ffd65 Mon Sep 17 00:00:00 2001 From: nuxen <47067662+nuxencs@users.noreply.github.com> Date: Sat, 10 Jun 2023 20:52:31 +0200 Subject: [PATCH 18/23] fix(guide): macro issue --- docs/Sonarr/sonarr-collection-of-custom-formats.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Sonarr/sonarr-collection-of-custom-formats.md b/docs/Sonarr/sonarr-collection-of-custom-formats.md index 79e574ea5..9567e1319 100644 --- a/docs/Sonarr/sonarr-collection-of-custom-formats.md +++ b/docs/Sonarr/sonarr-collection-of-custom-formats.md @@ -825,7 +825,7 @@ I also made 3 guides related to this one. ??? example "JSON - [CLICK TO EXPAND]" ```json - [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/extras-hd.json' %]][[% endfilter %]] + [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/extras.json' %]][[% endfilter %]] ``` [TOP](#index) From 27c4f74cdd2a0e5e621bf4a7e04ef16b6caf7e7b Mon Sep 17 00:00:00 2001 From: Appoxo Date: Sun, 11 Jun 2023 18:53:25 +0200 Subject: [PATCH 19/23] Update Radarr-collection-of-custom-formats.md Added description for DTS-HD RSA --- docs/Radarr/Radarr-collection-of-custom-formats.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/Radarr/Radarr-collection-of-custom-formats.md b/docs/Radarr/Radarr-collection-of-custom-formats.md index aee4679b3..df8ba9c7f 100644 --- a/docs/Radarr/Radarr-collection-of-custom-formats.md +++ b/docs/Radarr/Radarr-collection-of-custom-formats.md @@ -241,7 +241,18 @@ I also made 3 guides related to this one. ### DTS-HD HRA ??? question "DTS-HD HRA - [CLICK TO EXPAND]" - Description placeholder + [From Wikipedia, the free encyclopedia](https://de.wikipedia.org/wiki/Digital_Theater_Systems_High_Definition){:target="_blank" rel="noopener noreferrer"} + DTS-HD HRA is the lossy version of DTS-HD MA. + + | Codec | DTS-HRA | DTS-MA | + |---------------|-------------------|-------------------| + | Lossy/Lossles | Lossy | Lossless | + | Data rate | 1.5 - 6.0 Mbit/s | VBR - 24.5 Mbit/s | + | Channels | Up to 7.1 ch | Up to 7.1 ch | + | Sampling Freq.| 96 kHz | 192 kHz | + | Resolution | - | Up to 24-bit | + + Advanced Audio Coding (AAC) is an audio coding standard for lossy digital audio compression. Designed to be the successor of the MP3 format, AAC generally achieves higher sound quality than MP3 at the same bit rate. ??? example "JSON - [CLICK TO EXPAND]" From 73041dc7a73f8697d267e0659acfa35d42debe59 Mon Sep 17 00:00:00 2001 From: Appoxo Date: Sun, 11 Jun 2023 19:18:33 +0200 Subject: [PATCH 20/23] Update Radarr-collection-of-custom-formats.md Removed example I used from AAC --- docs/Radarr/Radarr-collection-of-custom-formats.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/Radarr/Radarr-collection-of-custom-formats.md b/docs/Radarr/Radarr-collection-of-custom-formats.md index df8ba9c7f..03ae6d8d2 100644 --- a/docs/Radarr/Radarr-collection-of-custom-formats.md +++ b/docs/Radarr/Radarr-collection-of-custom-formats.md @@ -251,8 +251,6 @@ I also made 3 guides related to this one. | Channels | Up to 7.1 ch | Up to 7.1 ch | | Sampling Freq.| 96 kHz | 192 kHz | | Resolution | - | Up to 24-bit | - - Advanced Audio Coding (AAC) is an audio coding standard for lossy digital audio compression. Designed to be the successor of the MP3 format, AAC generally achieves higher sound quality than MP3 at the same bit rate. ??? example "JSON - [CLICK TO EXPAND]" From 6c06556427ac91505f70d3bac53b9d5e7828dbac Mon Sep 17 00:00:00 2001 From: Appoxo Date: Sun, 11 Jun 2023 19:50:08 +0200 Subject: [PATCH 21/23] Changed source and provided table where to find what --- docs/Radarr/Radarr-collection-of-custom-formats.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/Radarr/Radarr-collection-of-custom-formats.md b/docs/Radarr/Radarr-collection-of-custom-formats.md index 03ae6d8d2..057f2d45f 100644 --- a/docs/Radarr/Radarr-collection-of-custom-formats.md +++ b/docs/Radarr/Radarr-collection-of-custom-formats.md @@ -241,9 +241,14 @@ I also made 3 guides related to this one. ### DTS-HD HRA ??? question "DTS-HD HRA - [CLICK TO EXPAND]" - [From Wikipedia, the free encyclopedia](https://de.wikipedia.org/wiki/Digital_Theater_Systems_High_Definition){:target="_blank" rel="noopener noreferrer"} + [Technical Whitepaper](https://www.opusproductions.com/pdfs/DTS_HD_WhitePaper.pdf){:target="_blank" rel="noopener noreferrer"} + | Codec | Page | Paragraph | + |------------|--------|-----------| + | DTS-HD MA | Page 6 | 5.1.1 | + | DTS-HD HRA | Page 7 | 5.1.2 | + DTS-HD HRA is the lossy version of DTS-HD MA. - + | Codec | DTS-HRA | DTS-MA | |---------------|-------------------|-------------------| | Lossy/Lossles | Lossy | Lossless | From 17f3864aa09e16f4da12564d0767ed2f67335a8d Mon Sep 17 00:00:00 2001 From: TRaSH Date: Sun, 11 Jun 2023 22:33:58 +0200 Subject: [PATCH 22/23] Fixed: ident/formatting --- .../Radarr-collection-of-custom-formats.md | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/Radarr/Radarr-collection-of-custom-formats.md b/docs/Radarr/Radarr-collection-of-custom-formats.md index 057f2d45f..33e2e4b54 100644 --- a/docs/Radarr/Radarr-collection-of-custom-formats.md +++ b/docs/Radarr/Radarr-collection-of-custom-formats.md @@ -241,21 +241,23 @@ I also made 3 guides related to this one. ### DTS-HD HRA ??? question "DTS-HD HRA - [CLICK TO EXPAND]" + [Technical Whitepaper](https://www.opusproductions.com/pdfs/DTS_HD_WhitePaper.pdf){:target="_blank" rel="noopener noreferrer"} + | Codec | Page | Paragraph | - |------------|--------|-----------| + | ---------- | ------ | --------- | | DTS-HD MA | Page 6 | 5.1.1 | | DTS-HD HRA | Page 7 | 5.1.2 | DTS-HD HRA is the lossy version of DTS-HD MA. - | Codec | DTS-HRA | DTS-MA | - |---------------|-------------------|-------------------| - | Lossy/Lossles | Lossy | Lossless | - | Data rate | 1.5 - 6.0 Mbit/s | VBR - 24.5 Mbit/s | - | Channels | Up to 7.1 ch | Up to 7.1 ch | - | Sampling Freq.| 96 kHz | 192 kHz | - | Resolution | - | Up to 24-bit | + | Codec | DTS-HRA | DTS-MA | + | -------------- | ---------------- | ----------------- | + | Lossy/lossless | Lossy | Lossless | + | Data rate | 1.5 - 6.0 Mbit/s | VBR - 24.5 Mbit/s | + | Channels | Up to 7.1 ch | Up to 7.1 ch | + | Sampling Freq. | 96 kHz | 192 kHz | + | Resolution | - | Up to 24-bit | ??? example "JSON - [CLICK TO EXPAND]" From 404a11424bfbf9795670d507d07ae41b7e851316 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Sun, 11 Jun 2023 22:34:23 +0200 Subject: [PATCH 23/23] Added description also to Sonarr v4 --- .../sonarr-collection-of-custom-formats.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/docs/Sonarr/sonarr-collection-of-custom-formats.md b/docs/Sonarr/sonarr-collection-of-custom-formats.md index 9567e1319..d3f575762 100644 --- a/docs/Sonarr/sonarr-collection-of-custom-formats.md +++ b/docs/Sonarr/sonarr-collection-of-custom-formats.md @@ -253,7 +253,23 @@ I also made 3 guides related to this one. ### DTS-HD HRA ??? question "DTS-HD HRA - [CLICK TO EXPAND]" - Description placeholder + + [Technical Whitepaper](https://www.opusproductions.com/pdfs/DTS_HD_WhitePaper.pdf){:target="_blank" rel="noopener noreferrer"} + + | Codec | Page | Paragraph | + | ---------- | ------ | --------- | + | DTS-HD MA | Page 6 | 5.1.1 | + | DTS-HD HRA | Page 7 | 5.1.2 | + + DTS-HD HRA is the lossy version of DTS-HD MA. + + | Codec | DTS-HRA | DTS-MA | + | -------------- | ---------------- | ----------------- | + | Lossy/lossless | Lossy | Lossless | + | Data rate | 1.5 - 6.0 Mbit/s | VBR - 24.5 Mbit/s | + | Channels | Up to 7.1 ch | Up to 7.1 ch | + | Sampling Freq. | 96 kHz | 192 kHz | + | Resolution | - | Up to 24-bit | ??? example "JSON - [CLICK TO EXPAND]"