From f595daa8ebe3fb4cf20285d4364688b3204a1913 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Wed, 19 Apr 2023 16:01:08 +0200 Subject: [PATCH 01/24] Update groups CFs to avoid double scoring This should negate double scoring in case of `-RlsGrp-RlsGrp` --- .../radarr/cf/french-hd-bluray-tier-01.json | 14 +++--- .../radarr/cf/french-hd-bluray-tier-02.json | 22 ++++----- docs/json/radarr/cf/french-remux-tier-01.json | 20 ++++---- docs/json/radarr/cf/french-remux-tier-02.json | 20 ++++---- docs/json/radarr/cf/french-scene.json | 46 +++++++++---------- .../radarr/cf/french-uhd-bluray-tier-01.json | 8 ++-- .../radarr/cf/french-uhd-bluray-tier-02.json | 8 ++-- docs/json/radarr/cf/french-web-tier-01.json | 20 ++++---- docs/json/radarr/cf/french-web-tier-02.json | 20 ++++---- docs/json/sonarr/cf/french-anime-fansub.json | 22 ++++----- docs/json/sonarr/cf/french-anime-tier-01.json | 22 ++++----- docs/json/sonarr/cf/french-anime-tier-02.json | 18 ++++---- .../sonarr/cf/french-hd-bluray-tier-01.json | 12 ++--- docs/json/sonarr/cf/french-remux-tier-01.json | 14 +++--- docs/json/sonarr/cf/french-scene.json | 46 +++++++++---------- docs/json/sonarr/cf/french-web-tier-01.json | 14 +++--- docs/json/sonarr/cf/french-web-tier-02.json | 16 +++---- docs/json/sonarr/cf/french-web-tier-03.json | 16 +++---- 18 files changed, 179 insertions(+), 179 deletions(-) diff --git a/docs/json/radarr/cf/french-hd-bluray-tier-01.json b/docs/json/radarr/cf/french-hd-bluray-tier-01.json index daf4a7125..b313512f2 100644 --- a/docs/json/radarr/cf/french-hd-bluray-tier-01.json +++ b/docs/json/radarr/cf/french-hd-bluray-tier-01.json @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(BDHD)\\b" + "value": "\\b(BDHD)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FoX)\\b" + "value": "\\b(FoX)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FRATERNiTY)\\b" + "value": "\\b(FRATERNiTY)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FrIeNdS)\\b" + "value": "\\b(FrIeNdS)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MAX)\\b" + "value": "\\b(MAX)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Psaro)\\b" + "value": "\\b(Psaro)$" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(T3KASHi)\\b" + "value": "\\b(T3KASHi)$" } } ] diff --git a/docs/json/radarr/cf/french-hd-bluray-tier-02.json b/docs/json/radarr/cf/french-hd-bluray-tier-02.json index 19910b977..733a7b84f 100644 --- a/docs/json/radarr/cf/french-hd-bluray-tier-02.json +++ b/docs/json/radarr/cf/french-hd-bluray-tier-02.json @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FUJiSAN)\\b" + "value": "\\b(FUJiSAN)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HANAMi)\\b" + "value": "\\b(HANAMi)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HDForever)\\b" + "value": "\\b(HDForever)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HeavyWeight)\\b" + "value": "\\b(HeavyWeight)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MARBLECAKE)\\b" + "value": "\\b(MARBLECAKE)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MYSTERiON)\\b" + "value": "\\b(MYSTERiON)$" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(NoNE)\\b" + "value": "\\b(NoNE)$" } }, { @@ -100,7 +100,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ONLY)\\b" + "value": "\\b(ONLY)$" } }, { @@ -109,7 +109,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ONLYMOViE)\\b" + "value": "\\b(ONLYMOViE)$" } }, { @@ -118,7 +118,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(TkHD)\\b" + "value": "\\b(TkHD)$" } }, { @@ -127,7 +127,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(UTT)\\b" + "value": "\\b(UTT)$" } } ] diff --git a/docs/json/radarr/cf/french-remux-tier-01.json b/docs/json/radarr/cf/french-remux-tier-01.json index 680942872..9d9b2e750 100644 --- a/docs/json/radarr/cf/french-remux-tier-01.json +++ b/docs/json/radarr/cf/french-remux-tier-01.json @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(BlackAngel)\\b" + "value": "\\b(BlackAngel)$" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Choco)\\b" + "value": "\\b(Choco)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HDForever)\\b" + "value": "\\b(HDForever)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MAX)\\b" + "value": "\\b(MAX)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ONLY)\\b" + "value": "\\b(ONLY)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Psaro)\\b" + "value": "\\b(Psaro)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Sicario)\\b" + "value": "\\b(Sicario)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Tezcat74)\\b" + "value": "\\b(Tezcat74)$" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(TyrellCorp)\\b" + "value": "\\b(TyrellCorp)$" } }, { @@ -100,7 +100,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Zapax)\\b" + "value": "\\b(Zapax)$" } } ] diff --git a/docs/json/radarr/cf/french-remux-tier-02.json b/docs/json/radarr/cf/french-remux-tier-02.json index 513cbfb1f..886963ee1 100644 --- a/docs/json/radarr/cf/french-remux-tier-02.json +++ b/docs/json/radarr/cf/french-remux-tier-02.json @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(BDHD)\\b" + "value": "\\b(BDHD)$" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FtLi)\\b" + "value": "\\b(FtLi)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Goldenyann)\\b" + "value": "\\b(Goldenyann)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HeavyWeight)\\b" + "value": "\\b(HeavyWeight)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MARBLECAKE)\\b" + "value": "\\b(MARBLECAKE)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MUSTANG)\\b" + "value": "\\b(MUSTANG)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Obi)\\b" + "value": "\\b(Obi)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(PEPiTE)\\b" + "value": "\\b(PEPiTE)$" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Q(UEBE)?C63)\\b" + "value": "\\b(Q(UEBE)?C63)$" } }, { @@ -100,7 +100,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ROMKENT)\\b" + "value": "\\b(ROMKENT)$" } } ] diff --git a/docs/json/radarr/cf/french-scene.json b/docs/json/radarr/cf/french-scene.json index ec1342afd..34b457a2d 100644 --- a/docs/json/radarr/cf/french-scene.json +++ b/docs/json/radarr/cf/french-scene.json @@ -10,7 +10,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(4FR)\\b" + "value": "\\b(4FR)$" } }, { @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(AiR3D|AiRDOCS|AiRFORCE|AiRLiNE|AiRTV|AKLHD|AMB3R|ANMWR|AVON|AYMO|AZR)\\b" + "value": "\\b(AiR3D|AiRDOCS|AiRFORCE|AiRLiNE|AiRTV|AKLHD|AMB3R|ANMWR|AVON|AYMO|AZR)$" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(BANKAi|BAWLS|BiPOLAR|BLACKPANTERS|BODIE|BOOLZ|BRiNK)\\b" + "value": "\\b(BANKAi|BAWLS|BiPOLAR|BLACKPANTERS|BODIE|BOOLZ|BRiNK)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(CARAPiLS|CiELOS|CiNEMA|CMBHD|CoRa|COUAC|CRYPT0)\\b" + "value": "\\b(CARAPiLS|CiELOS|CiNEMA|CMBHD|CoRa|COUAC|CRYPT0)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(D4KiD|DEAL|DiEBEX|DUPLI|DUSS)\\b" + "value": "\\b(D4KiD|DEAL|DiEBEX|DUPLI|DUSS)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ENJOi|EUBDS)\\b" + "value": "\\b(ENJOi|EUBDS)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FHD|FiDELiO|FiDO|ForceBleue|FREAMON|FRENCHDEADPOOL2|FRiES|FUTiL|FWDHD)\\b" + "value": "\\b(FHD|FiDELiO|FiDO|ForceBleue|FREAMON|FRENCHDEADPOOL2|FRiES|FUTiL|FWDHD)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(GHOULS|GiMBAP|GLiMMER|Goatlove)\\b" + "value": "\\b(GHOULS|GiMBAP|GLiMMER|Goatlove)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HERC|HiggsBoson|HiRoSHiMa|HYBRiS|HyDe)\\b" + "value": "\\b(HERC|HiggsBoson|HiRoSHiMa|HYBRiS|HyDe)$" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(JMT|JoKeR|JUSTICELEAGUE)\\b" + "value": "\\b(JMT|JoKeR|JUSTICELEAGUE)$" } }, { @@ -100,7 +100,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(KAZETV)\\b" + "value": "\\b(KAZETV)$" } }, { @@ -109,7 +109,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(L0SERNiGHT|LaoZi|LeON|LOFiDEL|LOST|LOWIMDB|LYPSG)\\b" + "value": "\\b(L0SERNiGHT|LaoZi|LeON|LOFiDEL|LOST|LOWIMDB|LYPSG)$" } }, { @@ -118,7 +118,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MAGiCAL|MANGACiTY|MAXAGAZ|MaxiBeNoul|McNULTY|MELBA|MiND|MORELAND|MUNSTER|MUxHD)\\b" + "value": "\\b(MAGiCAL|MANGACiTY|MAXAGAZ|MaxiBeNoul|McNULTY|MELBA|MiND|MORELAND|MUNSTER|MUxHD)$" } }, { @@ -127,7 +127,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(NERDHD|NERO|NrZ|NTK)\\b" + "value": "\\b(NERDHD|NERO|NrZ|NTK)$" } }, { @@ -136,7 +136,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(OBSTACLE|OohLaLa|OOKAMI)\\b" + "value": "\\b(OBSTACLE|OohLaLa|OOKAMI)$" } }, { @@ -145,7 +145,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(PANZeR|PiNKPANTERS|PKPTRS|PRiDEHD|PROPJOE|PURE|PUREWASTEOFBW)\\b" + "value": "\\b(PANZeR|PiNKPANTERS|PKPTRS|PRiDEHD|PROPJOE|PURE|PUREWASTEOFBW)$" } }, { @@ -154,7 +154,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ROUGH|RUDE|Ryotox)\\b" + "value": "\\b(ROUGH|RUDE|Ryotox)$" } }, { @@ -163,7 +163,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(SAFETY|SASHiMi|SEiGHT|SESKAPiLE|SHEEEiT|SHiNiGAMi(UHD)?|SiGeRiS|SILVIODANTE|SLEEPINGFOREST|SODAPOP|SPINE|SPOiLER|STRINGERBELL|SUNRiSE)\\b" + "value": "\\b(SAFETY|SASHiMi|SEiGHT|SESKAPiLE|SHEEEiT|SHiNiGAMi(UHD)?|SiGeRiS|SILVIODANTE|SLEEPINGFOREST|SODAPOP|SPINE|SPOiLER|STRINGERBELL|SUNRiSE)$" } }, { @@ -172,7 +172,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(tFR|THENiGHTMAREiNHD|THiNK|THREESOME|TiMELiNE|TSuNaMi)\\b" + "value": "\\b(tFR|THENiGHTMAREiNHD|THiNK|THREESOME|TiMELiNE|TSuNaMi)$" } }, { @@ -181,7 +181,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(UKDHD|UKDTV|ULSHD|Ulysse|USUNSKiLLED|URY)\\b" + "value": "\\b(UKDHD|UKDTV|ULSHD|Ulysse|USUNSKiLLED|URY)$" } }, { @@ -190,7 +190,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(VENUE|VFC|VoMiT)\\b" + "value": "\\b(VENUE|VFC|VoMiT)$" } }, { @@ -199,7 +199,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Wednesday29th)\\b" + "value": "\\b(Wednesday29th)$" } }, { @@ -208,7 +208,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ZEST|ZiRCON)\\b" + "value": "\\b(ZEST|ZiRCON)$" } } ] diff --git a/docs/json/radarr/cf/french-uhd-bluray-tier-01.json b/docs/json/radarr/cf/french-uhd-bluray-tier-01.json index e6c54ff9d..d21a5c64b 100644 --- a/docs/json/radarr/cf/french-uhd-bluray-tier-01.json +++ b/docs/json/radarr/cf/french-uhd-bluray-tier-01.json @@ -10,7 +10,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FLOP)\\b" + "value": "\\b(FLOP)$" } }, { @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FRATERNiTY)\\b" + "value": "\\b(FRATERNiTY)$" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FoX)\\b" + "value": "\\b(FoX)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Psaro)\\b" + "value": "\\b(Psaro)$" } }, { diff --git a/docs/json/radarr/cf/french-uhd-bluray-tier-02.json b/docs/json/radarr/cf/french-uhd-bluray-tier-02.json index 427c9800c..4ca2085f1 100644 --- a/docs/json/radarr/cf/french-uhd-bluray-tier-02.json +++ b/docs/json/radarr/cf/french-uhd-bluray-tier-02.json @@ -10,7 +10,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(DUSTiN)\\b" + "value": "\\b(DUSTiN)$" } }, { @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FCK)\\b" + "value": "\\b(FCK)$" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FrIeNdS)\\b" + "value": "\\b(FrIeNdS)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(QUALiTY)\\b" + "value": "\\b(QUALiTY)$" } }, { diff --git a/docs/json/radarr/cf/french-web-tier-01.json b/docs/json/radarr/cf/french-web-tier-01.json index b6d1565c1..d19bfc63a 100644 --- a/docs/json/radarr/cf/french-web-tier-01.json +++ b/docs/json/radarr/cf/french-web-tier-01.json @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(BONBON)\\b" + "value": "\\b(BONBON)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FCK)\\b" + "value": "\\b(FCK)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FoX)\\b" + "value": "\\b(FoX)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FRATERNiTY)\\b" + "value": "\\b(FRATERNiTY)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FrIeNdS)\\b" + "value": "\\b(FrIeNdS)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MOONLY)\\b" + "value": "\\b(MOONLY)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MTDK)\\b" + "value": "\\b(MTDK)$" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(PATOPESTO)\\b" + "value": "\\b(PATOPESTO)$" } }, { @@ -100,7 +100,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Psaro)\\b" + "value": "\\b(Psaro)$" } }, { @@ -109,7 +109,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(T3KASHi)\\b" + "value": "\\b(T3KASHi)$" } } ] diff --git a/docs/json/radarr/cf/french-web-tier-02.json b/docs/json/radarr/cf/french-web-tier-02.json index 087a1e762..2415e8849 100644 --- a/docs/json/radarr/cf/french-web-tier-02.json +++ b/docs/json/radarr/cf/french-web-tier-02.json @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ALLDAYiN)\\b" + "value": "\\b(ALLDAYiN)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ARK01)\\b" + "value": "\\b(ARK01)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FUJiSAN)\\b" + "value": "\\b(FUJiSAN)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FW)\\b" + "value": "\\b(FW)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HANAMi)\\b" + "value": "\\b(HANAMi)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HeavyWeight)\\b" + "value": "\\b(HeavyWeight)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(NEO)\\b" + "value": "\\b(NEO)$" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(NoNe)\\b" + "value": "\\b(NoNe)$" } }, { @@ -100,7 +100,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Slay3R)\\b" + "value": "\\b(Slay3R)$" } }, { @@ -109,7 +109,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(TkHD)\\b" + "value": "\\b(TkHD)$" } } ] diff --git a/docs/json/sonarr/cf/french-anime-fansub.json b/docs/json/sonarr/cf/french-anime-fansub.json index 7649283e1..74da3ee52 100644 --- a/docs/json/sonarr/cf/french-anime-fansub.json +++ b/docs/json/sonarr/cf/french-anime-fansub.json @@ -10,7 +10,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Anime[ .-]?Heart)\\b" + "value": "\\b(Anime[ .-]?Heart)$" } }, { @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(KaeriZaki)\\b" + "value": "\\b(KaeriZaki)$" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(KFR)\\b" + "value": "\\b(KFR)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Natsumi)\\b" + "value": "\\b(Natsumi)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(NekoYu\\'?)\\b" + "value": "\\b(NekoYu\\'?)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Onii[ .-]?ChanSub)\\b" + "value": "\\b(Onii[ .-]?ChanSub)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Otaku[ .-]?Attitude)\\b" + "value": "\\b(Otaku[ .-]?Attitude)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Owlolf)\\b" + "value": "\\b(Owlolf)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Pikari[ .-]?Teshima)\\b" + "value": "\\b(Pikari[ .-]?Teshima)$" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Team[ .-]?Arcedo)\\b" + "value": "\\b(Team[ .-]?Arcedo)$" } }, { @@ -100,7 +100,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Yarashii)\\b" + "value": "\\b(Yarashii)$" } } ] diff --git a/docs/json/sonarr/cf/french-anime-tier-01.json b/docs/json/sonarr/cf/french-anime-tier-01.json index 5ee9d48dd..59a3a2dc9 100644 --- a/docs/json/sonarr/cf/french-anime-tier-01.json +++ b/docs/json/sonarr/cf/french-anime-tier-01.json @@ -10,7 +10,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Darki)\\b" + "value": "\\b(Darki)$" } }, { @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Delivroozzi)\\b" + "value": "\\b(Delivroozzi)$" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Fuceo)\\b" + "value": "\\b(Fuceo)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FUJiSAN)\\b" + "value": "\\b(FUJiSAN)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Good[ .-]?(Job|Rip|Sub)!?[ .-]?Alexis)\\b" + "value": "\\b(Good[ .-]?(Job|Rip|Sub)!?[ .-]?Alexis)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(NeoSG)\\b" + "value": "\\b(NeoSG)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Punisher694)\\b" + "value": "\\b(Punisher694)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(SR-71)\\b" + "value": "\\b(SR-71)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(T3KASHi)\\b" + "value": "\\b(T3KASHi)$" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(TANOSHii)\\b" + "value": "\\b(TANOSHii)$" } }, { @@ -100,7 +100,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Tsundere[ .-]?Raws)\\b" + "value": "\\b(Tsundere[ .-]?Raws)$" } } ] diff --git a/docs/json/sonarr/cf/french-anime-tier-02.json b/docs/json/sonarr/cf/french-anime-tier-02.json index 7d4017ff2..3155ea28b 100644 --- a/docs/json/sonarr/cf/french-anime-tier-02.json +++ b/docs/json/sonarr/cf/french-anime-tier-02.json @@ -10,7 +10,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(BLV)\\b" + "value": "\\b(BLV)$" } }, { @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(D3T3R10R1TY)\\b" + "value": "\\b(D3T3R10R1TY)$" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HANAMi)\\b" + "value": "\\b(HANAMi)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(KAF)\\b" + "value": "\\b(KAF)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(KHAYA)\\b" + "value": "\\b(KHAYA)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Monkey[ .-]?D[ .-]?Lulu)\\b" + "value": "\\b(Monkey[ .-]?D[ .-]?Lulu)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(RONiN)\\b" + "value": "\\b(RONiN)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(TTN)\\b" + "value": "\\b(TTN)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(XSPITFIRE911)\\b" + "value": "\\b(XSPITFIRE911)$" } } ] diff --git a/docs/json/sonarr/cf/french-hd-bluray-tier-01.json b/docs/json/sonarr/cf/french-hd-bluray-tier-01.json index 364204d71..a84811156 100644 --- a/docs/json/sonarr/cf/french-hd-bluray-tier-01.json +++ b/docs/json/sonarr/cf/french-hd-bluray-tier-01.json @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ARK01)\\b" + "value": "\\b(ARK01)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(BONBON)\\b" + "value": "\\b(BONBON)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FRATERNiTY)\\b" + "value": "\\b(FRATERNiTY)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FTMVHD)\\b" + "value": "\\b(FTMVHD)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HeavyWeight)\\b" + "value": "\\b(HeavyWeight)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Psaro)\\b" + "value": "\\b(Psaro)$" } } ] diff --git a/docs/json/sonarr/cf/french-remux-tier-01.json b/docs/json/sonarr/cf/french-remux-tier-01.json index d8f8504df..25b3a066c 100644 --- a/docs/json/sonarr/cf/french-remux-tier-01.json +++ b/docs/json/sonarr/cf/french-remux-tier-01.json @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FtLi)\\b" + "value": "\\b(FtLi)$" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Goldenyann)\\b" + "value": "\\b(Goldenyann)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HDForever)\\b" + "value": "\\b(HDForever)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HeavyWeight)\\b" + "value": "\\b(HeavyWeight)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ONLY)\\b" + "value": "\\b(ONLY)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Psaro)\\b" + "value": "\\b(Psaro)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(TyrellCorp)\\b" + "value": "\\b(TyrellCorp)$" } } ] diff --git a/docs/json/sonarr/cf/french-scene.json b/docs/json/sonarr/cf/french-scene.json index 3139e9af5..bfbe95fc1 100644 --- a/docs/json/sonarr/cf/french-scene.json +++ b/docs/json/sonarr/cf/french-scene.json @@ -10,7 +10,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(4FR)\\b" + "value": "\\b(4FR)$" } }, { @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(AiR3D|AiRDOCS|AiRFORCE|AiRLiNE|AiRTV|AMB3R|ANMWR|AVON|AYMO|AZR)\\b" + "value": "\\b(AiR3D|AiRDOCS|AiRFORCE|AiRLiNE|AiRTV|AMB3R|ANMWR|AVON|AYMO|AZR)$" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(BANKAi|BAWLS|BiPOLAR|BLACKPANTERS|BODIE|BOOLZ|BRiNK)\\b" + "value": "\\b(BANKAi|BAWLS|BiPOLAR|BLACKPANTERS|BODIE|BOOLZ|BRiNK)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(CARAPiLS|CiELOS|CiNEMA|CMBHD|CoRa|COUAC|CRYPT0)\\b" + "value": "\\b(CARAPiLS|CiELOS|CiNEMA|CMBHD|CoRa|COUAC|CRYPT0)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(D4KiD|DEAL|DiEBEX|DUPLI|DUSS)\\b" + "value": "\\b(D4KiD|DEAL|DiEBEX|DUPLI|DUSS)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ENJOi|EUBDS)\\b" + "value": "\\b(ENJOi|EUBDS)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FHD|FiDELiO|FiDO|ForceBleue|FREAMON|FRENCHDEADPOOL2|FRiES|FUTiL|FWDHD)\\b" + "value": "\\b(FHD|FiDELiO|FiDO|ForceBleue|FREAMON|FRENCHDEADPOOL2|FRiES|FUTiL|FWDHD)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(GHOULS|GiMBAP|GLiMMER|Goatlove)\\b" + "value": "\\b(GHOULS|GiMBAP|GLiMMER|Goatlove)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HERC|HiggsBoson|HiRoSHiMa|HYBRiS|HyDe)\\b" + "value": "\\b(HERC|HiggsBoson|HiRoSHiMa|HYBRiS|HyDe)$" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(JMT|JoKeR|JUSTICELEAGUE)\\b" + "value": "\\b(JMT|JoKeR|JUSTICELEAGUE)$" } }, { @@ -100,7 +100,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(KAZETV)\\b" + "value": "\\b(KAZETV)$" } }, { @@ -109,7 +109,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(L0SERNiGHT|LaoZi|LeON|LOFiDEL|LOST|LOWIMDB|LYPSG)\\b" + "value": "\\b(L0SERNiGHT|LaoZi|LeON|LOFiDEL|LOST|LOWIMDB|LYPSG)$" } }, { @@ -118,7 +118,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MAGiCAL|MANGACiTY|MAXAGAZ|MaxiBeNoul|McNULTY|MELBA|MiND|MORELAND|MUNSTER|MUxHD)\\b" + "value": "\\b(MAGiCAL|MANGACiTY|MAXAGAZ|MaxiBeNoul|McNULTY|MELBA|MiND|MORELAND|MUNSTER|MUxHD)$" } }, { @@ -127,7 +127,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(N0Z00M|NERDHD|NERO|NrZ|NTK)\\b" + "value": "\\b(N0Z00M|NERDHD|NERO|NrZ|NTK)$" } }, { @@ -136,7 +136,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(OBSTACLE|OohLaLa|OOKAMI)\\b" + "value": "\\b(OBSTACLE|OohLaLa|OOKAMI)$" } }, { @@ -145,7 +145,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(PANZeR|PHoQUE|PiNKPANTERS|PKPTRS|PRiDEHD|PROPJOE|PURE|PUREWASTEOFBW)\\b" + "value": "\\b(PANZeR|PHoQUE|PiNKPANTERS|PKPTRS|PRiDEHD|PROPJOE|PURE|PUREWASTEOFBW)$" } }, { @@ -154,7 +154,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ROUGH|RUDE|Ryotox)\\b" + "value": "\\b(ROUGH|RUDE|Ryotox)$" } }, { @@ -163,7 +163,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(SAFETY|SASHiMi|SEiGHT|SESKAPiLE|SharpHD|SHEEEiT|SHiNiGAMi(UHD)?|SiGeRiS|SILVIODANTE|SLEEPINGFOREST|SODAPOP|SPINE|SPOiLER|STRINGERBELL|SUNRiSE)\\b" + "value": "\\b(SAFETY|SASHiMi|SEiGHT|SESKAPiLE|SharpHD|SHEEEiT|SHiNiGAMi(UHD)?|SiGeRiS|SILVIODANTE|SLEEPINGFOREST|SODAPOP|SPINE|SPOiLER|STRINGERBELL|SUNRiSE)$" } }, { @@ -172,7 +172,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(tFR|THENiGHTMAREiNHD|THiNK|THREESOME|TiMELiNE|TSuNaMi)\\b" + "value": "\\b(tFR|THENiGHTMAREiNHD|THiNK|THREESOME|TiMELiNE|TSuNaMi)$" } }, { @@ -181,7 +181,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(UKDHD|UKDTV|ULSHD|Ulysse|USUNSKiLLED|URY|USURY)\\b" + "value": "\\b(UKDHD|UKDTV|ULSHD|Ulysse|USUNSKiLLED|URY|USURY)$" } }, { @@ -190,7 +190,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(VENUE|VFC|VoMiT)\\b" + "value": "\\b(VENUE|VFC|VoMiT)$" } }, { @@ -199,7 +199,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Wednesday29th)\\b" + "value": "\\b(Wednesday29th)$" } }, { @@ -208,7 +208,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ZEST|ZiRCON)\\b" + "value": "\\b(ZEST|ZiRCON)$" } } ] diff --git a/docs/json/sonarr/cf/french-web-tier-01.json b/docs/json/sonarr/cf/french-web-tier-01.json index b9dd7ebb3..42a3ba854 100644 --- a/docs/json/sonarr/cf/french-web-tier-01.json +++ b/docs/json/sonarr/cf/french-web-tier-01.json @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(BONBON)\\b" + "value": "\\b(BONBON)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FCK)\\b" + "value": "\\b(FCK)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FRATERNiTY)\\b" + "value": "\\b(FRATERNiTY)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MTDK)\\b" + "value": "\\b(MTDK)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(NoLo)\\b" + "value": "\\b(NoLo)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(PATOPESTO)\\b" + "value": "\\b(PATOPESTO)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Psaro)\\b" + "value": "\\b(Psaro)$" } } ] diff --git a/docs/json/sonarr/cf/french-web-tier-02.json b/docs/json/sonarr/cf/french-web-tier-02.json index f73df39a2..743889725 100644 --- a/docs/json/sonarr/cf/french-web-tier-02.json +++ b/docs/json/sonarr/cf/french-web-tier-02.json @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(COLL3CTiF)\\b" + "value": "\\b(COLL3CTiF)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FiND)\\b" + "value": "\\b(FiND)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FrIeNdS)\\b" + "value": "\\b(FrIeNdS)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FW)\\b" + "value": "\\b(FW)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HeavyWeight)\\b" + "value": "\\b(HeavyWeight)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(NoNe)\\b" + "value": "\\b(NoNe)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(pERsO)\\b" + "value": "\\b(pERsO)$" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(RiPiT)\\b" + "value": "\\b(RiPiT)$" } } ] diff --git a/docs/json/sonarr/cf/french-web-tier-03.json b/docs/json/sonarr/cf/french-web-tier-03.json index 348ecf9bc..446abbe92 100644 --- a/docs/json/sonarr/cf/french-web-tier-03.json +++ b/docs/json/sonarr/cf/french-web-tier-03.json @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ARK01)\\b" + "value": "\\b(ARK01)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(BraD)\\b" + "value": "\\b(BraD)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(dRuIdE)\\b" + "value": "\\b(dRuIdE)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FTMVHD)\\b" + "value": "\\b(FTMVHD)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(LAZARUS)\\b" + "value": "\\b(LAZARUS)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MYSTERiON)\\b" + "value": "\\b(MYSTERiON)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Scaph)\\b" + "value": "\\b(Scaph)$" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(WQM)\\b" + "value": "\\b(WQM)$" } } ] From 02abe528d12fae5cf5dd5e852516a017fbca7433 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Wed, 19 Apr 2023 16:04:20 +0200 Subject: [PATCH 02/24] Added VF2 as CF Added the VF2 CF to avoid problem with people not understanding and badly scoring VFI or VFQ. --- .../Radarr-collection-of-custom-formats.md | 32 ++++++++++++++----- .../sonarr-collection-of-custom-formats.md | 32 ++++++++++++++----- docs/json/radarr/cf/french-vf2.json | 26 +++++++++++++++ docs/json/radarr/cf/french-vfb.json | 2 +- docs/json/radarr/cf/french-vff.json | 9 ++++++ docs/json/radarr/cf/french-vfi.json | 4 +-- docs/json/radarr/cf/french-vfq.json | 14 ++++---- docs/json/radarr/cf/french-vof.json | 2 +- docs/json/radarr/cf/french-vostfr.json | 4 +-- docs/json/radarr/cf/french-vq.json | 2 +- docs/json/sonarr/cf/french-vf2.json | 26 +++++++++++++++ docs/json/sonarr/cf/french-vfb.json | 2 +- docs/json/sonarr/cf/french-vff.json | 9 ++++++ docs/json/sonarr/cf/french-vfi.json | 4 +-- docs/json/sonarr/cf/french-vfq.json | 14 ++++---- docs/json/sonarr/cf/french-vof.json | 2 +- docs/json/sonarr/cf/french-vostfr.json | 4 +-- docs/json/sonarr/cf/french-vq.json | 2 +- .../radarr-french-audio-version-en.md | 28 ++++++++-------- .../radarr-french-audio-version-fr.md | 28 ++++++++-------- .../sonarr-french-audio-version-en.md | 28 ++++++++-------- .../sonarr-french-audio-version-fr.md | 28 ++++++++-------- 22 files changed, 202 insertions(+), 100 deletions(-) create mode 100644 docs/json/radarr/cf/french-vf2.json create mode 100644 docs/json/sonarr/cf/french-vf2.json diff --git a/docs/Radarr/Radarr-collection-of-custom-formats.md b/docs/Radarr/Radarr-collection-of-custom-formats.md index 7c9bcc37c..a610c2798 100644 --- a/docs/Radarr/Radarr-collection-of-custom-formats.md +++ b/docs/Radarr/Radarr-collection-of-custom-formats.md @@ -73,13 +73,13 @@ I also made 3 guides related to this one. | [x264](#x264) | [HDR10+ Boost](#hdr10plus-boost) | [VFF](#vff) | [FR UHD Bluray Tier 02](#fr-uhd-bluray-tier-02) | | [x265](#x265) | [No-RlsGroup](#no-rlsgroup) | [VOF](#vof) | [FR HD Bluray Tier 01](#fr-hd-bluray-tier-01) | | [MPEG2](#mpeg2) | [Obfuscated](#obfuscated) | [VFI](#vfi) | [FR HD Bluray Tier 02](#fr-hd-bluray-tier-02) | -| [Dutch Groups](#dutch-groups) | [Retags](#retags) | [VFQ](#vfq) | [FR WEB Tier 01](#fr-web-tier-01) | -| [FreeLeech](#freeleech) | [Scene](#scene) | [VQ](#vq) | [FR WEB Tier 02](#fr-web-tier-02) | -| | [x265 (no HDR/DV)](#x265-no-hdrdv) | [VFB](#vfb) | [FR Scene Groups](#fr-scene-groups) | -| | [AV1](#av1) | [VOSTFR](#vostfr) | [FR LQ](#fr-lq) | -| | [SDR](#sdr) | [FanSUB](#fansub) | | -| | [DV (FEL)](#dv-fel) | [FastSUB](#fastsub) | | -| | [Line/Mic Dubbed](#linemic-dubbed) | | | +| [Dutch Groups](#dutch-groups) | [Retags](#retags) | [VF2](#vf2) | [FR WEB Tier 01](#fr-web-tier-01) | +| [FreeLeech](#freeleech) | [Scene](#scene) | [VFQ](#vfq) | [FR WEB Tier 02](#fr-web-tier-02) | +| | [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) | | +| | [DV (FEL)](#dv-fel) | [FanSUB](#fansub) | | +| | [Line/Mic Dubbed](#linemic-dubbed) | [FastSUB](#fastsub) | | | | [HFR](#hfr) | | | ------ @@ -2275,7 +2275,7 @@ I also made 3 guides related to this one. ??? question "VFI - [CLICK TO EXPAND]" - International French Version. VF[1-9] or FR[1-9] indicates the number of dubs present (normally VF2 being VFF and VFQ) and is considered as an International French release. + International French Version. ??? example "JSON - [CLICK TO EXPAND]" @@ -2287,6 +2287,22 @@ I also made 3 guides related to this one. ------ +### VF2 + +??? question "VF2 - [CLICK TO EXPAND]" + + VF[1-9] or FR[1-9] indicates the number of dubs present (normally VF2 being VFF and VFQ). + +??? example "JSON - [CLICK TO EXPAND]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/radarr/cf/french-vf2.json' %]][[% endfilter %]] + ``` + +[TOP](#index) + +------ + ### VFQ ??? question "VFQ - [CLICK TO EXPAND]" diff --git a/docs/Sonarr/sonarr-collection-of-custom-formats.md b/docs/Sonarr/sonarr-collection-of-custom-formats.md index c1273dd4a..3bd4f64a0 100644 --- a/docs/Sonarr/sonarr-collection-of-custom-formats.md +++ b/docs/Sonarr/sonarr-collection-of-custom-formats.md @@ -79,13 +79,13 @@ I also made 3 guides related to this one. | [Multi](#multi) | [No-RlsGroup](#no-rlsgroup) | [VFF](#vff) | [FR WEB Tier 02](#fr-web-tier-02) | | [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) | [VFQ](#vfq) | [FR Anime Tier 02](#fr-anime-tier-02) | -| | [Season Packs](#season-pack) | [VQ](#vq) | [FR Anime FanSub](#fr-anime-fansub) | -| | [x265 (no HDR/DV)](#x265-no-hdrdv) | [VFB](#vfb) | [FR Scene Groups](#fr-scene-groups) | -| | [AV1](#av1) | [VOSTFR](#vostfr) | [FR LQ](#fr-lq) | -| | [SDR](#sdr) | [FanSUB](#fansub) | | -| | [DV (FEL)](#dv-fel) | [FastSUB](#fastsub) | | -| | [HFR](#hfr) | | | +| [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) | | +| | [DV (FEL)](#dv-fel) | [FanSUB](#fansub) | | +| | [HFR](#hfr) | [FastSUB](#fastsub) | | ------ @@ -2279,7 +2279,7 @@ I also made 3 guides related to this one. ??? question "VFI - [CLICK TO EXPAND]" - International French Version. VF[1-9] or FR[1-9] indicates the number of dubs present (normally VF2 being VFF and VFQ) and is considered as an International French release. + International French Version. ??? example "JSON - [CLICK TO EXPAND]" @@ -2291,6 +2291,22 @@ I also made 3 guides related to this one. ------ +### VF2 + +??? question "VF2 - [CLICK TO EXPAND]" + + VF[1-9] or FR[1-9] indicates the number of dubs present (normally VF2 being VFF and VFQ). + +??? example "JSON - [CLICK TO EXPAND]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/french-vf2.json' %]][[% endfilter %]] + ``` + +[TOP](#index) + +------ + ### VFQ ??? question "VFQ - [CLICK TO EXPAND]" diff --git a/docs/json/radarr/cf/french-vf2.json b/docs/json/radarr/cf/french-vf2.json new file mode 100644 index 000000000..7abf7103f --- /dev/null +++ b/docs/json/radarr/cf/french-vf2.json @@ -0,0 +1,26 @@ +{ + "trash_id": "29b5f7b1a5f20f64228786c3ab1bdc7d", + "trash_regex": "https://regex101.com/r/qgQMab/1", + "name": "VF2", + "includeCustomFormatWhenRenaming": true, + "specifications": [ + { + "name": "VF2", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(VF2)\\b" + } + }, + { + "name": "Both VFF and VFQ", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(VF(F|Q)[ .]VF(F|Q))\\b" + } + } + ] +} diff --git a/docs/json/radarr/cf/french-vfb.json b/docs/json/radarr/cf/french-vfb.json index 9b491dea8..1b84a2e88 100644 --- a/docs/json/radarr/cf/french-vfb.json +++ b/docs/json/radarr/cf/french-vfb.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\bVFB\\b" + "value": "\\b(VFB)\\b" } } ] diff --git a/docs/json/radarr/cf/french-vff.json b/docs/json/radarr/cf/french-vff.json index 112d6d5c8..ad0f0e637 100644 --- a/docs/json/radarr/cf/french-vff.json +++ b/docs/json/radarr/cf/french-vff.json @@ -12,6 +12,15 @@ "fields": { "value": "\\b(TRUEFRENCH|VFF)\\b" } + }, + { + "name": "Not VF2", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(VF2)\\b" + } } ] } diff --git a/docs/json/radarr/cf/french-vfi.json b/docs/json/radarr/cf/french-vfi.json index e21df7307..ea7223ca2 100644 --- a/docs/json/radarr/cf/french-vfi.json +++ b/docs/json/radarr/cf/french-vfi.json @@ -1,6 +1,6 @@ { "trash_id": "52772f1cad6b5d26c2551f79bc538a50", - "trash_regex": "https://regex101.com/r/YA7mOH/1", + "trash_regex": "https://regex101.com/r/YA7mOH/2", "name": "VFI", "includeCustomFormatWhenRenaming": true, "specifications": [ @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\bVF(I|\\d)\\b" + "value": "\\b(VFI)\\b" } } ] diff --git a/docs/json/radarr/cf/french-vfq.json b/docs/json/radarr/cf/french-vfq.json index 41a36739d..92e80726d 100644 --- a/docs/json/radarr/cf/french-vfq.json +++ b/docs/json/radarr/cf/french-vfq.json @@ -5,21 +5,21 @@ "includeCustomFormatWhenRenaming": true, "specifications": [ { - "name": "FRENCH", + "name": "Canadian French", "implementation": "ReleaseTitleSpecification", "negate": false, - "required": false, + "required": true, "fields": { - "value": "\\b(?<=MULTi[ .])FR(A|ENCH)\\b" + "value": "\\b(VFQ?|(?<=MULTi[ .])FR(A|ENCH))\\b" } }, { - "name": "Canadian French", + "name": "Not VF2", "implementation": "ReleaseTitleSpecification", - "negate": false, - "required": false, + "negate": true, + "required": true, "fields": { - "value": "\\b(VFQ?)\\b" + "value": "\\b(VF2)\\b" } } ] diff --git a/docs/json/radarr/cf/french-vof.json b/docs/json/radarr/cf/french-vof.json index a8e540066..0382715cf 100644 --- a/docs/json/radarr/cf/french-vof.json +++ b/docs/json/radarr/cf/french-vof.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\bVOF\\b" + "value": "\\b(VOF)\\b" } } ] diff --git a/docs/json/radarr/cf/french-vostfr.json b/docs/json/radarr/cf/french-vostfr.json index c6f1a1e19..f0112a8b9 100644 --- a/docs/json/radarr/cf/french-vostfr.json +++ b/docs/json/radarr/cf/french-vostfr.json @@ -10,7 +10,7 @@ "negate": false, "required": false, "fields": { - "value": "\\bVOST.*?FR(E|A)?\\b" + "value": "\\b(VOST.*?FR(E|A)?)\\b" } }, { @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\bSUBFR(A|ENCH)?\\b" + "value": "\\b(SUBFR(A|ENCH)?)\\b" } } ] diff --git a/docs/json/radarr/cf/french-vq.json b/docs/json/radarr/cf/french-vq.json index 69965104b..69578c1f5 100644 --- a/docs/json/radarr/cf/french-vq.json +++ b/docs/json/radarr/cf/french-vq.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\bVQ\\b" + "value": "\\b(VQ)\\b" } } ] diff --git a/docs/json/sonarr/cf/french-vf2.json b/docs/json/sonarr/cf/french-vf2.json new file mode 100644 index 000000000..53efbca17 --- /dev/null +++ b/docs/json/sonarr/cf/french-vf2.json @@ -0,0 +1,26 @@ +{ + "trash_id": "34789ec3caa819f087e23bbf9999daf7", + "trash_regex": "https://regex101.com/r/qgQMab/1", + "name": "VF2", + "includeCustomFormatWhenRenaming": true, + "specifications": [ + { + "name": "VF2", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(VF2)\\b" + } + }, + { + "name": "Both VFF and VFQ", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(VF(F|Q)[ .]VF(F|Q))\\b" + } + } + ] +} diff --git a/docs/json/sonarr/cf/french-vfb.json b/docs/json/sonarr/cf/french-vfb.json index f76494f8a..6d0008292 100644 --- a/docs/json/sonarr/cf/french-vfb.json +++ b/docs/json/sonarr/cf/french-vfb.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\bVFB\\b" + "value": "\\b(VFB)\\b" } } ] diff --git a/docs/json/sonarr/cf/french-vff.json b/docs/json/sonarr/cf/french-vff.json index f90f50d8f..086ca1fdc 100644 --- a/docs/json/sonarr/cf/french-vff.json +++ b/docs/json/sonarr/cf/french-vff.json @@ -12,6 +12,15 @@ "fields": { "value": "\\b(TRUEFRENCH|VFF)\\b" } + }, + { + "name": "Not VF2", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "\\b(VF2)\\b" + } } ] } diff --git a/docs/json/sonarr/cf/french-vfi.json b/docs/json/sonarr/cf/french-vfi.json index 050b7e992..4ac73ff76 100644 --- a/docs/json/sonarr/cf/french-vfi.json +++ b/docs/json/sonarr/cf/french-vfi.json @@ -1,6 +1,6 @@ { "trash_id": "b6816a0e1d4b64bf3550ad3b74b009b6", - "trash_regex": "https://regex101.com/r/YA7mOH/1", + "trash_regex": "https://regex101.com/r/YA7mOH/2", "name": "VFI", "includeCustomFormatWhenRenaming": true, "specifications": [ @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\bVF(I|\\d)\\b" + "value": "\\b(VFI)\\b" } } ] diff --git a/docs/json/sonarr/cf/french-vfq.json b/docs/json/sonarr/cf/french-vfq.json index e63a5c64b..1e996424a 100644 --- a/docs/json/sonarr/cf/french-vfq.json +++ b/docs/json/sonarr/cf/french-vfq.json @@ -5,21 +5,21 @@ "includeCustomFormatWhenRenaming": true, "specifications": [ { - "name": "FRENCH", + "name": "Canadian French", "implementation": "ReleaseTitleSpecification", "negate": false, - "required": false, + "required": true, "fields": { - "value": "\\b(?<=MULTi[ .])FR(A|ENCH)\\b" + "value": "\\b(VFQ?|(?<=MULTi[ .])FR(A|ENCH))\\b" } }, { - "name": "Canadian French", + "name": "Not VF2", "implementation": "ReleaseTitleSpecification", - "negate": false, - "required": false, + "negate": true, + "required": true, "fields": { - "value": "\\b(VFQ?)\\b" + "value": "\\b(VF2)\\b" } } ] diff --git a/docs/json/sonarr/cf/french-vof.json b/docs/json/sonarr/cf/french-vof.json index fdcf6207a..1e03b4098 100644 --- a/docs/json/sonarr/cf/french-vof.json +++ b/docs/json/sonarr/cf/french-vof.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\bVOF\\b" + "value": "\\b(VOF)\\b" } } ] diff --git a/docs/json/sonarr/cf/french-vostfr.json b/docs/json/sonarr/cf/french-vostfr.json index 2daa2be0e..6ec83ee3f 100644 --- a/docs/json/sonarr/cf/french-vostfr.json +++ b/docs/json/sonarr/cf/french-vostfr.json @@ -10,7 +10,7 @@ "negate": false, "required": false, "fields": { - "value": "\\bVOST.*?FR(E|A)?\\b" + "value": "\\b(VOST.*?FR(E|A)?)\\b" } }, { @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\bSUBFR(A|ENCH)?\\b" + "value": "\\b(SUBFR(A|ENCH)?)\\b" } } ] diff --git a/docs/json/sonarr/cf/french-vq.json b/docs/json/sonarr/cf/french-vq.json index 38bb6bb72..79ed322f9 100644 --- a/docs/json/sonarr/cf/french-vq.json +++ b/docs/json/sonarr/cf/french-vq.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\bVQ\\b" + "value": "\\b(VQ)\\b" } } ] diff --git a/includes/french-guide/radarr-french-audio-version-en.md b/includes/french-guide/radarr-french-audio-version-en.md index 8f7c4bd61..6c496ecff 100644 --- a/includes/french-guide/radarr-french-audio-version-en.md +++ b/includes/french-guide/radarr-french-audio-version-en.md @@ -1,22 +1,21 @@ ??? abstract "Explanation - [CLICK TO EXPAND]" - | Acronyms | French Explanation | English Explanation | - | -------------------------------- | ----------------------------------------------------------------------------------- | --------------------------------------------------------------------- | - | TRUEFRENCH or VFF | Version Francophone Française (doublage réalisé en France) | Full French version (dubbing done in France) | - | FRENCH or VF[1] | Version Francophone (normalement equivalent à la VFQ) | French version (normally equivalent to VFQ) | - | VOF | Version Originale Française | Original French Version | - | VFI | Version Francophone Internationale | International French Version | - | VFQ | Version Francophone Québécoise | Canadian French Version | - | VQ | Version Québécoise (accent Québécois important, ex: Les Simpsons le film) | Quebec Version (strong Quebec accent, ex: The Simpsons movie) | - | VFB | Version Francophone Belge | Belgian French Version | - | VF[1-9] or FR[1-9][2] | Indique le nombre de doublage présent (normalement VF2 soit VFF et VFQ) | Indicates the number of dubs present (normally VF2 being VFF and VFQ) | - | VOSTFR[3] | Indique que l'audio est dans la langue originale, avec des sous-titres en français. | Indicates soundtrack in the original language, with French subtitles | + | Acronyms | French Explanation | English Explanation | + | -------------------------- | ----------------------------------------------------------------------------------- | --------------------------------------------------------------------- | + | TRUEFRENCH or VFF | Version Francophone Française (doublage réalisé en France) | Full French version (dubbing done in France) | + | FRENCH or VF[1] | Version Francophone (normalement equivalent à la VFQ) | French version (normally equivalent to VFQ) | + | VOF | Version Originale Française | Original French Version | + | VFI | Version Francophone Internationale | International French Version | + | VFQ | Version Francophone Québécoise | Canadian French Version | + | VQ | Version Québécoise (accent Québécois important, ex: Les Simpsons le film) | Quebec Version (strong Quebec accent, ex: The Simpsons movie) | + | VFB | Version Francophone Belge | Belgian French Version | + | VF[1-9] or FR[1-9] | Indique le nombre de doublage présent (normalement VF2 soit VFF et VFQ) | Indicates the number of dubs present (normally VF2 being VFF and VFQ) | + | VOSTFR[2] | Indique que l'audio est dans la langue originale, avec des sous-titres en français. | Indicates soundtrack in the original language, with French subtitles | - *[1] VF is included under the VFQ Custom Format, but it should be noted that it was often mismatched with VFF instead of VFQ pre-2022.* - - *[2] VF[1-9] is included under the VFI Custom Format.* - - *[3] It should be noted that SUBFRENCH is included in this Custom Format. However, SUB often means that the subtitle was embedded inside the picture (hardcoded). French releases tend to mix the two, leading to some VOSTFR being labelled as SUBFRENCH and SUBFRENCH as VOSTFR.* + - *[2] It should be noted that SUBFRENCH is included in this Custom Format. However, SUB often means that the subtitle was embedded inside the picture (hardcoded). French releases tend to mix the two, leading to some VOSTFR being labelled as SUBFRENCH and SUBFRENCH as VOSTFR.* !!! tip "Indexers renaming in Prowlarr" - Some Indexers in Prowlarr can rename `MULTi` releases to `MULTi.TRUEFRENCH` or `MULTi.FRENCH`. I do not recommend using such a feature along with those Custom Formats as it can lead to false positives from the VFF, VFQ and VQ Custom Formats. + Some Indexers in Prowlarr can rename `MULTi` releases to `MULTi.TRUEFRENCH` or `MULTi.FRENCH`. It is not recommend to use such a feature along with those Custom Formats as it can lead to false positives from the VFF, VFQ and VQ Custom Formats. ??? abstract "French Audio Versions - [CLICK TO EXPAND]" | Custom Format | Score | Trash ID | @@ -24,6 +23,7 @@ | [{{ radarr['cf']['french-vff']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vff) | 0 | {{ radarr['cf']['french-vff']['trash_id'] }} | | [{{ radarr['cf']['french-vof']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vof) | 0 | {{ radarr['cf']['french-vof']['trash_id'] }} | | [{{ radarr['cf']['french-vfi']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vfi) | 0 | {{ radarr['cf']['french-vfi']['trash_id'] }} | + | [{{ radarr['cf']['french-vf2']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vf2) | 0 | {{ radarr['cf']['french-vf2']['trash_id'] }} | | [{{ radarr['cf']['french-vfq']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vfq) | 0 | {{ radarr['cf']['french-vfq']['trash_id'] }} | | [{{ radarr['cf']['french-vq']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vq) | 0 | {{ radarr['cf']['french-vq']['trash_id'] }} | | [{{ radarr['cf']['french-vfb']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vfb) | 0 | {{ radarr['cf']['french-vfb']['trash_id'] }} | diff --git a/includes/french-guide/radarr-french-audio-version-fr.md b/includes/french-guide/radarr-french-audio-version-fr.md index d908086d7..9a8ad4f7c 100644 --- a/includes/french-guide/radarr-french-audio-version-fr.md +++ b/includes/french-guide/radarr-french-audio-version-fr.md @@ -1,22 +1,21 @@ ??? abstract "Explications - [CLIQUEZ POUR AFFICHER]" - | Acronymes | French Explanation | English Explanation | - | -------------------------------- | ----------------------------------------------------------------------------------- | --------------------------------------------------------------------- | - | TRUEFRENCH or VFF | Version Francophone Française (doublage réalisé en France) | Full French version (dubbing done in France) | - | FRENCH or VF[1] | Version Francophone (normalement equivalent à la VFQ) | French version (normally equivalent to VFQ) | - | VOF | Version Originale Française | Original French Version | - | VFI | Version Francophone Internationale | International French Version | - | VFQ | Version Francophone Québécoise | Canadian French Version | - | VQ | Version Québécoise (accent Québécois important, ex: Les Simpsons le film) | Quebec Version (strong Quebec accent, ex: The Simpsons movie) | - | VFB | Version Francophone Belge | Belgian French Version | - | VF[1-9] or FR[1-9][2] | Indique le nombre de doublage présent (normalement VF2 soit VFF et VFQ) | Indicates the number of dubs present (normally VF2 being VFF and VFQ) | - | VOSTFR[3] | Indique que l'audio est dans la langue originale, avec des sous-titres en français. | Indicates soundtrack in the original language, with French subtitles | + | Acronymes | French Explanation | English Explanation | + | -------------------------- | ----------------------------------------------------------------------------------- | --------------------------------------------------------------------- | + | TRUEFRENCH or VFF | Version Francophone Française (doublage réalisé en France) | Full French version (dubbing done in France) | + | FRENCH or VF[1] | Version Francophone (normalement equivalent à la VFQ) | French version (normally equivalent to VFQ) | + | VOF | Version Originale Française | Original French Version | + | VFI | Version Francophone Internationale | International French Version | + | VFQ | Version Francophone Québécoise | Canadian French Version | + | VQ | Version Québécoise (accent Québécois important, ex: Les Simpsons le film) | Quebec Version (strong Quebec accent, ex: The Simpsons movie) | + | VFB | Version Francophone Belge | Belgian French Version | + | VF[1-9] or FR[1-9] | Indique le nombre de doublage présent (normalement VF2 soit VFF et VFQ) | Indicates the number of dubs present (normally VF2 being VFF and VFQ) | + | VOSTFR[2] | Indique que l'audio est dans la langue originale, avec des sous-titres en français. | Indicates soundtrack in the original language, with French subtitles | - *[1] VF est inclus dans le Format Personnalisé VFQ, mais il convient de noter qu'il était souvent associé à VFF au lieu de VFQ avant 2022.* - - *[2] VF [1-9] est inclus dans le Format Personnalisé VFI.* - - *[3] Il est à noter que le SUBFRENCH est inclus dans ce Format Personnalisé. Néanmoins, SUB signifie souvent que le sous-titre a été intégré à l'image (hardcoded). Les sorties françaises ont tendance à mélanger les deux, ce qui fait que certains VOSTFR sont étiquetés comme SUBFRENCH et SUBFRENCH comme VOSTFR.* + - *[2] Il est à noter que le SUBFRENCH est inclus dans ce Format Personnalisé. Néanmoins, SUB signifie souvent que le sous-titre a été intégré à l'image (hardcoded). Les sorties françaises ont tendance à mélanger les deux, ce qui fait que certains VOSTFR sont étiquetés comme SUBFRENCH et SUBFRENCH comme VOSTFR.* !!! tip "Indexers renaming in Prowlarr" - Certains indexeurs dans Prowlarr peuvent renommer les versions `MULTi` en `MULTi.TRUEFRENCH` ou `MULTi.FRENCH`. Je ne recommande pas l'utilisation d'une telle fonction car elle peut entraîner des faux positifs avec les formats personnalisés VFF, VFQ et VQ. + Certains indexeurs dans Prowlarr peuvent renommer les versions `MULTi` en `MULTi.TRUEFRENCH` ou `MULTi.FRENCH`. L'utilisation de cette fonction n'est pas recommandé, car elle peut entraîner des faux positifs avec les formats personnalisés VFF, VFQ et VQ. ??? abstract "Versions françaises - [CLIQUEZ POUR AFFICHER]" | Formats Personnalisés | Score | Trash ID | @@ -24,6 +23,7 @@ | [{{ radarr['cf']['french-vff']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vff) | 0 | {{ radarr['cf']['french-vff']['trash_id'] }} | | [{{ radarr['cf']['french-vof']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vof) | 0 | {{ radarr['cf']['french-vof']['trash_id'] }} | | [{{ radarr['cf']['french-vfi']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vfi) | 0 | {{ radarr['cf']['french-vfi']['trash_id'] }} | + | [{{ radarr['cf']['french-vf2']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vf2) | 0 | {{ radarr['cf']['french-vf2']['trash_id'] }} | | [{{ radarr['cf']['french-vfq']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vfq) | 0 | {{ radarr['cf']['french-vfq']['trash_id'] }} | | [{{ radarr['cf']['french-vq']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vq) | 0 | {{ radarr['cf']['french-vq']['trash_id'] }} | | [{{ radarr['cf']['french-vfb']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vfb) | 0 | {{ radarr['cf']['french-vfb']['trash_id'] }} | diff --git a/includes/french-guide/sonarr-french-audio-version-en.md b/includes/french-guide/sonarr-french-audio-version-en.md index 0037a9960..27771ee91 100644 --- a/includes/french-guide/sonarr-french-audio-version-en.md +++ b/includes/french-guide/sonarr-french-audio-version-en.md @@ -1,22 +1,21 @@ ??? abstract "Explanation - [CLICK TO EXPAND]" - | Acronyms | French Explanation | English Explanation | - | -------------------------------- | ----------------------------------------------------------------------------------- | --------------------------------------------------------------------- | - | TRUEFRENCH or VFF | Version Francophone Française (doublage réalisé en France) | Full French version (dubbing done in France) | - | FRENCH or VF[1] | Version Francophone (normalement equivalent à la VFQ) | French version (normally equivalent to VFQ) | - | VOF | Version Originale Française | Original French Version | - | VFI | Version Francophone Internationale | International French Version | - | VFQ | Version Francophone Québécoise | Canadian French Version | - | VQ | Version Québécoise (accent Québécois important, ex: Les Simpsons le film) | Quebec Version (strong Quebec accent, ex: The Simpsons movie) | - | VFB | Version Francophone Belge | Belgian French Version | - | VF[1-9] or FR[1-9][2] | Indique le nombre de doublage présent (normalement VF2 soit VFF et VFQ) | Indicates the number of dubs present (normally VF2 being VFF and VFQ) | - | VOSTFR[3] | Indique que l'audio est dans la langue originale, avec des sous-titres en français. | Indicates soundtrack in the original language, with French subtitles | + | Acronyms | French Explanation | English Explanation | + | -------------------------- | ----------------------------------------------------------------------------------- | --------------------------------------------------------------------- | + | TRUEFRENCH or VFF | Version Francophone Française (doublage réalisé en France) | Full French version (dubbing done in France) | + | FRENCH or VF[1] | Version Francophone (normalement equivalent à la VFQ) | French version (normally equivalent to VFQ) | + | VOF | Version Originale Française | Original French Version | + | VFI | Version Francophone Internationale | International French Version | + | VFQ | Version Francophone Québécoise | Canadian French Version | + | VQ | Version Québécoise (accent Québécois important, ex: Les Simpsons le film) | Quebec Version (strong Quebec accent, ex: The Simpsons movie) | + | VFB | Version Francophone Belge | Belgian French Version | + | VF[1-9] or FR[1-9] | Indique le nombre de doublage présent (normalement VF2 soit VFF et VFQ) | Indicates the number of dubs present (normally VF2 being VFF and VFQ) | + | VOSTFR[2] | Indique que l'audio est dans la langue originale, avec des sous-titres en français. | Indicates soundtrack in the original language, with French subtitles | - *[1] VF is included under the VFQ Custom Format, but it should be noted that it was often mismatched with VFF instead of VFQ pre-2022.* - - *[2] VF[1-9] is included under the VFI Custom Format.* - - *[3] It should be noted that SUBFRENCH is included in this Custom Format. However, SUB often means that the subtitle was embedded inside the picture (hardcoded). French releases tend to mix the two, leading to some VOSTFR being labelled as SUBFRENCH and SUBFRENCH as VOSTFR.* + - *[2] It should be noted that SUBFRENCH is included in this Custom Format. However, SUB often means that the subtitle was embedded inside the picture (hardcoded). French releases tend to mix the two, leading to some VOSTFR being labelled as SUBFRENCH and SUBFRENCH as VOSTFR.* !!! tip "Indexers renaming in Prowlarr" - Some Indexers in Prowlarr can rename `MULTi` releases to `MULTi.TRUEFRENCH` or `MULTi.FRENCH`. I do not recommend using such a feature along with those Custom Formats as it can lead to false positives from the VFF or VFQ Custom Formats. + Some Indexers in Prowlarr can rename `MULTi` releases to `MULTi.TRUEFRENCH` or `MULTi.FRENCH`. It is not recommend to use such a feature along with those Custom Formats as it can lead to false positives from the VFF, VFQ and VQ Custom Formats. ??? abstract "French Audio Versions - [CLICK TO EXPAND]" | Custom Format | Score | Trash ID | @@ -24,6 +23,7 @@ | [{{ sonarr['cf']['french-vff']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vff) | 0 | {{ sonarr['cf']['french-vff']['trash_id'] }} | | [{{ sonarr['cf']['french-vof']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vof) | 0 | {{ sonarr['cf']['french-vof']['trash_id'] }} | | [{{ sonarr['cf']['french-vfi']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vfi) | 0 | {{ sonarr['cf']['french-vfi']['trash_id'] }} | + | [{{ sonarr['cf']['french-vf2']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vf2) | 0 | {{ sonarr['cf']['french-vf2']['trash_id'] }} | | [{{ sonarr['cf']['french-vfq']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vfq) | 0 | {{ sonarr['cf']['french-vfq']['trash_id'] }} | | [{{ sonarr['cf']['french-vq']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vq) | 0 | {{ sonarr['cf']['french-vq']['trash_id'] }} | | [{{ sonarr['cf']['french-vfb']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vfb) | 0 | {{ sonarr['cf']['french-vfb']['trash_id'] }} | diff --git a/includes/french-guide/sonarr-french-audio-version-fr.md b/includes/french-guide/sonarr-french-audio-version-fr.md index 071afb144..b25191539 100644 --- a/includes/french-guide/sonarr-french-audio-version-fr.md +++ b/includes/french-guide/sonarr-french-audio-version-fr.md @@ -1,22 +1,21 @@ ??? abstract "Explications - [CLIQUEZ POUR AFFICHER]" - | Acronymes | French Explanation | English Explanation | - | -------------------------------- | ----------------------------------------------------------------------------------- | --------------------------------------------------------------------- | - | TRUEFRENCH or VFF | Version Francophone Française (doublage réalisé en France) | Full French version (dubbing done in France) | - | FRENCH or VF[1] | Version Francophone (normalement equivalent à la VFQ) | French version (normally equivalent to VFQ) | - | VOF | Version Originale Française | Original French Version | - | VFI | Version Francophone Internationale | International French Version | - | VFQ | Version Francophone Québécoise | Canadian French Version | - | VQ | Version Québécoise (accent Québécois important, ex: Les Simpsons le film) | Quebec Version (strong Quebec accent, ex: The Simpsons movie) | - | VFB | Version Francophone Belge | Belgian French Version | - | VF[1-9] or FR[1-9][2] | Indique le nombre de doublage présent (normalement VF2 soit VFF et VFQ) | Indicates the number of dubs present (normally VF2 being VFF and VFQ) | - | VOSTFR[3] | Indique que l'audio est dans la langue originale, avec des sous-titres en français. | Indicates soundtrack in the original language, with French subtitles | + | Acronymes | French Explanation | English Explanation | + | -------------------------- | ----------------------------------------------------------------------------------- | --------------------------------------------------------------------- | + | TRUEFRENCH or VFF | Version Francophone Française (doublage réalisé en France) | Full French version (dubbing done in France) | + | FRENCH or VF[1] | Version Francophone (normalement equivalent à la VFQ) | French version (normally equivalent to VFQ) | + | VOF | Version Originale Française | Original French Version | + | VFI | Version Francophone Internationale | International French Version | + | VFQ | Version Francophone Québécoise | Canadian French Version | + | VQ | Version Québécoise (accent Québécois important, ex: Les Simpsons le film) | Quebec Version (strong Quebec accent, ex: The Simpsons movie) | + | VFB | Version Francophone Belge | Belgian French Version | + | VF[1-9] or FR[1-9] | Indique le nombre de doublage présent (normalement VF2 soit VFF et VFQ) | Indicates the number of dubs present (normally VF2 being VFF and VFQ) | + | VOSTFR[2] | Indique que l'audio est dans la langue originale, avec des sous-titres en français. | Indicates soundtrack in the original language, with French subtitles | - *[1] VF est inclus dans le Format Personnalisé VFQ, mais il convient de noter qu'il était souvent associé à VFF au lieu de VFQ avant 2022.* - - *[2] VF [1-9] est inclus dans le Format Personnalisé VFI.* - - *[3] Il est à noter que le SUBFRENCH est inclus dans ce Format Personnalisé. Néanmoins, SUB signifie souvent que le sous-titre a été intégré à l'image (hardcoded). Les sorties françaises ont tendance à mélanger les deux, ce qui fait que certains VOSTFR sont étiquetés comme SUBFRENCH et SUBFRENCH comme VOSTFR.* + - *[2] Il est à noter que le SUBFRENCH est inclus dans ce Format Personnalisé. Néanmoins, SUB signifie souvent que le sous-titre a été intégré à l'image (hardcoded). Les sorties françaises ont tendance à mélanger les deux, ce qui fait que certains VOSTFR sont étiquetés comme SUBFRENCH et SUBFRENCH comme VOSTFR.* !!! tip "Indexers renaming in Prowlarr" - Certains indexeurs dans Prowlarr peuvent renommer les versions `MULTi` en `MULTi.TRUEFRENCH` ou `MULTi.FRENCH`. Je ne recommande pas l'utilisation d'une telle fonction car elle peut entraîner des faux positifs avec les formats personnalisés VFF ou VFQ. + Certains indexeurs dans Prowlarr peuvent renommer les versions `MULTi` en `MULTi.TRUEFRENCH` ou `MULTi.FRENCH`. L'utilisation de cette fonction n'est pas recommandé, car elle peut entraîner des faux positifs avec les formats personnalisés VFF, VFQ et VQ. ??? abstract "Versions françaises - [CLIQUEZ POUR AFFICHER]" | Formats Personnalisés | Score | Trash ID | @@ -24,6 +23,7 @@ | [{{ sonarr['cf']['french-vff']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vff) | 0 | {{ sonarr['cf']['french-vff']['trash_id'] }} | | [{{ sonarr['cf']['french-vof']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vof) | 0 | {{ sonarr['cf']['french-vof']['trash_id'] }} | | [{{ sonarr['cf']['french-vfi']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vfi) | 0 | {{ sonarr['cf']['french-vfi']['trash_id'] }} | + | [{{ sonarr['cf']['french-vf2']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vf2) | 0 | {{ sonarr['cf']['french-vf2']['trash_id'] }} | | [{{ sonarr['cf']['french-vfq']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vfq) | 0 | {{ sonarr['cf']['french-vfq']['trash_id'] }} | | [{{ sonarr['cf']['french-vq']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vq) | 0 | {{ sonarr['cf']['french-vq']['trash_id'] }} | | [{{ sonarr['cf']['french-vfb']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vfb) | 0 | {{ sonarr['cf']['french-vfb']['trash_id'] }} | From 0983da160cafaa2452f3728b12bbe79763640f26 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Wed, 19 Apr 2023 16:04:56 +0200 Subject: [PATCH 03/24] Update wording on how VF audios should be scored --- docs/Radarr/radarr-setup-quality-profiles-french-en.md | 5 ++++- docs/Radarr/radarr-setup-quality-profiles-french-fr.md | 7 +++++-- docs/Sonarr/sonarr-setup-quality-profiles-french-en.md | 7 +++++-- docs/Sonarr/sonarr-setup-quality-profiles-french-fr.md | 7 +++++-- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/docs/Radarr/radarr-setup-quality-profiles-french-en.md b/docs/Radarr/radarr-setup-quality-profiles-french-en.md index 06a968119..d7eec8be8 100644 --- a/docs/Radarr/radarr-setup-quality-profiles-french-en.md +++ b/docs/Radarr/radarr-setup-quality-profiles-french-en.md @@ -81,9 +81,12 @@ To illustrate this, you will see an **"Original mix (optional)"** section in eac Those are all optional and only there to rename your release or to avoid a certain type of French Audio. Examples: -- You do not want VFQ or VQ audio, in this case you will put them at `-10000` instead of `0`. +- You prefer VFF (including VFI and VF2) audio, in this case you will put them at `101` instead of `0`. - You only want VOSTFR, in this case you will ignore any mention of **MULTi Custom Formats** and give the [{{ radarr['cf']['french-vostfr']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vostfr) Custom Format a score of `1000`. +!!! warning "Attention" + It is not really recommended to put any of the VF Custom Formats (VFF, VFQ, VQ, VFI, VF2) to a negative score. Instead increase the score of your preferred audio. + {! include-markdown "../../includes/french-guide/radarr-french-audio-version-en.md" !} ------ diff --git a/docs/Radarr/radarr-setup-quality-profiles-french-fr.md b/docs/Radarr/radarr-setup-quality-profiles-french-fr.md index 41708af21..6149569d7 100644 --- a/docs/Radarr/radarr-setup-quality-profiles-french-fr.md +++ b/docs/Radarr/radarr-setup-quality-profiles-french-fr.md @@ -76,8 +76,11 @@ Afin d'illustrer ce principe, vous verrez une section **"Mix original (optionnel Ces Formats sont optionnels et ne sont là que pour renommer votre fichier ou pour éviter un certain type de version française. Exemples : -- Vous ne voulez pas de VFQ ou VQ, dans ce cas, vous leur attribuerez un score de `-10000` au lieu de `0`. -- Vous souhaitez seulement du VOSTFR, dans ce ce cas, ignorez toute mention des **Formats Personnalisés MULTi** et donnerez un score de `1000` au Format Personnalisé [{{ radarr['cf']['french-vostfr']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vostfr). +- Vous préférez l'audio VFF (y compris VFI et VF2), dans ce cas vous les placerez à `101` au lieu de `0`. +- Vous souhaitez seulement du VOSTFR, dans ce ce cas, ignorez toute mention des **Formats Personnalisés MULTi** et donnez un score de `1000` au Format Personnalisé [{{ radarr['cf']['french-vostfr']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vostfr). + +!!! warning "Attention" + Il n'est pas vraiment recommandé d'attribuer un score négatif à l'un des Formats Personnalisés de VF (VFF, VFQ, VQ, VFI, VF2). Augmentez plutôt le score de votre format audio préféré. {! include-markdown "../../includes/french-guide/radarr-french-audio-version-fr.md" !} diff --git a/docs/Sonarr/sonarr-setup-quality-profiles-french-en.md b/docs/Sonarr/sonarr-setup-quality-profiles-french-en.md index b59ef0d2d..739b3ffeb 100644 --- a/docs/Sonarr/sonarr-setup-quality-profiles-french-en.md +++ b/docs/Sonarr/sonarr-setup-quality-profiles-french-en.md @@ -67,11 +67,14 @@ An example for Anime in MULTi/VOSTFR is also provided at the end: [Anime Example ### French Audio Versions -Those are all optional and only there to rename your release or to avoid a certain type of French Audio. Examples: +Those are all optional and only there to rename your release or to prefer a certain type of French Audio. Examples: -- You do not want VFQ or VQ audio, in this case you will put them at `-10000` instead of `0`. +- You prefer VFF (including VFI and VF2) audio, in this case you will put them at `101` instead of `0`. - You only want VOSTFR, in this case you will ignore any mention of **MULTi Custom Formats** and give the [{{ sonarr['cf']['french-vostfr']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vostfr) Custom Format a score of `1000`. +!!! warning "Attention" + It is not really recommended to put any of the VF Custom Formats (VFF, VFQ, VQ, VFI, VF2) to a negative score. Instead increase the score of your preferred audio. + {! include-markdown "../../includes/french-guide/sonarr-french-audio-version-en.md" !} ------ diff --git a/docs/Sonarr/sonarr-setup-quality-profiles-french-fr.md b/docs/Sonarr/sonarr-setup-quality-profiles-french-fr.md index 2b9dac9cc..8e54fe77c 100644 --- a/docs/Sonarr/sonarr-setup-quality-profiles-french-fr.md +++ b/docs/Sonarr/sonarr-setup-quality-profiles-french-fr.md @@ -66,8 +66,11 @@ Un exemple pour les Animes en MULTi/VOSTFR est également fourni à la fin : [Ex Ces Formats sont optionnels et ne sont là que pour renommer votre fichier ou pour éviter un certain type de version française. Exemples : -- Vous ne voulez pas de VFQ ou VQ, dans ce cas, vous leur attribuerez un score de `-10000` au lieu de `0`. -- Vous souhaitez seulement du VOSTFR, dans ce ce cas, ignorez toute mention des **Formats Personnalisés MULTi** et donnerez un score de `1000` au Format Personnalisé [{{ sonarr['cf']['french-vostfr']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vostfr). +- Vous préférez l'audio VFF (y compris VFI et VF2), dans ce cas vous les placerez à `101` au lieu de `0`. +- Vous souhaitez seulement du VOSTFR, dans ce ce cas, ignorez toute mention des **Formats Personnalisés MULTi** et donnez un score de `1000` au Format Personnalisé [{{ sonarr['cf']['french-vostfr']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vostfr). + +!!! warning "Attention" + Il n'est pas vraiment recommandé d'attribuer un score négatif à l'un des Formats Personnalisés de VF (VFF, VFQ, VQ, VFI, VF2). Augmentez plutôt le score de votre format audio préféré. {! include-markdown "../../includes/french-guide/sonarr-french-audio-version-fr.md" !} From 719e9848132108067903bde01f641eb7fcaaf64b Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Wed, 19 Apr 2023 16:05:34 +0200 Subject: [PATCH 04/24] Update Recyclarr configs to follow new changes --- .../radarr/french-hd-bluray-web-multi.yml | 22 +++++++++++-------- .../radarr/french-remux-web-1080p-multi.yml | 22 +++++++++++-------- .../radarr/french-remux-web-2160p-multi.yml | 22 +++++++++++-------- .../radarr/french-uhd-bluray-web-multi.yml | 22 +++++++++++-------- .../sonarr/french-web-1080p-multi-v4.yml | 22 +++++++++++-------- 5 files changed, 65 insertions(+), 45 deletions(-) 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 ae212beda..e0ac87778 100644 --- a/docs/recyclarr-configs/radarr/french-hd-bluray-web-multi.yml +++ b/docs/recyclarr-configs/radarr/french-hd-bluray-web-multi.yml @@ -76,42 +76,46 @@ radarr: # ===== Versions françaises ===== # Activez ou désactiver les Formats Personnalisés suivant si vous souhaitez noter vos releases avec. - # Vous pouvez aussi leur attribuer un score en fonction de si vous souhaitez ou non obtenir un certain - # type d'audio français. Par exemple si vous ne souhaitez pas de la VQ. + # Vous pouvez aussi leur attribuer un score en fonction de si vous souhaitez préférer un certain + # type d'audio français. Par exemple si vous préférez la VFF. # Pensez à vérifier aussi à quoi corresponde les différents types de version francophones : # https://trash-guides.info/Radarr/radarr-setup-quality-profiles-french-en/#french-audio-versions - trash_ids: - 404c08fd0bd67f39b4d8e5709319094e # VFF quality_profiles: - name: FR-MULTi-BLURAY-WEB-1080p - # score: -10000 + # score: 101 - trash_ids: - 4cafa20d5584f6ba1871d1b8941aa3cb # VOF quality_profiles: - name: FR-MULTi-BLURAY-WEB-1080p - # score: -10000 + # score: 101 - trash_ids: - 52772f1cad6b5d26c2551f79bc538a50 # VFI quality_profiles: - name: FR-MULTi-BLURAY-WEB-1080p - # score: -10000 + # score: 101 + - trash_ids: + - 29b5f7b1a5f20f64228786c3ab1bdc7d # VF2 + quality_profiles: + - name: FR-MULTi-BLURAY-WEB-1080p + # score: 101 - trash_ids: - b6ace47331a1d3b77942fc18156f6df6 # VFQ quality_profiles: - name: FR-MULTi-BLURAY-WEB-1080p - # score: -10000 + # score: 101 - trash_ids: - 95aa50f71a01c82354a7a2b385f1c4d8 # VQ quality_profiles: - name: FR-MULTi-BLURAY-WEB-1080p - # score: -10000 + # score: 101 - trash_ids: - b3fb499641d7b3c2006be1d9eb014cb3 # VFB quality_profiles: - name: FR-MULTi-BLURAY-WEB-1080p - # score: -10000 + # score: 101 - trash_ids: - 9172b2f683f6223e3a1846427b417a3d # VOSTFR quality_profiles: - name: FR-MULTi-BLURAY-WEB-1080p - # score: -10000 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 3a48abe88..8d2b96928 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-1080p-multi.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-1080p-multi.yml @@ -95,42 +95,46 @@ radarr: # ===== Versions françaises ===== # Activez ou désactiver les Formats Personnalisés suivant si vous souhaitez noter vos releases avec. - # Vous pouvez aussi leur attribuer un score en fonction de si vous souhaitez ou non obtenir un certain - # type d'audio français. Par exemple si vous ne souhaitez pas de la VQ. + # Vous pouvez aussi leur attribuer un score en fonction de si vous souhaitez préférer un certain + # type d'audio français. Par exemple si vous préférez la VFF. # Pensez à vérifier aussi à quoi corresponde les différents types de version francophones : # https://trash-guides.info/Radarr/radarr-setup-quality-profiles-french-en/#french-audio-versions - trash_ids: - 404c08fd0bd67f39b4d8e5709319094e # VFF quality_profiles: - name: FR-MULTi-REMUX-WEB-1080p - # score: -10000 + # score: 101 - trash_ids: - 4cafa20d5584f6ba1871d1b8941aa3cb # VOF quality_profiles: - name: FR-MULTi-REMUX-WEB-1080p - # score: -10000 + # score: 101 - trash_ids: - 52772f1cad6b5d26c2551f79bc538a50 # VFI quality_profiles: - name: FR-MULTi-REMUX-WEB-1080p - # score: -10000 + # score: 101 + - trash_ids: + - 29b5f7b1a5f20f64228786c3ab1bdc7d # VF2 + quality_profiles: + - name: FR-MULTi-BLURAY-WEB-1080p + # score: 101 - trash_ids: - b6ace47331a1d3b77942fc18156f6df6 # VFQ quality_profiles: - name: FR-MULTi-REMUX-WEB-1080p - # score: -10000 + # score: 101 - trash_ids: - 95aa50f71a01c82354a7a2b385f1c4d8 # VQ quality_profiles: - name: FR-MULTi-REMUX-WEB-1080p - # score: -10000 + # score: 101 - trash_ids: - b3fb499641d7b3c2006be1d9eb014cb3 # VFB quality_profiles: - name: FR-MULTi-REMUX-WEB-1080p - # score: -10000 + # score: 101 - trash_ids: - 9172b2f683f6223e3a1846427b417a3d # VOSTFR quality_profiles: - name: FR-MULTi-REMUX-WEB-1080p - # score: -10000 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 8bec0aa55..94426d973 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-2160p-multi.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-2160p-multi.yml @@ -112,42 +112,46 @@ radarr: # ===== Versions françaises ===== # Activez ou désactiver les Formats Personnalisés suivant si vous souhaitez noter vos releases avec. - # Vous pouvez aussi leur attribuer un score en fonction de si vous souhaitez ou non obtenir un certain - # type d'audio français. Par exemple si vous ne souhaitez pas de la VQ. + # Vous pouvez aussi leur attribuer un score en fonction de si vous souhaitez préférer un certain + # type d'audio français. Par exemple si vous préférez la VFF. # Pensez à vérifier aussi à quoi corresponde les différents types de version francophones : # https://trash-guides.info/Radarr/radarr-setup-quality-profiles-french-en/#french-audio-versions - trash_ids: - 404c08fd0bd67f39b4d8e5709319094e # VFF quality_profiles: - name: FR-MULTi-REMUX-WEB-2160p - # score: -10000 + # score: 101 - trash_ids: - 4cafa20d5584f6ba1871d1b8941aa3cb # VOF quality_profiles: - name: FR-MULTi-REMUX-WEB-2160p - # score: -10000 + # score: 101 - trash_ids: - 52772f1cad6b5d26c2551f79bc538a50 # VFI quality_profiles: - name: FR-MULTi-REMUX-WEB-2160p - # score: -10000 + # score: 101 + - trash_ids: + - 29b5f7b1a5f20f64228786c3ab1bdc7d # VF2 + quality_profiles: + - name: FR-MULTi-BLURAY-WEB-1080p + # score: 101 - trash_ids: - b6ace47331a1d3b77942fc18156f6df6 # VFQ quality_profiles: - name: FR-MULTi-REMUX-WEB-2160p - # score: -10000 + # score: 101 - trash_ids: - 95aa50f71a01c82354a7a2b385f1c4d8 # VQ quality_profiles: - name: FR-MULTi-REMUX-WEB-2160p - # score: -10000 + # score: 101 - trash_ids: - b3fb499641d7b3c2006be1d9eb014cb3 # VFB quality_profiles: - name: FR-MULTi-REMUX-WEB-2160p - # score: -10000 + # score: 101 - trash_ids: - 9172b2f683f6223e3a1846427b417a3d # VOSTFR quality_profiles: - name: FR-MULTi-REMUX-WEB-2160p - # score: -10000 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 3315eca54..4c6c23a42 100644 --- a/docs/recyclarr-configs/radarr/french-uhd-bluray-web-multi.yml +++ b/docs/recyclarr-configs/radarr/french-uhd-bluray-web-multi.yml @@ -113,42 +113,46 @@ radarr: # ===== Versions françaises ===== # Activez ou désactiver les Formats Personnalisés suivant si vous souhaitez noter vos releases avec. - # Vous pouvez aussi leur attribuer un score en fonction de si vous souhaitez ou non obtenir un certain - # type d'audio français. Par exemple si vous ne souhaitez pas de la VQ. + # Vous pouvez aussi leur attribuer un score en fonction de si vous souhaitez préférer un certain + # type d'audio français. Par exemple si vous préférez la VFF. # Pensez à vérifier aussi à quoi corresponde les différents types de version francophones : # https://trash-guides.info/Radarr/radarr-setup-quality-profiles-french-en/#french-audio-versions - trash_ids: - 404c08fd0bd67f39b4d8e5709319094e # VFF quality_profiles: - name: FR-MULTi-BLURAY-WEB-2160p - # score: -10000 + # score: 101 - trash_ids: - 4cafa20d5584f6ba1871d1b8941aa3cb # VOF quality_profiles: - name: FR-MULTi-BLURAY-WEB-2160p - # score: -10000 + # score: 101 - trash_ids: - 52772f1cad6b5d26c2551f79bc538a50 # VFI quality_profiles: - name: FR-MULTi-BLURAY-WEB-2160p - # score: -10000 + # score: 101 + - trash_ids: + - 29b5f7b1a5f20f64228786c3ab1bdc7d # VF2 + quality_profiles: + - name: FR-MULTi-BLURAY-WEB-1080p + # score: 101 - trash_ids: - b6ace47331a1d3b77942fc18156f6df6 # VFQ quality_profiles: - name: FR-MULTi-BLURAY-WEB-2160p - # score: -10000 + # score: 101 - trash_ids: - 95aa50f71a01c82354a7a2b385f1c4d8 # VQ quality_profiles: - name: FR-MULTi-BLURAY-WEB-2160p - # score: -10000 + # score: 101 - trash_ids: - b3fb499641d7b3c2006be1d9eb014cb3 # VFB quality_profiles: - name: FR-MULTi-BLURAY-WEB-2160p - # score: -10000 + # score: 101 - trash_ids: - 9172b2f683f6223e3a1846427b417a3d # VOSTFR quality_profiles: - name: FR-MULTi-BLURAY-WEB-2160p - # score: -10000 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 998bdd65c..6c6c3cddd 100644 --- a/docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml @@ -80,45 +80,49 @@ sonarr: # ===== Versions françaises ===== # Activez ou désactiver les Formats Personnalisés suivant si vous souhaitez noter vos releases avec. - # Vous pouvez aussi leur attribuer un score en fonction de si vous souhaitez ou non obtenir un certain - # type d'audio français. Par exemple si vous ne souhaitez pas de la VQ. + # Vous pouvez aussi leur attribuer un score en fonction de si vous souhaitez préférer un certain + # type d'audio français. Par exemple si vous préférez la VFF. # Pensez à vérifier aussi à quoi corresponde les différents types de version francophones : # https://trash-guides.info/Sonarr/sonarr-setup-quality-profiles-french-fr/#type-de-versions-francaises - trash_ids: - 2c29a39a4fdfd6d258799bc4c09731b9 # VFF quality_profiles: - name: FR-MULTi-WEB-1080p - # score: -10000 + # score: 101 - trash_ids: - 7ae924ee9b2f39df3283c6c0beb8a2aa # VOF quality_profiles: - name: FR-MULTi-WEB-1080p - # score: -10000 + # score: 101 - trash_ids: - b6816a0e1d4b64bf3550ad3b74b009b6 # VFI quality_profiles: - name: FR-MULTi-WEB-1080p - # score: -10000 + # score: 101 + - trash_ids: + - b6816a0e1d4b64bf3550ad3b74b009b6 # VF2 + quality_profiles: + - name: FR-MULTi-WEB-1080p + # score: 101 - trash_ids: - 7a7f4e4f58bd1058440236d033a90b67 # VFQ quality_profiles: - name: FR-MULTi-WEB-1080p - # score: -10000 + # score: 101 - trash_ids: - 82085412d9a53ba8d8e46fc624eb701d # VQ quality_profiles: - name: FR-MULTi-WEB-1080p - # score: -10000 + # score: 101 - trash_ids: - 0ce1e39a4676c6692ce47935278dac76 # VFB quality_profiles: - name: FR-MULTi-WEB-1080p - # score: -10000 + # score: 101 - trash_ids: - 07a32f77690263bb9fda1842db7e273f # VOSTFR quality_profiles: - name: FR-MULTi-WEB-1080p - # score: -10000 # ==== Scores Optionnels ==== # Décommenter le score associé si c'est ce que vous souhaitez From 2ee216bd720c447170a8c51a13dd871841e6e5c4 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Wed, 19 Apr 2023 16:05:44 +0200 Subject: [PATCH 05/24] Update wording --- docs/recyclarr-configs/sonarr/french-anime-multi-v4.yml | 2 +- docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/recyclarr-configs/sonarr/french-anime-multi-v4.yml b/docs/recyclarr-configs/sonarr/french-anime-multi-v4.yml index 09ebca6ea..6472c0e7c 100644 --- a/docs/recyclarr-configs/sonarr/french-anime-multi-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-anime-multi-v4.yml @@ -56,7 +56,7 @@ sonarr: - 4e6134a384dbc0ef166234cc0e45d26d # FR Anime Tier 02 - 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 de bonnes releases en SeaDex + # vous pouvez les activer si vous souhaitez aussi récupérer les releases en SeaDex # si jamais une release MULTi/VOSTFR n'existes pas. # # Il est tout de fois possible que dans ce cas Sonarr récupére une release SeaDex au lieu diff --git a/docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml b/docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml index 4f48d0c05..98e90734d 100644 --- a/docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml @@ -49,7 +49,7 @@ sonarr: - 4e6134a384dbc0ef166234cc0e45d26d # FR Anime Tier 02 - 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 de bonnes releases en SeaDex + # vous pouvez les activer si vous souhaitez aussi récupérer les releases en SeaDex # si jamais une release VOSTFR n'existes pas. # # Il est tout de fois possible que dans ce cas Sonarr récupére une release SeaDex au lieu From 4aaec06fe65a8489931d6225eb8adc2c2ccaaa88 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Wed, 19 Apr 2023 16:05:56 +0200 Subject: [PATCH 06/24] Update templates.json Add French Radarr configs --- docs/recyclarr-configs/templates.json | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/docs/recyclarr-configs/templates.json b/docs/recyclarr-configs/templates.json index e0a939299..23514ff42 100644 --- a/docs/recyclarr-configs/templates.json +++ b/docs/recyclarr-configs/templates.json @@ -20,6 +20,38 @@ "template": "radarr/anime-radarr.yml", "id": "anime-radarr" }, + { + "template": "radarr/french-hd-bluray-web-multi.yml", + "id": "french-hd-bluray-web-multi" + }, + { + "template": "radarr/french-hd-bluray-web-vostfr.yml", + "id": "french-hd-bluray-web-vostfr" + }, + { + "template": "radarr/french-remux-web-1080p-multi.yml", + "id": "french-remux-web-1080p-multi" + }, + { + "template": "radarr/french-remux-web-1080p-vostfr.yml", + "id": "french-remux-web-1080p-vostfr" + }, + { + "template": "radarr/french-uhd-bluray-web-multi.yml", + "id": "french-uhd-bluray-web-multi" + }, + { + "template": "radarr/french-uhd-bluray-web-vostfr.yml", + "id": "french-uhd-bluray-web-vostfr" + }, + { + "template": "radarr/french-remux-web-2160p-multi.yml", + "id": "french-remux-web-2160p-multi" + }, + { + "template": "radarr/french-remux-web-2160p-vostfr.yml", + "id": "french-remux-web-2160p-vostfr" + }, { "template": "radarr/sqp/sqp-1.yml", "id": "sqp-1", From 5632d510ccba1bfc83e3e4e2360920affb9b6006 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Wed, 19 Apr 2023 16:11:50 +0200 Subject: [PATCH 07/24] Update Recyclarr configs for v5 configurations --- docs/recyclarr-configs/radarr/french-hd-bluray-web-multi.yml | 5 ++++- .../recyclarr-configs/radarr/french-hd-bluray-web-vostfr.yml | 5 ++++- .../radarr/french-remux-web-1080p-multi.yml | 5 ++++- .../radarr/french-remux-web-1080p-vostfr.yml | 5 ++++- .../radarr/french-remux-web-2160p-multi.yml | 5 ++++- .../radarr/french-remux-web-2160p-vostfr.yml | 5 ++++- .../recyclarr-configs/radarr/french-uhd-bluray-web-multi.yml | 5 ++++- .../radarr/french-uhd-bluray-web-vostfr.yml | 5 ++++- docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml | 5 ++++- docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml | 5 ++++- docs/recyclarr-configs/sonarr/french-web-1080p-vostfr-v4.yml | 5 ++++- 11 files changed, 44 insertions(+), 11 deletions(-) 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 e0ac87778..7ddc121a7 100644 --- a/docs/recyclarr-configs/radarr/french-hd-bluray-web-multi.yml +++ b/docs/recyclarr-configs/radarr/french-hd-bluray-web-multi.yml @@ -12,6 +12,10 @@ radarr: quality_definition: type: movie + + quality_profiles: + - name: FR-MULTi-BLURAY-WEB-1080p + reset_unmatched_scores: true # La liste de Formats Personnalisés à synchroniser avec Radarr. custom_formats: @@ -72,7 +76,6 @@ radarr: # - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03 quality_profiles: - name: FR-MULTi-BLURAY-WEB-1080p - reset_unmatched_scores: true # ===== Versions françaises ===== # Activez ou désactiver les Formats Personnalisés suivant si vous souhaitez noter vos releases avec. 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 4b5f1a5b4..57ee4631b 100644 --- a/docs/recyclarr-configs/radarr/french-hd-bluray-web-vostfr.yml +++ b/docs/recyclarr-configs/radarr/french-hd-bluray-web-vostfr.yml @@ -12,6 +12,10 @@ radarr: quality_definition: type: movie + + quality_profiles: + - name: FR-VOSTFR-BLURAY-WEB-1080p + reset_unmatched_scores: true # La liste de Formats Personnalisés à synchroniser avec Radarr. custom_formats: @@ -65,7 +69,6 @@ radarr: - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03 quality_profiles: - name: FR-VOSTFR-BLURAY-WEB-1080p - reset_unmatched_scores: true # ===== MULTi Audio ===== # Nécessaire vu qu'on ne souhaite pas de MULTi 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 8d2b96928..cdb8eafd8 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-1080p-multi.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-1080p-multi.yml @@ -12,6 +12,10 @@ radarr: quality_definition: type: movie + + quality_profiles: + - name: FR-MULTi-REMUX-WEB-1080p + reset_unmatched_scores: true # La liste de Formats Personnalisés à synchroniser avec Radarr. custom_formats: @@ -91,7 +95,6 @@ radarr: # - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03 quality_profiles: - name: FR-MULTi-REMUX-WEB-1080p - reset_unmatched_scores: true # ===== Versions françaises ===== # Activez ou désactiver les Formats Personnalisés suivant si vous souhaitez noter vos releases avec. 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 73f213885..6edc7f279 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-1080p-vostfr.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-1080p-vostfr.yml @@ -12,6 +12,10 @@ radarr: quality_definition: type: movie + + quality_profiles: + - name: FR-VOSTFR-REMUX-WEB-1080p + reset_unmatched_scores: true # La liste de Formats Personnalisés à synchroniser avec Radarr. custom_formats: @@ -82,7 +86,6 @@ radarr: - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03 quality_profiles: - name: FR-VOSTFR-REMUX-WEB-1080p - reset_unmatched_scores: true # ===== MULTi Audio ===== # Nécessaire vu qu'on ne souhaite pas de MULTi 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 94426d973..0550d49da 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-2160p-multi.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-2160p-multi.yml @@ -12,6 +12,10 @@ radarr: quality_definition: type: movie + + quality_profiles: + - name: FR-MULTi-REMUX-WEB-2160p + reset_unmatched_scores: true # La liste de Formats Personnalisés à synchroniser avec Radarr. custom_formats: @@ -108,7 +112,6 @@ radarr: # - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03 quality_profiles: - name: FR-MULTi-REMUX-WEB-2160p - reset_unmatched_scores: true # ===== Versions françaises ===== # Activez ou désactiver les Formats Personnalisés suivant si vous souhaitez noter vos releases avec. 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 cbbcf1404..5589b3c31 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-2160p-vostfr.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-2160p-vostfr.yml @@ -12,6 +12,10 @@ radarr: quality_definition: type: movie + + quality_profiles: + - name: FR-VOSTFR-REMUX-WEB-2160p + reset_unmatched_scores: true # La liste de Formats Personnalisés à synchroniser avec Radarr. custom_formats: @@ -99,7 +103,6 @@ radarr: - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03 quality_profiles: - name: FR-VOSTFR-REMUX-WEB-2160p - reset_unmatched_scores: true # ===== MULTi Audio ===== # Nécessaire vu qu'on ne souhaite pas de MULTi 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 4c6c23a42..849dc6673 100644 --- a/docs/recyclarr-configs/radarr/french-uhd-bluray-web-multi.yml +++ b/docs/recyclarr-configs/radarr/french-uhd-bluray-web-multi.yml @@ -12,6 +12,10 @@ radarr: quality_definition: type: movie + + quality_profiles: + - name: FR-MULTi-BLURAY-WEB-2160p + reset_unmatched_scores: true # La liste de Formats Personnalisés à synchroniser avec Radarr. custom_formats: @@ -109,7 +113,6 @@ radarr: # - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03 quality_profiles: - name: FR-MULTi-BLURAY-WEB-2160p - reset_unmatched_scores: true # ===== Versions françaises ===== # Activez ou désactiver les Formats Personnalisés suivant si vous souhaitez noter vos releases avec. 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 bc21e8642..8e841a9b6 100644 --- a/docs/recyclarr-configs/radarr/french-uhd-bluray-web-vostfr.yml +++ b/docs/recyclarr-configs/radarr/french-uhd-bluray-web-vostfr.yml @@ -12,6 +12,10 @@ radarr: quality_definition: type: movie + + quality_profiles: + - name: FR-VOSTFR-BLURAY-WEB-2160p + reset_unmatched_scores: true # La liste de Formats Personnalisés à synchroniser avec Radarr. custom_formats: @@ -100,7 +104,6 @@ radarr: - af94e0fe497124d1f9ce732069ec8c3b # WEB Tier 03 quality_profiles: - name: FR-VOSTFR-BLURAY-WEB-2160p - reset_unmatched_scores: true # ===== MULTi Audio ===== # Nécessaire vu qu'on ne souhaite pas de MULTi diff --git a/docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml b/docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml index 98e90734d..c395c2555 100644 --- a/docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml @@ -12,6 +12,10 @@ sonarr: quality_definition: type: anime + + quality_profiles: + - name: FR-ANIME-VOSTFR + reset_unmatched_scores: true # La liste de Formats Personnalisés à synchroniser avec Sonarr. custom_formats: @@ -72,7 +76,6 @@ sonarr: # - dc262f88d74c651b12e9d90b39f6c753 # Anime Web Tier 06 (FanSubs) quality_profiles: - name: FR-ANIME-VOSTFR - reset_unmatched_scores: true - trash_ids: - d660701077794679fd59e8bdf4ce3a29 # AMZN 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 6c6c3cddd..a9ed5aeb4 100644 --- a/docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml @@ -12,6 +12,10 @@ sonarr: quality_definition: type: series + + quality_profiles: + - name: FR-MULTi-WEB-1080p + reset_unmatched_scores: true # La liste de Formats Personnalisés à synchroniser avec Sonarr. custom_formats: @@ -70,7 +74,6 @@ sonarr: # - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03 quality_profiles: - name: FR-MULTi-WEB-1080p - reset_unmatched_scores: true - trash_ids: - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 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 1148e3865..4e858fb5b 100644 --- a/docs/recyclarr-configs/sonarr/french-web-1080p-vostfr-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-web-1080p-vostfr-v4.yml @@ -12,6 +12,10 @@ sonarr: quality_definition: type: series + + quality_profiles: + - name: FR-VOSTFR-WEB-1080p + reset_unmatched_scores: true # La liste de Formats Personnalisés à synchroniser avec Sonarr. custom_formats: @@ -62,7 +66,6 @@ sonarr: - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03 quality_profiles: - name: FR-VOSTFR-WEB-1080p - reset_unmatched_scores: true - trash_ids: - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 From 2caf39f11cadf81d222625a1587495cc1cc9a0b5 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Wed, 19 Apr 2023 16:18:41 +0200 Subject: [PATCH 08/24] Add Vinegar Syndrome 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 | 1 + docs/recyclarr-configs/radarr/french-remux-web-1080p-vostfr.yml | 1 + docs/recyclarr-configs/radarr/french-remux-web-2160p-multi.yml | 1 + docs/recyclarr-configs/radarr/french-remux-web-2160p-vostfr.yml | 1 + docs/recyclarr-configs/radarr/french-uhd-bluray-web-multi.yml | 1 + docs/recyclarr-configs/radarr/french-uhd-bluray-web-vostfr.yml | 1 + 8 files changed, 8 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 7ddc121a7..a68d184a5 100644 --- a/docs/recyclarr-configs/radarr/french-hd-bluray-web-multi.yml +++ b/docs/recyclarr-configs/radarr/french-hd-bluray-web-multi.yml @@ -38,6 +38,7 @@ radarr: - eca37840c13c6ef2dd0262b141a5482f # 4K Remaster - e0c07d59beb37348e975a930d5e50319 # Criterion Collection - 9d27d9d2181838f76dee150882bdc58c # Masters of Cinema + - db9b4c4b53d312a3ca5f1378f6440fc9 # Vinegar Syndrome - 957d0f44b592285f26449575e8b1167e # Special Edition - eecf3a857724171f968a66cb5719e152 # IMAX - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced 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 57ee4631b..6655ab97a 100644 --- a/docs/recyclarr-configs/radarr/french-hd-bluray-web-vostfr.yml +++ b/docs/recyclarr-configs/radarr/french-hd-bluray-web-vostfr.yml @@ -34,6 +34,7 @@ radarr: - eca37840c13c6ef2dd0262b141a5482f # 4K Remaster - e0c07d59beb37348e975a930d5e50319 # Criterion Collection - 9d27d9d2181838f76dee150882bdc58c # Masters of Cinema + - db9b4c4b53d312a3ca5f1378f6440fc9 # Vinegar Syndrome - 957d0f44b592285f26449575e8b1167e # Special Edition - eecf3a857724171f968a66cb5719e152 # IMAX - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced 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 cdb8eafd8..f87153aa5 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-1080p-multi.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-1080p-multi.yml @@ -57,6 +57,7 @@ radarr: - eca37840c13c6ef2dd0262b141a5482f # 4K Remaster - e0c07d59beb37348e975a930d5e50319 # Criterion Collection - 9d27d9d2181838f76dee150882bdc58c # Masters of Cinema + - db9b4c4b53d312a3ca5f1378f6440fc9 # Vinegar Syndrome - 957d0f44b592285f26449575e8b1167e # Special Edition - eecf3a857724171f968a66cb5719e152 # IMAX - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced 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 6edc7f279..4f6430ada 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-1080p-vostfr.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-1080p-vostfr.yml @@ -51,6 +51,7 @@ radarr: - eca37840c13c6ef2dd0262b141a5482f # 4K Remaster - e0c07d59beb37348e975a930d5e50319 # Criterion Collection - 9d27d9d2181838f76dee150882bdc58c # Masters of Cinema + - db9b4c4b53d312a3ca5f1378f6440fc9 # Vinegar Syndrome - 957d0f44b592285f26449575e8b1167e # Special Edition - eecf3a857724171f968a66cb5719e152 # IMAX - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced 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 0550d49da..5a6f5f5d7 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-2160p-multi.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-2160p-multi.yml @@ -74,6 +74,7 @@ radarr: - eca37840c13c6ef2dd0262b141a5482f # 4K Remaster - e0c07d59beb37348e975a930d5e50319 # Criterion Collection - 9d27d9d2181838f76dee150882bdc58c # Masters of Cinema + - db9b4c4b53d312a3ca5f1378f6440fc9 # Vinegar Syndrome - 957d0f44b592285f26449575e8b1167e # Special Edition - eecf3a857724171f968a66cb5719e152 # IMAX - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced 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 5589b3c31..da309cb2e 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-2160p-vostfr.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-2160p-vostfr.yml @@ -68,6 +68,7 @@ radarr: - eca37840c13c6ef2dd0262b141a5482f # 4K Remaster - e0c07d59beb37348e975a930d5e50319 # Criterion Collection - 9d27d9d2181838f76dee150882bdc58c # Masters of Cinema + - db9b4c4b53d312a3ca5f1378f6440fc9 # Vinegar Syndrome - 957d0f44b592285f26449575e8b1167e # Special Edition - eecf3a857724171f968a66cb5719e152 # IMAX - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced 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 849dc6673..d65443add 100644 --- a/docs/recyclarr-configs/radarr/french-uhd-bluray-web-multi.yml +++ b/docs/recyclarr-configs/radarr/french-uhd-bluray-web-multi.yml @@ -74,6 +74,7 @@ radarr: - eca37840c13c6ef2dd0262b141a5482f # 4K Remaster - e0c07d59beb37348e975a930d5e50319 # Criterion Collection - 9d27d9d2181838f76dee150882bdc58c # Masters of Cinema + - db9b4c4b53d312a3ca5f1378f6440fc9 # Vinegar Syndrome - 957d0f44b592285f26449575e8b1167e # Special Edition - eecf3a857724171f968a66cb5719e152 # IMAX - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced 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 8e841a9b6..67bc354cf 100644 --- a/docs/recyclarr-configs/radarr/french-uhd-bluray-web-vostfr.yml +++ b/docs/recyclarr-configs/radarr/french-uhd-bluray-web-vostfr.yml @@ -68,6 +68,7 @@ radarr: - eca37840c13c6ef2dd0262b141a5482f # 4K Remaster - e0c07d59beb37348e975a930d5e50319 # Criterion Collection - 9d27d9d2181838f76dee150882bdc58c # Masters of Cinema + - db9b4c4b53d312a3ca5f1378f6440fc9 # Vinegar Syndrome - 957d0f44b592285f26449575e8b1167e # Special Edition - eecf3a857724171f968a66cb5719e152 # IMAX - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced From a0067f252578f69de449c36829b33d95f53e68f4 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Wed, 19 Apr 2023 16:54:54 +0200 Subject: [PATCH 09/24] Fix yamlint errors --- .../radarr/french-hd-bluray-web-multi.yml | 12 ++++++------ .../radarr/french-hd-bluray-web-vostfr.yml | 12 ++++++------ .../radarr/french-remux-web-1080p-multi.yml | 12 ++++++------ .../radarr/french-remux-web-1080p-vostfr.yml | 12 ++++++------ .../radarr/french-remux-web-2160p-multi.yml | 12 ++++++------ .../radarr/french-remux-web-2160p-vostfr.yml | 12 ++++++------ .../radarr/french-uhd-bluray-web-multi.yml | 12 ++++++------ .../radarr/french-uhd-bluray-web-vostfr.yml | 12 ++++++------ .../sonarr/french-anime-multi-v4.yml | 5 ++++- .../sonarr/french-anime-vostfr-v4.yml | 2 +- .../sonarr/french-web-1080p-multi-v4.yml | 2 +- .../sonarr/french-web-1080p-vostfr-v4.yml | 2 +- 12 files changed, 55 insertions(+), 52 deletions(-) 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 a68d184a5..176a0e703 100644 --- a/docs/recyclarr-configs/radarr/french-hd-bluray-web-multi.yml +++ b/docs/recyclarr-configs/radarr/french-hd-bluray-web-multi.yml @@ -12,7 +12,7 @@ radarr: quality_definition: type: movie - + quality_profiles: - name: FR-MULTi-BLURAY-WEB-1080p reset_unmatched_scores: true @@ -60,12 +60,12 @@ radarr: - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP - c2863d2a50c9acad1fb50e53ece60817 # STAN # ===== HQ Source Groups ===== - - 5322da05b19d857acc1e75be3edf47b3 # FR HD Bluray Tier 01 - - 57f34251344be2e283fc30e00e458be6 # FR HD Bluray Tier 02 - - 9790a618cec1aeac8ce75601a17ea40d # FR WEB Tier 01 - - 3c83a765f84239716bd5fd2d7af188f9 # FR WEB Tier 02 + - 5322da05b19d857acc1e75be3edf47b3 # FR HD Bluray Tier 01 + - 57f34251344be2e283fc30e00e458be6 # FR HD Bluray Tier 02 + - 9790a618cec1aeac8ce75601a17ea40d # FR WEB Tier 01 + - 3c83a765f84239716bd5fd2d7af188f9 # FR WEB Tier 02 # Vous pouvez commenter/supprimer le groupe scene si vous ne souhaitez pas de releases venant de la Scene française - - 0d94489c0d5828cd3bf9409d309fb32b # FR Scene Groups + - 0d94489c0d5828cd3bf9409d309fb32b # FR Scene Groups # Les tiers suivant sont les tiers originaux du guide (groupes anglophones) # vous pouvez les activer si vous souhaitez aussi récupérer de bonnes releases en VO si jamais une release MULTi n'existes pas. # 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 6655ab97a..91d919b8d 100644 --- a/docs/recyclarr-configs/radarr/french-hd-bluray-web-vostfr.yml +++ b/docs/recyclarr-configs/radarr/french-hd-bluray-web-vostfr.yml @@ -12,7 +12,7 @@ radarr: quality_definition: type: movie - + quality_profiles: - name: FR-VOSTFR-BLURAY-WEB-1080p reset_unmatched_scores: true @@ -56,12 +56,12 @@ radarr: - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP - c2863d2a50c9acad1fb50e53ece60817 # STAN # ===== HQ Source Groups ===== - - 5322da05b19d857acc1e75be3edf47b3 # FR HD Bluray Tier 01 - - 57f34251344be2e283fc30e00e458be6 # FR HD Bluray Tier 02 - - 9790a618cec1aeac8ce75601a17ea40d # FR WEB Tier 01 - - 3c83a765f84239716bd5fd2d7af188f9 # FR WEB Tier 02 + - 5322da05b19d857acc1e75be3edf47b3 # FR HD Bluray Tier 01 + - 57f34251344be2e283fc30e00e458be6 # FR HD Bluray Tier 02 + - 9790a618cec1aeac8ce75601a17ea40d # FR WEB Tier 01 + - 3c83a765f84239716bd5fd2d7af188f9 # FR WEB Tier 02 # Vous pouvez commenter/supprimer le groupe scene si vous ne souhaitez pas de releases venant de la Scene française - - 0d94489c0d5828cd3bf9409d309fb32b # FR Scene Groups + - 0d94489c0d5828cd3bf9409d309fb32b # FR Scene Groups # Les tiers suivant sont les tiers originaux du guide (groupes anglophones) - ed27ebfef2f323e964fb1f61391bcb35 # HD Bluray Tier 01 - c20c8647f2746a1f4c4262b0fbbeeeae # HD Bluray Tier 02 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 f87153aa5..49cc88a86 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-1080p-multi.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-1080p-multi.yml @@ -12,7 +12,7 @@ radarr: quality_definition: type: movie - + quality_profiles: - name: FR-MULTi-REMUX-WEB-1080p reset_unmatched_scores: true @@ -79,12 +79,12 @@ radarr: - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP - c2863d2a50c9acad1fb50e53ece60817 # STAN # ===== HQ Source Groups ===== - - 5583260016e0b9f683f53af41fb42e4a # FR Remux Tier 01 - - 9019d81307e68cd4a7eb06a567e833b8 # FR Remux Tier 02 - - 9790a618cec1aeac8ce75601a17ea40d # FR WEB Tier 01 - - 3c83a765f84239716bd5fd2d7af188f9 # FR WEB Tier 02 + - 5583260016e0b9f683f53af41fb42e4a # FR Remux Tier 01 + - 9019d81307e68cd4a7eb06a567e833b8 # FR Remux Tier 02 + - 9790a618cec1aeac8ce75601a17ea40d # FR WEB Tier 01 + - 3c83a765f84239716bd5fd2d7af188f9 # FR WEB Tier 02 # Vous pouvez commenter/supprimer le groupe scene si vous ne souhaitez pas de releases venant de la Scene française - - 0d94489c0d5828cd3bf9409d309fb32b # FR Scene Groups + - 0d94489c0d5828cd3bf9409d309fb32b # FR Scene Groups # Les tiers suivant sont les tiers originaux du guide (groupes anglophones) # vous pouvez les activer si vous souhaitez aussi récupérer de bonnes releases en VO si jamais une release MULTi n'existes pas. # 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 4f6430ada..bcbe13620 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-1080p-vostfr.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-1080p-vostfr.yml @@ -12,7 +12,7 @@ radarr: quality_definition: type: movie - + quality_profiles: - name: FR-VOSTFR-REMUX-WEB-1080p reset_unmatched_scores: true @@ -73,12 +73,12 @@ radarr: - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP - c2863d2a50c9acad1fb50e53ece60817 # STAN # ===== HQ Source Groups ===== - - 5583260016e0b9f683f53af41fb42e4a # FR Remux Tier 01 - - 9019d81307e68cd4a7eb06a567e833b8 # FR Remux Tier 02 - - 9790a618cec1aeac8ce75601a17ea40d # FR WEB Tier 01 - - 3c83a765f84239716bd5fd2d7af188f9 # FR WEB Tier 02 + - 5583260016e0b9f683f53af41fb42e4a # FR Remux Tier 01 + - 9019d81307e68cd4a7eb06a567e833b8 # FR Remux Tier 02 + - 9790a618cec1aeac8ce75601a17ea40d # FR WEB Tier 01 + - 3c83a765f84239716bd5fd2d7af188f9 # FR WEB Tier 02 # Vous pouvez commenter/supprimer le groupe scene si vous ne souhaitez pas de releases venant de la Scene française - - 0d94489c0d5828cd3bf9409d309fb32b # FR Scene Groups + - 0d94489c0d5828cd3bf9409d309fb32b # FR Scene Groups # Les tiers suivant sont les tiers originaux du guide (groupes anglophones) - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01 - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02 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 5a6f5f5d7..bbd27402a 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-2160p-multi.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-2160p-multi.yml @@ -12,7 +12,7 @@ radarr: quality_definition: type: movie - + quality_profiles: - name: FR-MULTi-REMUX-WEB-2160p reset_unmatched_scores: true @@ -96,12 +96,12 @@ radarr: - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP - c2863d2a50c9acad1fb50e53ece60817 # STAN # ===== HQ Source Groups ===== - - 5583260016e0b9f683f53af41fb42e4a # FR Remux Tier 01 - - 9019d81307e68cd4a7eb06a567e833b8 # FR Remux Tier 02 - - 9790a618cec1aeac8ce75601a17ea40d # FR WEB Tier 01 - - 3c83a765f84239716bd5fd2d7af188f9 # FR WEB Tier 02 + - 5583260016e0b9f683f53af41fb42e4a # FR Remux Tier 01 + - 9019d81307e68cd4a7eb06a567e833b8 # FR Remux Tier 02 + - 9790a618cec1aeac8ce75601a17ea40d # FR WEB Tier 01 + - 3c83a765f84239716bd5fd2d7af188f9 # FR WEB Tier 02 # Vous pouvez commenter/supprimer le groupe scene si vous ne souhaitez pas de releases venant de la Scene française - - 0d94489c0d5828cd3bf9409d309fb32b # FR Scene Groups + - 0d94489c0d5828cd3bf9409d309fb32b # FR Scene Groups # Les tiers suivant sont les tiers originaux du guide (groupes anglophones) # vous pouvez les activer si vous souhaitez aussi récupérer de bonnes releases en VO si jamais une release MULTi n'existes pas. # 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 da309cb2e..0c3727a81 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-2160p-vostfr.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-2160p-vostfr.yml @@ -12,7 +12,7 @@ radarr: quality_definition: type: movie - + quality_profiles: - name: FR-VOSTFR-REMUX-WEB-2160p reset_unmatched_scores: true @@ -90,12 +90,12 @@ radarr: - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP - c2863d2a50c9acad1fb50e53ece60817 # STAN # ===== HQ Source Groups ===== - - 5583260016e0b9f683f53af41fb42e4a # FR Remux Tier 01 - - 9019d81307e68cd4a7eb06a567e833b8 # FR Remux Tier 02 - - 9790a618cec1aeac8ce75601a17ea40d # FR WEB Tier 01 - - 3c83a765f84239716bd5fd2d7af188f9 # FR WEB Tier 02 + - 5583260016e0b9f683f53af41fb42e4a # FR Remux Tier 01 + - 9019d81307e68cd4a7eb06a567e833b8 # FR Remux Tier 02 + - 9790a618cec1aeac8ce75601a17ea40d # FR WEB Tier 01 + - 3c83a765f84239716bd5fd2d7af188f9 # FR WEB Tier 02 # Vous pouvez commenter/supprimer le groupe scene si vous ne souhaitez pas de releases venant de la Scene française - - 0d94489c0d5828cd3bf9409d309fb32b # FR Scene Groups + - 0d94489c0d5828cd3bf9409d309fb32b # FR Scene Groups # Les tiers suivant sont les tiers originaux du guide (groupes anglophones) - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01 - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02 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 d65443add..c5a4ffbd8 100644 --- a/docs/recyclarr-configs/radarr/french-uhd-bluray-web-multi.yml +++ b/docs/recyclarr-configs/radarr/french-uhd-bluray-web-multi.yml @@ -12,7 +12,7 @@ radarr: quality_definition: type: movie - + quality_profiles: - name: FR-MULTi-BLURAY-WEB-2160p reset_unmatched_scores: true @@ -96,12 +96,12 @@ radarr: - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP - c2863d2a50c9acad1fb50e53ece60817 # STAN # ===== HQ Source Groups ===== - - 64f8f12bbf7472a6ccf838bfd6b5e3e8 # FR UHD Bluray Tier 01 - - 0dcf0c8a386d82e3f2d424189af14065 # FR UHD Bluray Tier 02 - - 9790a618cec1aeac8ce75601a17ea40d # FR WEB Tier 01 - - 3c83a765f84239716bd5fd2d7af188f9 # FR WEB Tier 02 + - 64f8f12bbf7472a6ccf838bfd6b5e3e8 # FR UHD Bluray Tier 01 + - 0dcf0c8a386d82e3f2d424189af14065 # FR UHD Bluray Tier 02 + - 9790a618cec1aeac8ce75601a17ea40d # FR WEB Tier 01 + - 3c83a765f84239716bd5fd2d7af188f9 # FR WEB Tier 02 # Vous pouvez commenter/supprimer le groupe scene si vous ne souhaitez pas de releases venant de la Scene française - - 0d94489c0d5828cd3bf9409d309fb32b # FR Scene Groups + - 0d94489c0d5828cd3bf9409d309fb32b # FR Scene Groups # Les tiers suivant sont les tiers originaux du guide (groupes anglophones) # vous pouvez les activer si vous souhaitez aussi récupérer de bonnes releases en VO si jamais une release MULTi n'existes pas. # 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 67bc354cf..e80d06101 100644 --- a/docs/recyclarr-configs/radarr/french-uhd-bluray-web-vostfr.yml +++ b/docs/recyclarr-configs/radarr/french-uhd-bluray-web-vostfr.yml @@ -12,7 +12,7 @@ radarr: quality_definition: type: movie - + quality_profiles: - name: FR-VOSTFR-BLURAY-WEB-2160p reset_unmatched_scores: true @@ -90,12 +90,12 @@ radarr: - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP - c2863d2a50c9acad1fb50e53ece60817 # STAN # ===== HQ Source Groups ===== - - 64f8f12bbf7472a6ccf838bfd6b5e3e8 # FR UHD Bluray Tier 01 - - 0dcf0c8a386d82e3f2d424189af14065 # FR UHD Bluray Tier 02 - - 9790a618cec1aeac8ce75601a17ea40d # FR WEB Tier 01 - - 3c83a765f84239716bd5fd2d7af188f9 # FR WEB Tier 02 + - 64f8f12bbf7472a6ccf838bfd6b5e3e8 # FR UHD Bluray Tier 01 + - 0dcf0c8a386d82e3f2d424189af14065 # FR UHD Bluray Tier 02 + - 9790a618cec1aeac8ce75601a17ea40d # FR WEB Tier 01 + - 3c83a765f84239716bd5fd2d7af188f9 # FR WEB Tier 02 # Vous pouvez commenter/supprimer le groupe scene si vous ne souhaitez pas de releases venant de la Scene française - - 0d94489c0d5828cd3bf9409d309fb32b # FR Scene Groups + - 0d94489c0d5828cd3bf9409d309fb32b # FR Scene Groups # Les tiers suivant sont les tiers originaux du guide (groupes anglophones) - 4d74ac4c4db0b64bff6ce0cffef99bf0 # UHD Bluray Tier 01 - a58f517a70193f8e578056642178419d # UHD Bluray Tier 02 diff --git a/docs/recyclarr-configs/sonarr/french-anime-multi-v4.yml b/docs/recyclarr-configs/sonarr/french-anime-multi-v4.yml index 6472c0e7c..7c9e83659 100644 --- a/docs/recyclarr-configs/sonarr/french-anime-multi-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-anime-multi-v4.yml @@ -13,6 +13,10 @@ sonarr: quality_definition: type: anime + quality_profiles: + - name: FR-ANIME-MULTi + reset_unmatched_scores: true + custom_formats: # La liste de Formats Personnalisés à synchroniser avec Sonarr. - trash_ids: @@ -79,7 +83,6 @@ sonarr: # - dc262f88d74c651b12e9d90b39f6c753 # Anime Web Tier 06 (FanSubs) quality_profiles: - name: FR-ANIME-MULTi - reset_unmatched_scores: true - trash_ids: - d660701077794679fd59e8bdf4ce3a29 # AMZN diff --git a/docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml b/docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml index c395c2555..30aac5125 100644 --- a/docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml @@ -12,7 +12,7 @@ sonarr: quality_definition: type: anime - + quality_profiles: - name: FR-ANIME-VOSTFR reset_unmatched_scores: true 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 a9ed5aeb4..46f9d1546 100644 --- a/docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml @@ -12,7 +12,7 @@ sonarr: quality_definition: type: series - + quality_profiles: - name: FR-MULTi-WEB-1080p reset_unmatched_scores: true 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 4e858fb5b..5b13c6716 100644 --- a/docs/recyclarr-configs/sonarr/french-web-1080p-vostfr-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-web-1080p-vostfr-v4.yml @@ -12,7 +12,7 @@ sonarr: quality_definition: type: series - + quality_profiles: - name: FR-VOSTFR-WEB-1080p reset_unmatched_scores: true From 2a053fb871a5e1aaff55aef8c6b5f2d928803b09 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Wed, 19 Apr 2023 16:55:44 +0200 Subject: [PATCH 10/24] Fix Trailing whitespace error --- docs/json/radarr/cf/french-vf2.json | 2 +- docs/json/sonarr/cf/french-vf2.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/json/radarr/cf/french-vf2.json b/docs/json/radarr/cf/french-vf2.json index 7abf7103f..7d148dbfd 100644 --- a/docs/json/radarr/cf/french-vf2.json +++ b/docs/json/radarr/cf/french-vf2.json @@ -7,7 +7,7 @@ { "name": "VF2", "implementation": "ReleaseTitleSpecification", - "negate": false, + "negate": false, "required": false, "fields": { "value": "\\b(VF2)\\b" diff --git a/docs/json/sonarr/cf/french-vf2.json b/docs/json/sonarr/cf/french-vf2.json index 53efbca17..80a104626 100644 --- a/docs/json/sonarr/cf/french-vf2.json +++ b/docs/json/sonarr/cf/french-vf2.json @@ -7,7 +7,7 @@ { "name": "VF2", "implementation": "ReleaseTitleSpecification", - "negate": false, + "negate": false, "required": false, "fields": { "value": "\\b(VF2)\\b" From 08ec90677c3556c26e53e44ba4061d04a53de157 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Wed, 19 Apr 2023 17:13:41 +0200 Subject: [PATCH 11/24] Revert "Update groups CFs to avoid double scoring" for anime groups This reverts commit f595daa8ebe3fb4cf20285d4364688b3204a1913. But only for anime groups as they have [RlsGrp] or (RlsGrp) naming instead of -RlsGrp --- docs/json/sonarr/cf/french-anime-fansub.json | 22 +++++++++---------- docs/json/sonarr/cf/french-anime-tier-01.json | 22 +++++++++---------- docs/json/sonarr/cf/french-anime-tier-02.json | 18 +++++++-------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/docs/json/sonarr/cf/french-anime-fansub.json b/docs/json/sonarr/cf/french-anime-fansub.json index 74da3ee52..7649283e1 100644 --- a/docs/json/sonarr/cf/french-anime-fansub.json +++ b/docs/json/sonarr/cf/french-anime-fansub.json @@ -10,7 +10,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Anime[ .-]?Heart)$" + "value": "\\b(Anime[ .-]?Heart)\\b" } }, { @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(KaeriZaki)$" + "value": "\\b(KaeriZaki)\\b" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(KFR)$" + "value": "\\b(KFR)\\b" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Natsumi)$" + "value": "\\b(Natsumi)\\b" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(NekoYu\\'?)$" + "value": "\\b(NekoYu\\'?)\\b" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Onii[ .-]?ChanSub)$" + "value": "\\b(Onii[ .-]?ChanSub)\\b" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Otaku[ .-]?Attitude)$" + "value": "\\b(Otaku[ .-]?Attitude)\\b" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Owlolf)$" + "value": "\\b(Owlolf)\\b" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Pikari[ .-]?Teshima)$" + "value": "\\b(Pikari[ .-]?Teshima)\\b" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Team[ .-]?Arcedo)$" + "value": "\\b(Team[ .-]?Arcedo)\\b" } }, { @@ -100,7 +100,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Yarashii)$" + "value": "\\b(Yarashii)\\b" } } ] diff --git a/docs/json/sonarr/cf/french-anime-tier-01.json b/docs/json/sonarr/cf/french-anime-tier-01.json index 59a3a2dc9..5ee9d48dd 100644 --- a/docs/json/sonarr/cf/french-anime-tier-01.json +++ b/docs/json/sonarr/cf/french-anime-tier-01.json @@ -10,7 +10,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Darki)$" + "value": "\\b(Darki)\\b" } }, { @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Delivroozzi)$" + "value": "\\b(Delivroozzi)\\b" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Fuceo)$" + "value": "\\b(Fuceo)\\b" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FUJiSAN)$" + "value": "\\b(FUJiSAN)\\b" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Good[ .-]?(Job|Rip|Sub)!?[ .-]?Alexis)$" + "value": "\\b(Good[ .-]?(Job|Rip|Sub)!?[ .-]?Alexis)\\b" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(NeoSG)$" + "value": "\\b(NeoSG)\\b" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Punisher694)$" + "value": "\\b(Punisher694)\\b" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(SR-71)$" + "value": "\\b(SR-71)\\b" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(T3KASHi)$" + "value": "\\b(T3KASHi)\\b" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(TANOSHii)$" + "value": "\\b(TANOSHii)\\b" } }, { @@ -100,7 +100,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Tsundere[ .-]?Raws)$" + "value": "\\b(Tsundere[ .-]?Raws)\\b" } } ] diff --git a/docs/json/sonarr/cf/french-anime-tier-02.json b/docs/json/sonarr/cf/french-anime-tier-02.json index 3155ea28b..7d4017ff2 100644 --- a/docs/json/sonarr/cf/french-anime-tier-02.json +++ b/docs/json/sonarr/cf/french-anime-tier-02.json @@ -10,7 +10,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(BLV)$" + "value": "\\b(BLV)\\b" } }, { @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(D3T3R10R1TY)$" + "value": "\\b(D3T3R10R1TY)\\b" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HANAMi)$" + "value": "\\b(HANAMi)\\b" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(KAF)$" + "value": "\\b(KAF)\\b" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(KHAYA)$" + "value": "\\b(KHAYA)\\b" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Monkey[ .-]?D[ .-]?Lulu)$" + "value": "\\b(Monkey[ .-]?D[ .-]?Lulu)\\b" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(RONiN)$" + "value": "\\b(RONiN)\\b" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(TTN)$" + "value": "\\b(TTN)\\b" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(XSPITFIRE911)$" + "value": "\\b(XSPITFIRE911)\\b" } } ] From b4f30512017b7e454792e290b389dd818141fd3d Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Thu, 20 Apr 2023 11:31:03 +0200 Subject: [PATCH 12/24] Update of Sonarr FR Anime Tiers Added `Aoi-Project` to tier 2 Added `Nagutos` to tier 2 Updated naming of `Natsumi` to `Natsumi-no-Sekai` --- docs/json/sonarr/cf/french-anime-fansub.json | 4 ++-- docs/json/sonarr/cf/french-anime-tier-02.json | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/docs/json/sonarr/cf/french-anime-fansub.json b/docs/json/sonarr/cf/french-anime-fansub.json index 7649283e1..3f38a5e46 100644 --- a/docs/json/sonarr/cf/french-anime-fansub.json +++ b/docs/json/sonarr/cf/french-anime-fansub.json @@ -32,12 +32,12 @@ } }, { - "name": "Natsumi", + "name": "Natsumi-no-Sekai", "implementation": "ReleaseGroupSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(Natsumi)\\b" + "value": "\\b(Natsumi[ .-]?no[ .-]?Sekai)\\b" } }, { diff --git a/docs/json/sonarr/cf/french-anime-tier-02.json b/docs/json/sonarr/cf/french-anime-tier-02.json index 7d4017ff2..e54728d5b 100644 --- a/docs/json/sonarr/cf/french-anime-tier-02.json +++ b/docs/json/sonarr/cf/french-anime-tier-02.json @@ -4,6 +4,15 @@ "name": "FR Anime Tier 02", "includeCustomFormatWhenRenaming": false, "specifications": [ + { + "name": "Aoi-Project", + "implementation": "ReleaseGroupSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(Aoi[ .-]?Project)\\b" + } + }, { "name": "BLV", "implementation": "ReleaseGroupSpecification", @@ -58,6 +67,15 @@ "value": "\\b(Monkey[ .-]?D[ .-]?Lulu)\\b" } }, + { + "name": "Nagutos", + "implementation": "ReleaseGroupSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(Nagutos)\\b" + } + }, { "name": "RONiN", "implementation": "ReleaseGroupSpecification", From 9219791835162e92173a53c02cc3d356d938de48 Mon Sep 17 00:00:00 2001 From: yammes08 <111231042+yammes08@users.noreply.github.com> Date: Thu, 20 Apr 2023 21:42:56 +0100 Subject: [PATCH 13/24] Recyclarr config and guide page updates Updates to recyclarr configs (main guide and SQPs), and guide and SQP pages --- docs/recyclarr-configs/radarr/hd-bluray-web.yml | 1 + docs/recyclarr-configs/radarr/remux-web-1080p.yml | 1 + docs/recyclarr-configs/radarr/remux-web-2160p.yml | 3 +++ docs/recyclarr-configs/radarr/sqp/sqp-1.yml | 1 + docs/recyclarr-configs/radarr/sqp/sqp-2.yml | 1 + docs/recyclarr-configs/radarr/sqp/sqp-3.yml | 1 + docs/recyclarr-configs/radarr/sqp/sqp-4.yml | 1 + docs/recyclarr-configs/radarr/sqp/sqp-5.yml | 1 + docs/recyclarr-configs/radarr/uhd-bluray-web.yml | 3 +++ includes/cf/radarr-cf-hd-bluray-web-scoring.md | 2 -- includes/cf/radarr-cf-remux-web-scoring.md | 2 -- includes/cf/radarr-cf-uhd-bluray-web-scoring.md | 2 -- includes/cf/radarr-movie-versions-imaxe.md | 1 + includes/cf/radarr-movie-versions.md | 1 + includes/sqp/1-cf-scoring.md | 3 +-- includes/sqp/2-cf-scoring.md | 2 -- includes/sqp/5-cf-scoring.md | 2 -- 17 files changed, 16 insertions(+), 12 deletions(-) diff --git a/docs/recyclarr-configs/radarr/hd-bluray-web.yml b/docs/recyclarr-configs/radarr/hd-bluray-web.yml index 68a947ea7..6f19359cf 100644 --- a/docs/recyclarr-configs/radarr/hd-bluray-web.yml +++ b/docs/recyclarr-configs/radarr/hd-bluray-web.yml @@ -52,6 +52,7 @@ radarr: - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX - 526d445d4c16214309f0fd2b3be18a89 # Hulu - 170b1d363bd8516fbf3a3eb05d4faff6 # NF + - bf7e73dd1d85b12cc527dc619761c840 # Pathe - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP - c2863d2a50c9acad1fb50e53ece60817 # STAN diff --git a/docs/recyclarr-configs/radarr/remux-web-1080p.yml b/docs/recyclarr-configs/radarr/remux-web-1080p.yml index b37af0937..3c7cbbb2b 100644 --- a/docs/recyclarr-configs/radarr/remux-web-1080p.yml +++ b/docs/recyclarr-configs/radarr/remux-web-1080p.yml @@ -67,6 +67,7 @@ radarr: - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX - 526d445d4c16214309f0fd2b3be18a89 # Hulu - 170b1d363bd8516fbf3a3eb05d4faff6 # NF + - bf7e73dd1d85b12cc527dc619761c840 # Pathe - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP - c2863d2a50c9acad1fb50e53ece60817 # STAN diff --git a/docs/recyclarr-configs/radarr/remux-web-2160p.yml b/docs/recyclarr-configs/radarr/remux-web-2160p.yml index a576f6770..d265f8b94 100644 --- a/docs/recyclarr-configs/radarr/remux-web-2160p.yml +++ b/docs/recyclarr-configs/radarr/remux-web-2160p.yml @@ -65,7 +65,9 @@ radarr: # Unwanted - ed38b889b31be83fda192888e2286d83 # BR-DISK - 90a6f9a284dff5103f6346090e6280c8 # LQ + - dc98083864ea246d05a42df0d05f81cc # x265 (HD) - b8cd450cbfa689c0259a01d9e29ba3d6 # 3D + - bfd8eb01832d646a0a89c4deb46f8564 # Upscaled - 9c38ebb7384dada637be8899efa68e6f # SDR # Streaming Services - cc5e51a9e85a6296ceefe097a77f12f4 # BCORE @@ -82,6 +84,7 @@ radarr: - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX - 526d445d4c16214309f0fd2b3be18a89 # Hulu - 170b1d363bd8516fbf3a3eb05d4faff6 # NF + - bf7e73dd1d85b12cc527dc619761c840 # Pathe - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP - c2863d2a50c9acad1fb50e53ece60817 # STAN diff --git a/docs/recyclarr-configs/radarr/sqp/sqp-1.yml b/docs/recyclarr-configs/radarr/sqp/sqp-1.yml index c133c0e70..7ff747c69 100644 --- a/docs/recyclarr-configs/radarr/sqp/sqp-1.yml +++ b/docs/recyclarr-configs/radarr/sqp/sqp-1.yml @@ -86,6 +86,7 @@ radarr: - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX - 526d445d4c16214309f0fd2b3be18a89 # Hulu - 170b1d363bd8516fbf3a3eb05d4faff6 # NF + - bf7e73dd1d85b12cc527dc619761c840 # Pathe - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP - c2863d2a50c9acad1fb50e53ece60817 # STAN diff --git a/docs/recyclarr-configs/radarr/sqp/sqp-2.yml b/docs/recyclarr-configs/radarr/sqp/sqp-2.yml index d4b056867..5a1defb5c 100644 --- a/docs/recyclarr-configs/radarr/sqp/sqp-2.yml +++ b/docs/recyclarr-configs/radarr/sqp/sqp-2.yml @@ -117,6 +117,7 @@ radarr: - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX - 526d445d4c16214309f0fd2b3be18a89 # Hulu - 170b1d363bd8516fbf3a3eb05d4faff6 # NF + - bf7e73dd1d85b12cc527dc619761c840 # Pathe - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP - c2863d2a50c9acad1fb50e53ece60817 # STAN diff --git a/docs/recyclarr-configs/radarr/sqp/sqp-3.yml b/docs/recyclarr-configs/radarr/sqp/sqp-3.yml index 235d405b5..6269f4ff7 100644 --- a/docs/recyclarr-configs/radarr/sqp/sqp-3.yml +++ b/docs/recyclarr-configs/radarr/sqp/sqp-3.yml @@ -114,6 +114,7 @@ radarr: - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX - 526d445d4c16214309f0fd2b3be18a89 # Hulu - 170b1d363bd8516fbf3a3eb05d4faff6 # NF + - bf7e73dd1d85b12cc527dc619761c840 # Pathe - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP - c2863d2a50c9acad1fb50e53ece60817 # STAN diff --git a/docs/recyclarr-configs/radarr/sqp/sqp-4.yml b/docs/recyclarr-configs/radarr/sqp/sqp-4.yml index e6dcb7fb1..ea7cfc618 100644 --- a/docs/recyclarr-configs/radarr/sqp/sqp-4.yml +++ b/docs/recyclarr-configs/radarr/sqp/sqp-4.yml @@ -113,6 +113,7 @@ radarr: - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX - 526d445d4c16214309f0fd2b3be18a89 # Hulu - 170b1d363bd8516fbf3a3eb05d4faff6 # NF + - bf7e73dd1d85b12cc527dc619761c840 # Pathe - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP - c2863d2a50c9acad1fb50e53ece60817 # STAN diff --git a/docs/recyclarr-configs/radarr/sqp/sqp-5.yml b/docs/recyclarr-configs/radarr/sqp/sqp-5.yml index 12050f9d1..d21c6de6c 100644 --- a/docs/recyclarr-configs/radarr/sqp/sqp-5.yml +++ b/docs/recyclarr-configs/radarr/sqp/sqp-5.yml @@ -116,6 +116,7 @@ radarr: - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX - 526d445d4c16214309f0fd2b3be18a89 # Hulu - 170b1d363bd8516fbf3a3eb05d4faff6 # NF + - bf7e73dd1d85b12cc527dc619761c840 # Pathe - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP - c2863d2a50c9acad1fb50e53ece60817 # STAN diff --git a/docs/recyclarr-configs/radarr/uhd-bluray-web.yml b/docs/recyclarr-configs/radarr/uhd-bluray-web.yml index 93f76c23f..571ceea2d 100644 --- a/docs/recyclarr-configs/radarr/uhd-bluray-web.yml +++ b/docs/recyclarr-configs/radarr/uhd-bluray-web.yml @@ -66,7 +66,9 @@ radarr: # Unwanted - ed38b889b31be83fda192888e2286d83 # BR-DISK - 90a6f9a284dff5103f6346090e6280c8 # LQ + - dc98083864ea246d05a42df0d05f81cc # x265 (HD) - b8cd450cbfa689c0259a01d9e29ba3d6 # 3D + - bfd8eb01832d646a0a89c4deb46f8564 # Upscaled - 9c38ebb7384dada637be8899efa68e6f # SDR # Streaming Services - cc5e51a9e85a6296ceefe097a77f12f4 # BCORE @@ -83,6 +85,7 @@ radarr: - 5763d1b0ce84aff3b21038eea8e9b8ad # HMAX - 526d445d4c16214309f0fd2b3be18a89 # Hulu - 170b1d363bd8516fbf3a3eb05d4faff6 # NF + - bf7e73dd1d85b12cc527dc619761c840 # Pathe - c9fd353f8f5f1baf56dc601c4cb29920 # PCOK - e36a0ba1bc902b26ee40818a1d59b8bd # PMTP - c2863d2a50c9acad1fb50e53ece60817 # STAN diff --git a/includes/cf/radarr-cf-hd-bluray-web-scoring.md b/includes/cf/radarr-cf-hd-bluray-web-scoring.md index 5004743bc..0d8d6b103 100644 --- a/includes/cf/radarr-cf-hd-bluray-web-scoring.md +++ b/includes/cf/radarr-cf-hd-bluray-web-scoring.md @@ -6,5 +6,3 @@ | [{{ radarr['cf']['web-tier-01']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#web-tier-01) | {{ radarr['cf']['web-tier-01']['trash_score'] }} | {{ radarr['cf']['web-tier-01']['trash_id'] }} | | [{{ radarr['cf']['web-tier-02']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#web-tier-02) | {{ radarr['cf']['web-tier-02']['trash_score'] }} | {{ radarr['cf']['web-tier-02']['trash_id'] }} | | [{{ radarr['cf']['web-tier-03']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#web-tier-03) | {{ radarr['cf']['web-tier-03']['trash_score'] }} | {{ radarr['cf']['web-tier-03']['trash_id'] }} | - - !!! Danger "- Don’t use HQ-xxx and Tiers together
- HD Bluray Tier 01-02 replaces HQ
- Web Tier 01-03 replaces HQ-WEBDL" diff --git a/includes/cf/radarr-cf-remux-web-scoring.md b/includes/cf/radarr-cf-remux-web-scoring.md index e7c9e453c..37332c92b 100644 --- a/includes/cf/radarr-cf-remux-web-scoring.md +++ b/includes/cf/radarr-cf-remux-web-scoring.md @@ -6,5 +6,3 @@ | [{{ radarr['cf']['web-tier-01']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#web-tier-01) | {{ radarr['cf']['web-tier-01']['trash_score'] }} | {{ radarr['cf']['web-tier-01']['trash_id'] }} | | [{{ radarr['cf']['web-tier-02']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#web-tier-02) | {{ radarr['cf']['web-tier-02']['trash_score'] }} | {{ radarr['cf']['web-tier-02']['trash_id'] }} | | [{{ radarr['cf']['web-tier-03']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#web-tier-03) | {{ radarr['cf']['web-tier-03']['trash_score'] }} | {{ radarr['cf']['web-tier-03']['trash_id'] }} | - - !!! Danger "- Don’t use HQ-xxx and Tiers together
- Remux Tier 01-02 replaces HQ-Remux
- Web Tier 01-03 replaces HQ-WEBDL" diff --git a/includes/cf/radarr-cf-uhd-bluray-web-scoring.md b/includes/cf/radarr-cf-uhd-bluray-web-scoring.md index 8d0f94feb..87e47e322 100644 --- a/includes/cf/radarr-cf-uhd-bluray-web-scoring.md +++ b/includes/cf/radarr-cf-uhd-bluray-web-scoring.md @@ -7,5 +7,3 @@ | [{{ radarr['cf']['web-tier-01']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#web-tier-01) | {{ radarr['cf']['web-tier-01']['trash_score'] }} | {{ radarr['cf']['web-tier-01']['trash_id'] }} | | [{{ radarr['cf']['web-tier-02']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#web-tier-02) | {{ radarr['cf']['web-tier-02']['trash_score'] }} | {{ radarr['cf']['web-tier-02']['trash_id'] }} | | [{{ radarr['cf']['web-tier-03']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#web-tier-03) | {{ radarr['cf']['web-tier-03']['trash_score'] }} | {{ radarr['cf']['web-tier-03']['trash_id'] }} | - - !!! Danger "- Don’t use HQ-xxx or UHD (xxx) and Tiers together
- Remux Tier 01-02 replaces HQ-Remux
- UHD Bluray Tier 01-03 replaces UHD (xxx)
- Web Tier 01-03 replaces HQ-WEBDL" diff --git a/includes/cf/radarr-movie-versions-imaxe.md b/includes/cf/radarr-movie-versions-imaxe.md index 5585ee84b..fe386a834 100644 --- a/includes/cf/radarr-movie-versions-imaxe.md +++ b/includes/cf/radarr-movie-versions-imaxe.md @@ -6,6 +6,7 @@ | [{{ radarr['cf']['4k-remaster']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#4k-remaster) | {{ radarr['cf']['4k-remaster']['trash_score'] }} | {{ radarr['cf']['4k-remaster']['trash_id'] }} | | [{{ radarr['cf']['criterion-collection']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#criterion-collection) | {{ radarr['cf']['criterion-collection']['trash_score'] }} | {{ radarr['cf']['criterion-collection']['trash_id'] }} | | [{{ radarr['cf']['masters-of-cinema']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#masters-of-cinema) | {{ radarr['cf']['masters-of-cinema']['trash_score'] }} | {{ radarr['cf']['masters-of-cinema']['trash_id'] }} | + | [{{ radarr['cf']['vinegar-syndrome']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vinegar-syndrome) | {{ radarr['cf']['vinegar-syndrome']['trash_score'] }} | {{ radarr['cf']['vinegar-syndrome']['trash_id'] }} | | [{{ radarr['cf']['special-edition']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#special-edition) | {{ radarr['cf']['special-edition']['trash_score'] }} | {{ radarr['cf']['special-edition']['trash_id'] }} | | [{{ radarr['cf']['imax']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#imax) | {{ radarr['cf']['imax']['trash_score'] }} | {{ radarr['cf']['imax']['trash_id'] }} | | [{{ radarr['cf']['imax-enhanced']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#imax-enhanced) | {{ radarr['cf']['imax-enhanced']['trash_score'] }} | {{ radarr['cf']['imax-enhanced']['trash_id'] }} | diff --git a/includes/cf/radarr-movie-versions.md b/includes/cf/radarr-movie-versions.md index a78787669..57485b411 100644 --- a/includes/cf/radarr-movie-versions.md +++ b/includes/cf/radarr-movie-versions.md @@ -6,5 +6,6 @@ | [{{ radarr['cf']['4k-remaster']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#4k-remaster) | {{ radarr['cf']['4k-remaster']['trash_score'] }} | {{ radarr['cf']['4k-remaster']['trash_id'] }} | | [{{ radarr['cf']['criterion-collection']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#criterion-collection) | {{ radarr['cf']['criterion-collection']['trash_score'] }} | {{ radarr['cf']['criterion-collection']['trash_id'] }} | | [{{ radarr['cf']['masters-of-cinema']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#masters-of-cinema) | {{ radarr['cf']['masters-of-cinema']['trash_score'] }} | {{ radarr['cf']['masters-of-cinema']['trash_id'] }} | + | [{{ radarr['cf']['vinegar-syndrome']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vinegar-syndrome) | {{ radarr['cf']['vinegar-syndrome']['trash_score'] }} | {{ radarr['cf']['vinegar-syndrome']['trash_id'] }} | | [{{ radarr['cf']['special-edition']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#special-edition) | {{ radarr['cf']['special-edition']['trash_score'] }} | {{ radarr['cf']['special-edition']['trash_id'] }} | | [{{ radarr['cf']['imax']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#imax) | {{ radarr['cf']['imax']['trash_score'] }} | {{ radarr['cf']['imax']['trash_id'] }} | diff --git a/includes/sqp/1-cf-scoring.md b/includes/sqp/1-cf-scoring.md index bcfbf3a57..7847a5595 100644 --- a/includes/sqp/1-cf-scoring.md +++ b/includes/sqp/1-cf-scoring.md @@ -31,6 +31,7 @@ | [{{ radarr['cf']['4k-remaster']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#4k-remaster) | {{ radarr['cf']['4k-remaster']['trash_score'] }} | {{ radarr['cf']['4k-remaster']['trash_id'] }} | | [{{ radarr['cf']['criterion-collection']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#criterion-collection) | {{ radarr['cf']['criterion-collection']['trash_score'] }} | {{ radarr['cf']['criterion-collection']['trash_id'] }} | | [{{ radarr['cf']['masters-of-cinema']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#masters-of-cinema) | {{ radarr['cf']['masters-of-cinema']['trash_score'] }} | {{ radarr['cf']['masters-of-cinema']['trash_id'] }} | + | [{{ radarr['cf']['vinegar-syndrome']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vinegar-syndrome) | {{ radarr['cf']['vinegar-syndrome']['trash_score'] }} | {{ radarr['cf']['vinegar-syndrome']['trash_id'] }} | | [{{ radarr['cf']['special-edition']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#special-edition) | {{ radarr['cf']['special-edition']['trash_score'] }} | {{ radarr['cf']['special-edition']['trash_id'] }} | | [{{ radarr['cf']['imax']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#imax) | {{ radarr['cf']['imax']['trash_score'] }} | {{ radarr['cf']['imax']['trash_id'] }} | | [{{ radarr['cf']['imax-enhanced']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#imax-enhanced) | {{ radarr['cf']['imax-enhanced']['trash_score'] }} | {{ radarr['cf']['imax-enhanced']['trash_id'] }} | @@ -54,8 +55,6 @@ | [{{ radarr['cf']['hd-bluray-tier-01']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hd-bluray-tier-01) | :warning: 1100 | {{ radarr['cf']['hd-bluray-tier-01']['trash_id'] }} | | [{{ radarr['cf']['hd-bluray-tier-02']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hd-bluray-tier-02) | :warning: 1050 | {{ radarr['cf']['hd-bluray-tier-02']['trash_id'] }} | - !!! Danger "- Don’t use HQ-xxx or UHD (xxx) and Tiers together
- Remux Tier 01-02 replaces HQ-Remux
- UHD Bluray Tier 01-03 replaces UHD (xxx)
- Web Tier 01-03 replaces HQ-WEBDL" - {! include-markdown "../../includes/cf/radarr-misc.md" !} {! include-markdown "../../includes/cf/radarr-unwanted.md" !} diff --git a/includes/sqp/2-cf-scoring.md b/includes/sqp/2-cf-scoring.md index 62b1537ca..1856483a4 100644 --- a/includes/sqp/2-cf-scoring.md +++ b/includes/sqp/2-cf-scoring.md @@ -18,8 +18,6 @@ | [{{ radarr['cf']['web-tier-02']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#web-tier-02) | {{ radarr['cf']['web-tier-02']['trash_score'] }} | {{ radarr['cf']['web-tier-02']['trash_id'] }} | | [{{ radarr['cf']['web-tier-03']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#web-tier-03) | {{ radarr['cf']['web-tier-03']['trash_score'] }} | {{ radarr['cf']['web-tier-03']['trash_id'] }} | - !!! Danger "- Don’t use HQ-xxx or UHD (xxx) and Tiers together
- Remux Tier 01-02 replaces HQ-Remux
- UHD Bluray Tier 01-03 replaces UHD (xxx)
- Web Tier 01-03 replaces HQ-WEBDL" - {! include-markdown "../../includes/sqp/uhd-radarr-misc.md" !} {! include-markdown "../../includes/cf/radarr-unwanted-uhd.md" !} diff --git a/includes/sqp/5-cf-scoring.md b/includes/sqp/5-cf-scoring.md index 62b1537ca..1856483a4 100644 --- a/includes/sqp/5-cf-scoring.md +++ b/includes/sqp/5-cf-scoring.md @@ -18,8 +18,6 @@ | [{{ radarr['cf']['web-tier-02']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#web-tier-02) | {{ radarr['cf']['web-tier-02']['trash_score'] }} | {{ radarr['cf']['web-tier-02']['trash_id'] }} | | [{{ radarr['cf']['web-tier-03']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#web-tier-03) | {{ radarr['cf']['web-tier-03']['trash_score'] }} | {{ radarr['cf']['web-tier-03']['trash_id'] }} | - !!! Danger "- Don’t use HQ-xxx or UHD (xxx) and Tiers together
- Remux Tier 01-02 replaces HQ-Remux
- UHD Bluray Tier 01-03 replaces UHD (xxx)
- Web Tier 01-03 replaces HQ-WEBDL" - {! include-markdown "../../includes/sqp/uhd-radarr-misc.md" !} {! include-markdown "../../includes/cf/radarr-unwanted-uhd.md" !} From d7c34545d04f35f1d54126a235321632b47d72f7 Mon Sep 17 00:00:00 2001 From: yammes08 <111231042+yammes08@users.noreply.github.com> Date: Thu, 20 Apr 2023 21:50:58 +0100 Subject: [PATCH 14/24] Lint fix Lint fix --- includes/sqp/1-cf-scoring.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/sqp/1-cf-scoring.md b/includes/sqp/1-cf-scoring.md index 7847a5595..383dc744e 100644 --- a/includes/sqp/1-cf-scoring.md +++ b/includes/sqp/1-cf-scoring.md @@ -31,7 +31,7 @@ | [{{ radarr['cf']['4k-remaster']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#4k-remaster) | {{ radarr['cf']['4k-remaster']['trash_score'] }} | {{ radarr['cf']['4k-remaster']['trash_id'] }} | | [{{ radarr['cf']['criterion-collection']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#criterion-collection) | {{ radarr['cf']['criterion-collection']['trash_score'] }} | {{ radarr['cf']['criterion-collection']['trash_id'] }} | | [{{ radarr['cf']['masters-of-cinema']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#masters-of-cinema) | {{ radarr['cf']['masters-of-cinema']['trash_score'] }} | {{ radarr['cf']['masters-of-cinema']['trash_id'] }} | - | [{{ radarr['cf']['vinegar-syndrome']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vinegar-syndrome) | {{ radarr['cf']['vinegar-syndrome']['trash_score'] }} | {{ radarr['cf']['vinegar-syndrome']['trash_id'] }} | + | [{{ radarr['cf']['vinegar-syndrome']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vinegar-syndrome) | {{ radarr['cf']['vinegar-syndrome']['trash_score'] }} | {{ radarr['cf']['vinegar-syndrome']['trash_id'] }} | | [{{ radarr['cf']['special-edition']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#special-edition) | {{ radarr['cf']['special-edition']['trash_score'] }} | {{ radarr['cf']['special-edition']['trash_id'] }} | | [{{ radarr['cf']['imax']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#imax) | {{ radarr['cf']['imax']['trash_score'] }} | {{ radarr['cf']['imax']['trash_id'] }} | | [{{ radarr['cf']['imax-enhanced']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#imax-enhanced) | {{ radarr['cf']['imax-enhanced']['trash_score'] }} | {{ radarr['cf']['imax-enhanced']['trash_id'] }} | From eb765069047273c280f5d1a0a22f541702f89a1d Mon Sep 17 00:00:00 2001 From: yammes08 <111231042+yammes08@users.noreply.github.com> Date: Thu, 20 Apr 2023 21:52:24 +0100 Subject: [PATCH 15/24] More lint fixes More lint fixes --- includes/cf/radarr-movie-versions-imaxe.md | 2 +- includes/cf/radarr-movie-versions.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/cf/radarr-movie-versions-imaxe.md b/includes/cf/radarr-movie-versions-imaxe.md index fe386a834..88c6c8911 100644 --- a/includes/cf/radarr-movie-versions-imaxe.md +++ b/includes/cf/radarr-movie-versions-imaxe.md @@ -6,7 +6,7 @@ | [{{ radarr['cf']['4k-remaster']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#4k-remaster) | {{ radarr['cf']['4k-remaster']['trash_score'] }} | {{ radarr['cf']['4k-remaster']['trash_id'] }} | | [{{ radarr['cf']['criterion-collection']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#criterion-collection) | {{ radarr['cf']['criterion-collection']['trash_score'] }} | {{ radarr['cf']['criterion-collection']['trash_id'] }} | | [{{ radarr['cf']['masters-of-cinema']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#masters-of-cinema) | {{ radarr['cf']['masters-of-cinema']['trash_score'] }} | {{ radarr['cf']['masters-of-cinema']['trash_id'] }} | - | [{{ radarr['cf']['vinegar-syndrome']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vinegar-syndrome) | {{ radarr['cf']['vinegar-syndrome']['trash_score'] }} | {{ radarr['cf']['vinegar-syndrome']['trash_id'] }} | + | [{{ radarr['cf']['vinegar-syndrome']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vinegar-syndrome) | {{ radarr['cf']['vinegar-syndrome']['trash_score'] }} | {{ radarr['cf']['vinegar-syndrome']['trash_id'] }} | | [{{ radarr['cf']['special-edition']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#special-edition) | {{ radarr['cf']['special-edition']['trash_score'] }} | {{ radarr['cf']['special-edition']['trash_id'] }} | | [{{ radarr['cf']['imax']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#imax) | {{ radarr['cf']['imax']['trash_score'] }} | {{ radarr['cf']['imax']['trash_id'] }} | | [{{ radarr['cf']['imax-enhanced']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#imax-enhanced) | {{ radarr['cf']['imax-enhanced']['trash_score'] }} | {{ radarr['cf']['imax-enhanced']['trash_id'] }} | diff --git a/includes/cf/radarr-movie-versions.md b/includes/cf/radarr-movie-versions.md index 57485b411..3a52301cf 100644 --- a/includes/cf/radarr-movie-versions.md +++ b/includes/cf/radarr-movie-versions.md @@ -6,6 +6,6 @@ | [{{ radarr['cf']['4k-remaster']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#4k-remaster) | {{ radarr['cf']['4k-remaster']['trash_score'] }} | {{ radarr['cf']['4k-remaster']['trash_id'] }} | | [{{ radarr['cf']['criterion-collection']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#criterion-collection) | {{ radarr['cf']['criterion-collection']['trash_score'] }} | {{ radarr['cf']['criterion-collection']['trash_id'] }} | | [{{ radarr['cf']['masters-of-cinema']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#masters-of-cinema) | {{ radarr['cf']['masters-of-cinema']['trash_score'] }} | {{ radarr['cf']['masters-of-cinema']['trash_id'] }} | - | [{{ radarr['cf']['vinegar-syndrome']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vinegar-syndrome) | {{ radarr['cf']['vinegar-syndrome']['trash_score'] }} | {{ radarr['cf']['vinegar-syndrome']['trash_id'] }} | + | [{{ radarr['cf']['vinegar-syndrome']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vinegar-syndrome) | {{ radarr['cf']['vinegar-syndrome']['trash_score'] }} | {{ radarr['cf']['vinegar-syndrome']['trash_id'] }} | | [{{ radarr['cf']['special-edition']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#special-edition) | {{ radarr['cf']['special-edition']['trash_score'] }} | {{ radarr['cf']['special-edition']['trash_id'] }} | | [{{ radarr['cf']['imax']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#imax) | {{ radarr['cf']['imax']['trash_score'] }} | {{ radarr['cf']['imax']['trash_id'] }} | From 744164ca11dbcc50a270418cf6f6b3ac3c81c7dc Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Fri, 21 Apr 2023 17:25:07 +0200 Subject: [PATCH 16/24] Update warning for VF CFs --- docs/Radarr/radarr-setup-quality-profiles-french-en.md | 2 +- docs/Radarr/radarr-setup-quality-profiles-french-fr.md | 2 +- docs/Sonarr/sonarr-setup-quality-profiles-french-en.md | 2 +- docs/Sonarr/sonarr-setup-quality-profiles-french-fr.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/Radarr/radarr-setup-quality-profiles-french-en.md b/docs/Radarr/radarr-setup-quality-profiles-french-en.md index d7eec8be8..7828e932c 100644 --- a/docs/Radarr/radarr-setup-quality-profiles-french-en.md +++ b/docs/Radarr/radarr-setup-quality-profiles-french-en.md @@ -85,7 +85,7 @@ Those are all optional and only there to rename your release or to avoid a certa - You only want VOSTFR, in this case you will ignore any mention of **MULTi Custom Formats** and give the [{{ radarr['cf']['french-vostfr']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vostfr) Custom Format a score of `1000`. !!! warning "Attention" - It is not really recommended to put any of the VF Custom Formats (VFF, VFQ, VQ, VFI, VF2) to a negative score. Instead increase the score of your preferred audio. + It is not really recommended to put any of the VF Custom Formats (VFF, VFQ, VQ, VFB, VFI, VF2) to a negative score. Instead increase the score of your preferred audio. {! include-markdown "../../includes/french-guide/radarr-french-audio-version-en.md" !} diff --git a/docs/Radarr/radarr-setup-quality-profiles-french-fr.md b/docs/Radarr/radarr-setup-quality-profiles-french-fr.md index 6149569d7..9e30cf442 100644 --- a/docs/Radarr/radarr-setup-quality-profiles-french-fr.md +++ b/docs/Radarr/radarr-setup-quality-profiles-french-fr.md @@ -80,7 +80,7 @@ Ces Formats sont optionnels et ne sont là que pour renommer votre fichier ou po - Vous souhaitez seulement du VOSTFR, dans ce ce cas, ignorez toute mention des **Formats Personnalisés MULTi** et donnez un score de `1000` au Format Personnalisé [{{ radarr['cf']['french-vostfr']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#vostfr). !!! warning "Attention" - Il n'est pas vraiment recommandé d'attribuer un score négatif à l'un des Formats Personnalisés de VF (VFF, VFQ, VQ, VFI, VF2). Augmentez plutôt le score de votre format audio préféré. + Il n'est pas vraiment recommandé d'attribuer un score négatif à l'un des Formats Personnalisés de VF (VFF, VFQ, VQ, VFB, VFI, VF2). Augmentez plutôt le score de votre format audio préféré. {! include-markdown "../../includes/french-guide/radarr-french-audio-version-fr.md" !} diff --git a/docs/Sonarr/sonarr-setup-quality-profiles-french-en.md b/docs/Sonarr/sonarr-setup-quality-profiles-french-en.md index 739b3ffeb..000ddac26 100644 --- a/docs/Sonarr/sonarr-setup-quality-profiles-french-en.md +++ b/docs/Sonarr/sonarr-setup-quality-profiles-french-en.md @@ -73,7 +73,7 @@ Those are all optional and only there to rename your release or to prefer a cert - You only want VOSTFR, in this case you will ignore any mention of **MULTi Custom Formats** and give the [{{ sonarr['cf']['french-vostfr']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vostfr) Custom Format a score of `1000`. !!! warning "Attention" - It is not really recommended to put any of the VF Custom Formats (VFF, VFQ, VQ, VFI, VF2) to a negative score. Instead increase the score of your preferred audio. + It is not really recommended to put any of the VF Custom Formats (VFF, VFQ, VQ, VFB, VFI, VF2) to a negative score. Instead increase the score of your preferred audio. {! include-markdown "../../includes/french-guide/sonarr-french-audio-version-en.md" !} diff --git a/docs/Sonarr/sonarr-setup-quality-profiles-french-fr.md b/docs/Sonarr/sonarr-setup-quality-profiles-french-fr.md index 8e54fe77c..4a38a4129 100644 --- a/docs/Sonarr/sonarr-setup-quality-profiles-french-fr.md +++ b/docs/Sonarr/sonarr-setup-quality-profiles-french-fr.md @@ -70,7 +70,7 @@ Ces Formats sont optionnels et ne sont là que pour renommer votre fichier ou po - Vous souhaitez seulement du VOSTFR, dans ce ce cas, ignorez toute mention des **Formats Personnalisés MULTi** et donnez un score de `1000` au Format Personnalisé [{{ sonarr['cf']['french-vostfr']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vostfr). !!! warning "Attention" - Il n'est pas vraiment recommandé d'attribuer un score négatif à l'un des Formats Personnalisés de VF (VFF, VFQ, VQ, VFI, VF2). Augmentez plutôt le score de votre format audio préféré. + Il n'est pas vraiment recommandé d'attribuer un score négatif à l'un des Formats Personnalisés de VF (VFF, VFQ, VQ, VFB, VFI, VF2). Augmentez plutôt le score de votre format audio préféré. {! include-markdown "../../includes/french-guide/sonarr-french-audio-version-fr.md" !} From c8ac9ed57a480ef6bd390a68b3c6a06b5f120f95 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Fri, 21 Apr 2023 18:00:49 +0200 Subject: [PATCH 17/24] Update unwanted section of Recyclarr config - Missing SDR - FastSUB/FanSUB not needed --- .../radarr/french-remux-web-2160p-multi.yml | 1 + .../radarr/french-remux-web-2160p-vostfr.yml | 1 + .../radarr/french-uhd-bluray-web-multi.yml | 1 + .../radarr/french-uhd-bluray-web-vostfr.yml | 1 + .../sonarr/french-web-1080p-multi-v4.yml | 11 ----------- 5 files changed, 4 insertions(+), 11 deletions(-) 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 bbd27402a..9cbd87116 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-2160p-multi.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-2160p-multi.yml @@ -68,6 +68,7 @@ radarr: - 90a6f9a284dff5103f6346090e6280c8 # LQ - dc98083864ea246d05a42df0d05f81cc # x265 (HD) - bfd8eb01832d646a0a89c4deb46f8564 # Upscaled + - 9c38ebb7384dada637be8899efa68e6f # SDR # ===== Version du film ===== - 0f12c086e289cf966fa5948eac571f44 # Hybrid - 570bc9ebecd92723d2d21500f4be314c # Remaster 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 0c3727a81..807980ab8 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-2160p-vostfr.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-2160p-vostfr.yml @@ -61,6 +61,7 @@ radarr: - 90a6f9a284dff5103f6346090e6280c8 # LQ - dc98083864ea246d05a42df0d05f81cc # x265 (HD) - bfd8eb01832d646a0a89c4deb46f8564 # Upscaled + - 9c38ebb7384dada637be8899efa68e6f # SDR - 7f9b93f82b7e996391525f2be1d891e0 # FastSUB # ===== Version du film ===== - 0f12c086e289cf966fa5948eac571f44 # Hybrid 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 c5a4ffbd8..6a4c8f402 100644 --- a/docs/recyclarr-configs/radarr/french-uhd-bluray-web-multi.yml +++ b/docs/recyclarr-configs/radarr/french-uhd-bluray-web-multi.yml @@ -68,6 +68,7 @@ radarr: - 90a6f9a284dff5103f6346090e6280c8 # LQ - dc98083864ea246d05a42df0d05f81cc # x265 (HD) - bfd8eb01832d646a0a89c4deb46f8564 # Upscaled + - 9c38ebb7384dada637be8899efa68e6f # SDR # ===== Version du film ===== - 0f12c086e289cf966fa5948eac571f44 # Hybrid - 570bc9ebecd92723d2d21500f4be314c # Remaster 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 e80d06101..8c86ba281 100644 --- a/docs/recyclarr-configs/radarr/french-uhd-bluray-web-vostfr.yml +++ b/docs/recyclarr-configs/radarr/french-uhd-bluray-web-vostfr.yml @@ -61,6 +61,7 @@ radarr: - 90a6f9a284dff5103f6346090e6280c8 # LQ - dc98083864ea246d05a42df0d05f81cc # x265 (HD) - bfd8eb01832d646a0a89c4deb46f8564 # Upscaled + - 9c38ebb7384dada637be8899efa68e6f # SDR - 7f9b93f82b7e996391525f2be1d891e0 # FastSUB # ===== Version du film ===== - 0f12c086e289cf966fa5948eac571f44 # Hybrid 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 46f9d1546..2f789eddc 100644 --- a/docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml @@ -30,7 +30,6 @@ sonarr: - 3ba797e5dc13af4b8d9bb25e83d90de2 # FR LQ - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ - 47435ece6b99a0b477caf360e79ba0bb # x265 (HD) - - ea0bb4b6ba388992fad1092703b5ff7b # FastSUB # ===== Misc ===== - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper - eb3d5cc0a2be0db205fb823640db6a3c # Repack2 @@ -126,13 +125,3 @@ sonarr: - 07a32f77690263bb9fda1842db7e273f # VOSTFR quality_profiles: - name: FR-MULTi-WEB-1080p - - # ==== Scores Optionnels ==== - # Décommenter le score associé si c'est ce que vous souhaitez - - # Si vous ne voulez pas non-plus de FanSUB. - - trash_ids: - - 84f0acbda9c0c9de783894fb66df25aa # FanSUB - quality_profiles: - - name: FR-MULTi-WEB-1080p - # score: -10000 From f925adc963ddf3e68ffde7558b9fdc9e91e9ff7d Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Fri, 21 Apr 2023 18:00:55 +0200 Subject: [PATCH 18/24] Added Sonarr French 2160p Web Recyclarr configs --- .../sonarr/french-web-2160p-multi-v4.yml | 142 ++++++++++++++++++ .../sonarr/french-web-2160p-vostfr-v4.yml | 116 ++++++++++++++ docs/recyclarr-configs/templates.json | 8 + 3 files changed, 266 insertions(+) create mode 100644 docs/recyclarr-configs/sonarr/french-web-2160p-multi-v4.yml create mode 100644 docs/recyclarr-configs/sonarr/french-web-2160p-vostfr-v4.yml diff --git a/docs/recyclarr-configs/sonarr/french-web-2160p-multi-v4.yml b/docs/recyclarr-configs/sonarr/french-web-2160p-multi-v4.yml new file mode 100644 index 000000000..e3b17c86b --- /dev/null +++ b/docs/recyclarr-configs/sonarr/french-web-2160p-multi-v4.yml @@ -0,0 +1,142 @@ +# Ce fichier propose un example de configuration pour le logiciel "recyclarr" : +# https://recyclarr.dev/wiki/ +# https://github.com/recyclarr/recyclarr + +# Cet exemple est pour Sonarr et le profil "WEB 2160p VOSTFR" present dans le guide +# https://trash-guides.info/Sonarr/sonarr-setup-quality-profiles-french-en/#webdl-2160p +sonarr: + sonarr_french_multi_web_2160p: + # L'URL de base ainsi que la clé API de votre instance Sonarr + base_url: [sonarr_url_goes_here] + api_key: [api_key_goes_here] + + quality_definition: + type: series + + quality_profiles: + - name: FR-MULTi-WEB-2160p + reset_unmatched_scores: true + + # La liste de Formats Personnalisés à synchroniser avec Sonarr. + custom_formats: + - trash_ids: + # ===== MULTi Audio ===== + - 2f6e84efc47246ec9071e311e71c4953 # Multi-Audio + - 7982e39789f17864f57b11f1996844f4 # Multi-French + # Décommentez la ligne suivante si vous voulez donner un léger bonus à la release si elle possède effectivement un audio français. + # - 4721382d9ee05f1b4967a25e75072911 # French Audio + # ===== Formats HDR ===== + # https://trash-guides.info/Radarr/images/flowchart-hdr-formats.png + - 7878c33f1963fefb3d6c8657d46c2f0a # DV HDR10 + - 6d0d8de7b57e35518ac0308b0ddf404e # DV + - 1f733af03141f068a540eec352589a89 # DV HLG + - 27954b0a80aab882522a88a4d9eae1cd # DV SDR + - a3d82cbef5039f8d295478d28a887159 # HDR10+ + - 3497799d29a085e2ac2df9d468413c94 # HDR10 + - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR + - bb019e1cd00f304f80971c965de064dc # HDR (undefined) + - 2a7e3be05d3861d6df7171ec74cad727 # PQ + - 17e889ce13117940092308f48b48b45b # HLG + # La ligne suivante garantit que les releases WEB avec un layer Dolby Vision ne seront prises en compte que si elles ont un fallback en HDR10. + # Vous pouvez commenter cette ligne SI ET SEULEMENT SI TOUS les appareils utilisant votre bibliothèque supportent le Dolby Vision et que vous n'avez pas besoin du fallback en HDR10. + - 9b27ab6498ec0f31a3353992e19434ca # DV (WEBDL) + # ===== Indésirables ===== + - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK + - 3ba797e5dc13af4b8d9bb25e83d90de2 # FR LQ + - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ + - 2016d1676f5ee13a5b7257ff86ac9a93 # SDR + # ===== Misc ===== + - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper + - eb3d5cc0a2be0db205fb823640db6a3c # Repack2 + - 44e7c4de10ae50265753082e5dc76047 # Repack3 + # ===== Services de Streaming ===== + - d660701077794679fd59e8bdf4ce3a29 # AMZN + - f67c9ca88f463a48346062e8ad07713f # ATVP + - 36b72f59f4ea20aad9316f475f2d9fbb # DCU + - 89358767a60cc28783cdc3d0be9388a4 # DSNP + - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO + - a880d6abc21e7c16884f3ae393f84179 # HMAX + - f6cce30f1733d5c8194222a7507909bb # HULU + - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT + - d34870697c9db575f17700212167be23 # NF + - b2b980877494b560443631eb1f473867 # NLZ + - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK + - c67a75ae4a1715f2bb4d492755ba4195 # PMTP + - 3ac5d84fce98bab1b531393e9c82f467 # QIBI + - c30d2958827d1867c73318a5a2957eb1 # RED + - ae58039e1319178e6be73caab5c42166 # SHO + - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN + - 5d2317d99af813b6529c7ebf01c83533 # VDL + - 77a7b25585c18af08f60b1547bb9b4fb # CC + # Ceux-ci sont optionnels, car les services de streaming francophones sont rarement indiqués sur les releases et les Formats Personnalisés ne possèdent pas de score. Vous pouvez les supprimer sans craintes. + - f27d46a831e6b16fa3fee2c4e5d10984 # Canal+ + - 0455d6519a550dbf648c97b56e7231d2 # SALTO + - b0d6195c23ae254932da00512db7e8a8 # RTBF + # ===== HQ Source Groups ===== + - ddb8eaa9c85a549c50034d280539d54d # FR WEB Tier 01 + - a4c51febd4d8b2a0db10a3c974f21d92 # FR WEB Tier 02 + - dbfc0a4b5cb4cbd693311c4482ae9683 # FR WEB Tier 03 + # Vous pouvez commenter/supprimer le groupe scene si vous ne souhaitez pas de releases venant de la Scene française + - 2f3422339d185eb227a324644a2fbfca # FR Scene Groups + # Les tiers suivant sont les tiers originaux du guide (groupes anglophones) + # vous pouvez les activer si vous souhaitez aussi récupérer de bonnes releases en VO si jamais une release MULTi n'existes pas. + # + # Il est tout de fois possible que dans ce cas Sonarr récupére une release VO au lieu d'un MULTi/DUAL car celle-ci possède un score plus important. + # - d0c516558625b04b363fa6c5c2c7cfd4 # WEB Scene + # - e6258996055b9fbab7e9cb2f75819294 # WEB Tier 01 + # - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02 + # - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03 + quality_profiles: + - name: FR-MULTi-WEB-2160p + + - trash_ids: + - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 + quality_profiles: + - name: FR-MULTi-WEB-2160p + score: -10000 + + # ===== Versions françaises ===== + # Activez ou désactiver les Formats Personnalisés suivant si vous souhaitez noter vos releases avec. + # Vous pouvez aussi leur attribuer un score en fonction de si vous souhaitez préférer un certain + # type d'audio français. Par exemple si vous préférez la VFF. + # Pensez à vérifier aussi à quoi corresponde les différents types de version francophones : + # https://trash-guides.info/Sonarr/sonarr-setup-quality-profiles-french-fr/#type-de-versions-francaises + - trash_ids: + - 2c29a39a4fdfd6d258799bc4c09731b9 # VFF + quality_profiles: + - name: FR-MULTi-WEB-2160p + # score: 101 + - trash_ids: + - 7ae924ee9b2f39df3283c6c0beb8a2aa # VOF + quality_profiles: + - name: FR-MULTi-WEB-2160p + # score: 101 + - trash_ids: + - b6816a0e1d4b64bf3550ad3b74b009b6 # VFI + quality_profiles: + - name: FR-MULTi-WEB-2160p + # score: 101 + - trash_ids: + - b6816a0e1d4b64bf3550ad3b74b009b6 # VF2 + quality_profiles: + - name: FR-MULTi-WEB-2160p + # score: 101 + - trash_ids: + - 7a7f4e4f58bd1058440236d033a90b67 # VFQ + quality_profiles: + - name: FR-MULTi-WEB-2160p + # score: 101 + - trash_ids: + - 82085412d9a53ba8d8e46fc624eb701d # VQ + quality_profiles: + - name: FR-MULTi-WEB-2160p + # score: 101 + - trash_ids: + - 0ce1e39a4676c6692ce47935278dac76 # VFB + quality_profiles: + - name: FR-MULTi-WEB-2160p + # score: 101 + - trash_ids: + - 07a32f77690263bb9fda1842db7e273f # VOSTFR + quality_profiles: + - name: FR-MULTi-WEB-2160p diff --git a/docs/recyclarr-configs/sonarr/french-web-2160p-vostfr-v4.yml b/docs/recyclarr-configs/sonarr/french-web-2160p-vostfr-v4.yml new file mode 100644 index 000000000..2af85615e --- /dev/null +++ b/docs/recyclarr-configs/sonarr/french-web-2160p-vostfr-v4.yml @@ -0,0 +1,116 @@ +# Ce fichier propose un example de configuration pour le logiciel "recyclarr" : +# https://recyclarr.dev/wiki/ +# https://github.com/recyclarr/recyclarr + +# Cet exemple est pour Sonarr et le profil "WEB 2160p VOSTFR" present dans le guide +# https://trash-guides.info/Sonarr/sonarr-setup-quality-profiles-french-en/#webdl-2160p +sonarr: + sonarr_french_vostfr_web_2160p: + # L'URL de base ainsi que la clé API de votre instance Sonarr + base_url: [sonarr_url_goes_here] + api_key: [api_key_goes_here] + + quality_definition: + type: series + + quality_profiles: + - name: FR-VOSTFR-WEB-2160p + reset_unmatched_scores: true + + # La liste de Formats Personnalisés à synchroniser avec Sonarr. + custom_formats: + - trash_ids: + # ===== Formats HDR ===== + # https://trash-guides.info/Radarr/images/flowchart-hdr-formats.png + - 7878c33f1963fefb3d6c8657d46c2f0a # DV HDR10 + - 6d0d8de7b57e35518ac0308b0ddf404e # DV + - 1f733af03141f068a540eec352589a89 # DV HLG + - 27954b0a80aab882522a88a4d9eae1cd # DV SDR + - a3d82cbef5039f8d295478d28a887159 # HDR10+ + - 3497799d29a085e2ac2df9d468413c94 # HDR10 + - 3e2c4e748b64a1a1118e0ea3f4cf6875 # HDR + - bb019e1cd00f304f80971c965de064dc # HDR (undefined) + - 2a7e3be05d3861d6df7171ec74cad727 # PQ + - 17e889ce13117940092308f48b48b45b # HLG + # La ligne suivante garantit que les releases WEB avec un layer Dolby Vision ne seront prises en compte que si elles ont un fallback en HDR10. + # Vous pouvez commenter cette ligne SI ET SEULEMENT SI TOUS les appareils utilisant votre bibliothèque supportent le Dolby Vision et que vous n'avez pas besoin du fallback en HDR10. + - 9b27ab6498ec0f31a3353992e19434ca # DV (WEBDL) + # ===== Indésirables ===== + - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK + - 3ba797e5dc13af4b8d9bb25e83d90de2 # FR LQ + - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ + - 2016d1676f5ee13a5b7257ff86ac9a93 # SDR + - ea0bb4b6ba388992fad1092703b5ff7b # FastSUB + # ===== Misc ===== + - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper + - eb3d5cc0a2be0db205fb823640db6a3c # Repack2 + - 44e7c4de10ae50265753082e5dc76047 # Repack3 + # ===== Services de Streaming ===== + - d660701077794679fd59e8bdf4ce3a29 # AMZN + - f67c9ca88f463a48346062e8ad07713f # ATVP + - 36b72f59f4ea20aad9316f475f2d9fbb # DCU + - 89358767a60cc28783cdc3d0be9388a4 # DSNP + - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO + - a880d6abc21e7c16884f3ae393f84179 # HMAX + - f6cce30f1733d5c8194222a7507909bb # HULU + - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT + - d34870697c9db575f17700212167be23 # NF + - b2b980877494b560443631eb1f473867 # NLZ + - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK + - c67a75ae4a1715f2bb4d492755ba4195 # PMTP + - 3ac5d84fce98bab1b531393e9c82f467 # QIBI + - c30d2958827d1867c73318a5a2957eb1 # RED + - ae58039e1319178e6be73caab5c42166 # SHO + - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN + - 5d2317d99af813b6529c7ebf01c83533 # VDL + - 77a7b25585c18af08f60b1547bb9b4fb # CC + # Ceux-ci sont optionnels, car les services de streaming francophones sont rarement indiqués sur les releases et les Formats Personnalisés ne possèdent pas de score. Vous pouvez les supprimer sans craintes. + - f27d46a831e6b16fa3fee2c4e5d10984 # Canal+ + - 0455d6519a550dbf648c97b56e7231d2 # SALTO + - b0d6195c23ae254932da00512db7e8a8 # RTBF + # ===== HQ Source Groups ===== + - ddb8eaa9c85a549c50034d280539d54d # FR WEB Tier 01 + - a4c51febd4d8b2a0db10a3c974f21d92 # FR WEB Tier 02 + - dbfc0a4b5cb4cbd693311c4482ae9683 # FR WEB Tier 03 + # Vous pouvez commenter/supprimer le groupe scene si vous ne souhaitez pas de releases venant de la Scene française + - 2f3422339d185eb227a324644a2fbfca # FR Scene Groups + # Les tiers suivant sont les tiers originaux du guide (groupes anglophones) + - d0c516558625b04b363fa6c5c2c7cfd4 # WEB Scene + - e6258996055b9fbab7e9cb2f75819294 # WEB Tier 01 + - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02 + - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03 + quality_profiles: + - name: FR-VOSTFR-WEB-2160p + + - trash_ids: + - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 + quality_profiles: + - name: FR-VOSTFR-WEB-2160p + score: -10000 + + # ===== MULTi Audio ===== + # Nécessaire vu qu'on ne souhaite pas de MULTi + - trash_ids: + - 2f6e84efc47246ec9071e311e71c4953 # Multi-Audio + quality_profiles: + - name: FR-VOSTFR-WEB-2160p + score: -10000 + + # ===== Versions françaises ===== + # Seul le VOSTFR est présent et possède un score de '1000' car on souhaite obtenir du VOSTFR et non du MULTi/DUAL audio. + # https://trash-guides.info/Sonarr/sonarr-setup-quality-profiles-french-fr/#type-de-versions-francaises + - trash_ids: + - 07a32f77690263bb9fda1842db7e273f # VOSTFR + quality_profiles: + - name: FR-VOSTFR-WEB-2160p + score: 1000 + + # ==== Scores Optionnels ==== + # Décommenter le score associé si c'est ce que vous souhaitez + + # Si vous ne voulez pas non-plus de FanSUB. + - trash_ids: + - 84f0acbda9c0c9de783894fb66df25aa # FanSUB + quality_profiles: + - name: FR-VOSTFR-WEB-2160p + # score: -10000 diff --git a/docs/recyclarr-configs/templates.json b/docs/recyclarr-configs/templates.json index 23514ff42..d8e1435a3 100644 --- a/docs/recyclarr-configs/templates.json +++ b/docs/recyclarr-configs/templates.json @@ -99,6 +99,14 @@ "template": "sonarr/french-web-1080p-vostfr-v4.yml", "id": "french-web-1080p-vostfr-v4" }, + { + "template": "sonarr/french-web-2160p-multi-v4.yml", + "id": "french-web-2160p-multi-v4" + }, + { + "template": "sonarr/french-web-2160p-vostfr-v4.yml", + "id": "french-web-2160p-vostfr-v4" + }, { "template": "sonarr/french-anime-multi-v4.yml", "id": "french-anime-multi-v4" From 26218dc7a240b55191b513452d4f3a23dd509b63 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Fri, 21 Apr 2023 18:29:27 +0200 Subject: [PATCH 19/24] Fix French Anime tiers CFs From `ReleaseGroupSpecification` to `ReleaseTitleSpecification` as anime naming is weird --- docs/json/sonarr/cf/french-anime-fansub.json | 22 +++++++++---------- docs/json/sonarr/cf/french-anime-tier-01.json | 22 +++++++++---------- docs/json/sonarr/cf/french-anime-tier-02.json | 22 +++++++++---------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/docs/json/sonarr/cf/french-anime-fansub.json b/docs/json/sonarr/cf/french-anime-fansub.json index 3f38a5e46..097c09374 100644 --- a/docs/json/sonarr/cf/french-anime-fansub.json +++ b/docs/json/sonarr/cf/french-anime-fansub.json @@ -6,7 +6,7 @@ "specifications": [ { "name": "Anime-Heart", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -15,7 +15,7 @@ }, { "name": "KaeriZaki", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -24,7 +24,7 @@ }, { "name": "KFR", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -33,7 +33,7 @@ }, { "name": "Natsumi-no-Sekai", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -42,7 +42,7 @@ }, { "name": "NekoYu'", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -51,7 +51,7 @@ }, { "name": "Onii-ChanSub", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -60,7 +60,7 @@ }, { "name": "Otaku-Attitude", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -69,7 +69,7 @@ }, { "name": "Owlolf", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -78,7 +78,7 @@ }, { "name": "Pikari-Teshima", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -87,7 +87,7 @@ }, { "name": "Team Arcedo", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -96,7 +96,7 @@ }, { "name": "Yarashii", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { diff --git a/docs/json/sonarr/cf/french-anime-tier-01.json b/docs/json/sonarr/cf/french-anime-tier-01.json index 5ee9d48dd..1293cd46c 100644 --- a/docs/json/sonarr/cf/french-anime-tier-01.json +++ b/docs/json/sonarr/cf/french-anime-tier-01.json @@ -6,7 +6,7 @@ "specifications": [ { "name": "Darki", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -15,7 +15,7 @@ }, { "name": "Delivroozzi", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -24,7 +24,7 @@ }, { "name": "Fuceo", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -33,7 +33,7 @@ }, { "name": "FUJiSAN", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -42,7 +42,7 @@ }, { "name": "Good Job! Alexis", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -51,7 +51,7 @@ }, { "name": "NeoSG", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -60,7 +60,7 @@ }, { "name": "Punisher694", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -69,7 +69,7 @@ }, { "name": "SR-71", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -78,7 +78,7 @@ }, { "name": "T3KASHi", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -87,7 +87,7 @@ }, { "name": "TANOSHii", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -96,7 +96,7 @@ }, { "name": "Tsundere-Raws", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { diff --git a/docs/json/sonarr/cf/french-anime-tier-02.json b/docs/json/sonarr/cf/french-anime-tier-02.json index e54728d5b..bbcda4337 100644 --- a/docs/json/sonarr/cf/french-anime-tier-02.json +++ b/docs/json/sonarr/cf/french-anime-tier-02.json @@ -6,7 +6,7 @@ "specifications": [ { "name": "Aoi-Project", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -15,7 +15,7 @@ }, { "name": "BLV", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -24,7 +24,7 @@ }, { "name": "D3T3R10R1TY", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -33,7 +33,7 @@ }, { "name": "HANAMi", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -42,7 +42,7 @@ }, { "name": "KAF", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -51,7 +51,7 @@ }, { "name": "KHAYA", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -60,7 +60,7 @@ }, { "name": "Monkey-D.Lulu", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -69,7 +69,7 @@ }, { "name": "Nagutos", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -78,7 +78,7 @@ }, { "name": "RONiN", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -87,7 +87,7 @@ }, { "name": "TTN", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { @@ -96,7 +96,7 @@ }, { "name": "XSPITFIRE911", - "implementation": "ReleaseGroupSpecification", + "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { From a70db20db9267db2d002a984d8f8f5716940e04b Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Fri, 21 Apr 2023 20:57:43 +0200 Subject: [PATCH 20/24] Change Groups recognition Align with latest discussion about double groups scoring --- .../radarr/cf/french-hd-bluray-tier-01.json | 14 +++--- .../radarr/cf/french-hd-bluray-tier-02.json | 22 ++++----- docs/json/radarr/cf/french-remux-tier-01.json | 20 ++++---- docs/json/radarr/cf/french-remux-tier-02.json | 20 ++++---- docs/json/radarr/cf/french-scene.json | 46 +++++++++---------- .../radarr/cf/french-uhd-bluray-tier-01.json | 8 ++-- .../radarr/cf/french-uhd-bluray-tier-02.json | 8 ++-- docs/json/radarr/cf/french-web-tier-01.json | 20 ++++---- docs/json/radarr/cf/french-web-tier-02.json | 20 ++++---- .../sonarr/cf/french-hd-bluray-tier-01.json | 12 ++--- docs/json/sonarr/cf/french-remux-tier-01.json | 14 +++--- docs/json/sonarr/cf/french-scene.json | 46 +++++++++---------- docs/json/sonarr/cf/french-web-tier-01.json | 14 +++--- docs/json/sonarr/cf/french-web-tier-02.json | 16 +++---- docs/json/sonarr/cf/french-web-tier-03.json | 16 +++---- 15 files changed, 148 insertions(+), 148 deletions(-) diff --git a/docs/json/radarr/cf/french-hd-bluray-tier-01.json b/docs/json/radarr/cf/french-hd-bluray-tier-01.json index b313512f2..a61757865 100644 --- a/docs/json/radarr/cf/french-hd-bluray-tier-01.json +++ b/docs/json/radarr/cf/french-hd-bluray-tier-01.json @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(BDHD)$" + "value": "^(BDHD)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FoX)$" + "value": "^(FoX)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FRATERNiTY)$" + "value": "^(FRATERNiTY)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FrIeNdS)$" + "value": "^(FrIeNdS)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MAX)$" + "value": "^(MAX)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Psaro)$" + "value": "^(Psaro)$" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(T3KASHi)$" + "value": "^(T3KASHi)$" } } ] diff --git a/docs/json/radarr/cf/french-hd-bluray-tier-02.json b/docs/json/radarr/cf/french-hd-bluray-tier-02.json index 733a7b84f..aaa7ac63c 100644 --- a/docs/json/radarr/cf/french-hd-bluray-tier-02.json +++ b/docs/json/radarr/cf/french-hd-bluray-tier-02.json @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FUJiSAN)$" + "value": "^(FUJiSAN)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HANAMi)$" + "value": "^(HANAMi)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HDForever)$" + "value": "^(HDForever)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HeavyWeight)$" + "value": "^(HeavyWeight)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MARBLECAKE)$" + "value": "^(MARBLECAKE)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MYSTERiON)$" + "value": "^(MYSTERiON)$" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(NoNE)$" + "value": "^(NoNE)$" } }, { @@ -100,7 +100,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ONLY)$" + "value": "^(ONLY)$" } }, { @@ -109,7 +109,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ONLYMOViE)$" + "value": "^(ONLYMOViE)$" } }, { @@ -118,7 +118,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(TkHD)$" + "value": "^(TkHD)$" } }, { @@ -127,7 +127,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(UTT)$" + "value": "^(UTT)$" } } ] diff --git a/docs/json/radarr/cf/french-remux-tier-01.json b/docs/json/radarr/cf/french-remux-tier-01.json index 9d9b2e750..c6dc50d66 100644 --- a/docs/json/radarr/cf/french-remux-tier-01.json +++ b/docs/json/radarr/cf/french-remux-tier-01.json @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(BlackAngel)$" + "value": "^(BlackAngel)$" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Choco)$" + "value": "^(Choco)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HDForever)$" + "value": "^(HDForever)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MAX)$" + "value": "^(MAX)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ONLY)$" + "value": "^(ONLY)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Psaro)$" + "value": "^(Psaro)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Sicario)$" + "value": "^(Sicario)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Tezcat74)$" + "value": "^(Tezcat74)$" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(TyrellCorp)$" + "value": "^(TyrellCorp)$" } }, { @@ -100,7 +100,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Zapax)$" + "value": "^(Zapax)$" } } ] diff --git a/docs/json/radarr/cf/french-remux-tier-02.json b/docs/json/radarr/cf/french-remux-tier-02.json index 886963ee1..5d88ea358 100644 --- a/docs/json/radarr/cf/french-remux-tier-02.json +++ b/docs/json/radarr/cf/french-remux-tier-02.json @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(BDHD)$" + "value": "^(BDHD)$" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FtLi)$" + "value": "^(FtLi)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Goldenyann)$" + "value": "^(Goldenyann)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HeavyWeight)$" + "value": "^(HeavyWeight)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MARBLECAKE)$" + "value": "^(MARBLECAKE)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MUSTANG)$" + "value": "^(MUSTANG)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Obi)$" + "value": "^(Obi)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(PEPiTE)$" + "value": "^(PEPiTE)$" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Q(UEBE)?C63)$" + "value": "^(Q(UEBE)?C63)$" } }, { @@ -100,7 +100,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ROMKENT)$" + "value": "^(ROMKENT)$" } } ] diff --git a/docs/json/radarr/cf/french-scene.json b/docs/json/radarr/cf/french-scene.json index 34b457a2d..e9802a6e1 100644 --- a/docs/json/radarr/cf/french-scene.json +++ b/docs/json/radarr/cf/french-scene.json @@ -10,7 +10,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(4FR)$" + "value": "^(4FR)$" } }, { @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(AiR3D|AiRDOCS|AiRFORCE|AiRLiNE|AiRTV|AKLHD|AMB3R|ANMWR|AVON|AYMO|AZR)$" + "value": "^(AiR3D|AiRDOCS|AiRFORCE|AiRLiNE|AiRTV|AKLHD|AMB3R|ANMWR|AVON|AYMO|AZR)$" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(BANKAi|BAWLS|BiPOLAR|BLACKPANTERS|BODIE|BOOLZ|BRiNK)$" + "value": "^(BANKAi|BAWLS|BiPOLAR|BLACKPANTERS|BODIE|BOOLZ|BRiNK)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(CARAPiLS|CiELOS|CiNEMA|CMBHD|CoRa|COUAC|CRYPT0)$" + "value": "^(CARAPiLS|CiELOS|CiNEMA|CMBHD|CoRa|COUAC|CRYPT0)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(D4KiD|DEAL|DiEBEX|DUPLI|DUSS)$" + "value": "^(D4KiD|DEAL|DiEBEX|DUPLI|DUSS)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ENJOi|EUBDS)$" + "value": "^(ENJOi|EUBDS)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FHD|FiDELiO|FiDO|ForceBleue|FREAMON|FRENCHDEADPOOL2|FRiES|FUTiL|FWDHD)$" + "value": "^(FHD|FiDELiO|FiDO|ForceBleue|FREAMON|FRENCHDEADPOOL2|FRiES|FUTiL|FWDHD)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(GHOULS|GiMBAP|GLiMMER|Goatlove)$" + "value": "^(GHOULS|GiMBAP|GLiMMER|Goatlove)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HERC|HiggsBoson|HiRoSHiMa|HYBRiS|HyDe)$" + "value": "^(HERC|HiggsBoson|HiRoSHiMa|HYBRiS|HyDe)$" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(JMT|JoKeR|JUSTICELEAGUE)$" + "value": "^(JMT|JoKeR|JUSTICELEAGUE)$" } }, { @@ -100,7 +100,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(KAZETV)$" + "value": "^(KAZETV)$" } }, { @@ -109,7 +109,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(L0SERNiGHT|LaoZi|LeON|LOFiDEL|LOST|LOWIMDB|LYPSG)$" + "value": "^(L0SERNiGHT|LaoZi|LeON|LOFiDEL|LOST|LOWIMDB|LYPSG)$" } }, { @@ -118,7 +118,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MAGiCAL|MANGACiTY|MAXAGAZ|MaxiBeNoul|McNULTY|MELBA|MiND|MORELAND|MUNSTER|MUxHD)$" + "value": "^(MAGiCAL|MANGACiTY|MAXAGAZ|MaxiBeNoul|McNULTY|MELBA|MiND|MORELAND|MUNSTER|MUxHD)$" } }, { @@ -127,7 +127,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(NERDHD|NERO|NrZ|NTK)$" + "value": "^(NERDHD|NERO|NrZ|NTK)$" } }, { @@ -136,7 +136,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(OBSTACLE|OohLaLa|OOKAMI)$" + "value": "^(OBSTACLE|OohLaLa|OOKAMI)$" } }, { @@ -145,7 +145,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(PANZeR|PiNKPANTERS|PKPTRS|PRiDEHD|PROPJOE|PURE|PUREWASTEOFBW)$" + "value": "^(PANZeR|PiNKPANTERS|PKPTRS|PRiDEHD|PROPJOE|PURE|PUREWASTEOFBW)$" } }, { @@ -154,7 +154,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ROUGH|RUDE|Ryotox)$" + "value": "^(ROUGH|RUDE|Ryotox)$" } }, { @@ -163,7 +163,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(SAFETY|SASHiMi|SEiGHT|SESKAPiLE|SHEEEiT|SHiNiGAMi(UHD)?|SiGeRiS|SILVIODANTE|SLEEPINGFOREST|SODAPOP|SPINE|SPOiLER|STRINGERBELL|SUNRiSE)$" + "value": "^(SAFETY|SASHiMi|SEiGHT|SESKAPiLE|SHEEEiT|SHiNiGAMi(UHD)?|SiGeRiS|SILVIODANTE|SLEEPINGFOREST|SODAPOP|SPINE|SPOiLER|STRINGERBELL|SUNRiSE)$" } }, { @@ -172,7 +172,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(tFR|THENiGHTMAREiNHD|THiNK|THREESOME|TiMELiNE|TSuNaMi)$" + "value": "^(tFR|THENiGHTMAREiNHD|THiNK|THREESOME|TiMELiNE|TSuNaMi)$" } }, { @@ -181,7 +181,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(UKDHD|UKDTV|ULSHD|Ulysse|USUNSKiLLED|URY)$" + "value": "^(UKDHD|UKDTV|ULSHD|Ulysse|USUNSKiLLED|URY)$" } }, { @@ -190,7 +190,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(VENUE|VFC|VoMiT)$" + "value": "^(VENUE|VFC|VoMiT)$" } }, { @@ -199,7 +199,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Wednesday29th)$" + "value": "^(Wednesday29th)$" } }, { @@ -208,7 +208,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ZEST|ZiRCON)$" + "value": "^(ZEST|ZiRCON)$" } } ] diff --git a/docs/json/radarr/cf/french-uhd-bluray-tier-01.json b/docs/json/radarr/cf/french-uhd-bluray-tier-01.json index d21a5c64b..70a0b5373 100644 --- a/docs/json/radarr/cf/french-uhd-bluray-tier-01.json +++ b/docs/json/radarr/cf/french-uhd-bluray-tier-01.json @@ -10,7 +10,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FLOP)$" + "value": "^(FLOP)$" } }, { @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FRATERNiTY)$" + "value": "^(FRATERNiTY)$" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FoX)$" + "value": "^(FoX)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Psaro)$" + "value": "^(Psaro)$" } }, { diff --git a/docs/json/radarr/cf/french-uhd-bluray-tier-02.json b/docs/json/radarr/cf/french-uhd-bluray-tier-02.json index 4ca2085f1..8e0371334 100644 --- a/docs/json/radarr/cf/french-uhd-bluray-tier-02.json +++ b/docs/json/radarr/cf/french-uhd-bluray-tier-02.json @@ -10,7 +10,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(DUSTiN)$" + "value": "^(DUSTiN)$" } }, { @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FCK)$" + "value": "^(FCK)$" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FrIeNdS)$" + "value": "^(FrIeNdS)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(QUALiTY)$" + "value": "^(QUALiTY)$" } }, { diff --git a/docs/json/radarr/cf/french-web-tier-01.json b/docs/json/radarr/cf/french-web-tier-01.json index d19bfc63a..2319cf288 100644 --- a/docs/json/radarr/cf/french-web-tier-01.json +++ b/docs/json/radarr/cf/french-web-tier-01.json @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(BONBON)$" + "value": "^(BONBON)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FCK)$" + "value": "^(FCK)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FoX)$" + "value": "^(FoX)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FRATERNiTY)$" + "value": "^(FRATERNiTY)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FrIeNdS)$" + "value": "^(FrIeNdS)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MOONLY)$" + "value": "^(MOONLY)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MTDK)$" + "value": "^(MTDK)$" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(PATOPESTO)$" + "value": "^(PATOPESTO)$" } }, { @@ -100,7 +100,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Psaro)$" + "value": "^(Psaro)$" } }, { @@ -109,7 +109,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(T3KASHi)$" + "value": "^(T3KASHi)$" } } ] diff --git a/docs/json/radarr/cf/french-web-tier-02.json b/docs/json/radarr/cf/french-web-tier-02.json index 2415e8849..32cc0d2f1 100644 --- a/docs/json/radarr/cf/french-web-tier-02.json +++ b/docs/json/radarr/cf/french-web-tier-02.json @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ALLDAYiN)$" + "value": "^(ALLDAYiN)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ARK01)$" + "value": "^(ARK01)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FUJiSAN)$" + "value": "^(FUJiSAN)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FW)$" + "value": "^(FW)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HANAMi)$" + "value": "^(HANAMi)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HeavyWeight)$" + "value": "^(HeavyWeight)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(NEO)$" + "value": "^(NEO)$" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(NoNe)$" + "value": "^(NoNe)$" } }, { @@ -100,7 +100,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Slay3R)$" + "value": "^(Slay3R)$" } }, { @@ -109,7 +109,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(TkHD)$" + "value": "^(TkHD)$" } } ] diff --git a/docs/json/sonarr/cf/french-hd-bluray-tier-01.json b/docs/json/sonarr/cf/french-hd-bluray-tier-01.json index a84811156..c44edd787 100644 --- a/docs/json/sonarr/cf/french-hd-bluray-tier-01.json +++ b/docs/json/sonarr/cf/french-hd-bluray-tier-01.json @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ARK01)$" + "value": "^(ARK01)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(BONBON)$" + "value": "^(BONBON)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FRATERNiTY)$" + "value": "^(FRATERNiTY)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FTMVHD)$" + "value": "^(FTMVHD)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HeavyWeight)$" + "value": "^(HeavyWeight)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Psaro)$" + "value": "^(Psaro)$" } } ] diff --git a/docs/json/sonarr/cf/french-remux-tier-01.json b/docs/json/sonarr/cf/french-remux-tier-01.json index 25b3a066c..900248c4d 100644 --- a/docs/json/sonarr/cf/french-remux-tier-01.json +++ b/docs/json/sonarr/cf/french-remux-tier-01.json @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FtLi)$" + "value": "^(FtLi)$" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Goldenyann)$" + "value": "^(Goldenyann)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HDForever)$" + "value": "^(HDForever)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HeavyWeight)$" + "value": "^(HeavyWeight)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ONLY)$" + "value": "^(ONLY)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Psaro)$" + "value": "^(Psaro)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(TyrellCorp)$" + "value": "^(TyrellCorp)$" } } ] diff --git a/docs/json/sonarr/cf/french-scene.json b/docs/json/sonarr/cf/french-scene.json index bfbe95fc1..e27d0ed48 100644 --- a/docs/json/sonarr/cf/french-scene.json +++ b/docs/json/sonarr/cf/french-scene.json @@ -10,7 +10,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(4FR)$" + "value": "^(4FR)$" } }, { @@ -19,7 +19,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(AiR3D|AiRDOCS|AiRFORCE|AiRLiNE|AiRTV|AMB3R|ANMWR|AVON|AYMO|AZR)$" + "value": "^(AiR3D|AiRDOCS|AiRFORCE|AiRLiNE|AiRTV|AMB3R|ANMWR|AVON|AYMO|AZR)$" } }, { @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(BANKAi|BAWLS|BiPOLAR|BLACKPANTERS|BODIE|BOOLZ|BRiNK)$" + "value": "^(BANKAi|BAWLS|BiPOLAR|BLACKPANTERS|BODIE|BOOLZ|BRiNK)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(CARAPiLS|CiELOS|CiNEMA|CMBHD|CoRa|COUAC|CRYPT0)$" + "value": "^(CARAPiLS|CiELOS|CiNEMA|CMBHD|CoRa|COUAC|CRYPT0)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(D4KiD|DEAL|DiEBEX|DUPLI|DUSS)$" + "value": "^(D4KiD|DEAL|DiEBEX|DUPLI|DUSS)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ENJOi|EUBDS)$" + "value": "^(ENJOi|EUBDS)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FHD|FiDELiO|FiDO|ForceBleue|FREAMON|FRENCHDEADPOOL2|FRiES|FUTiL|FWDHD)$" + "value": "^(FHD|FiDELiO|FiDO|ForceBleue|FREAMON|FRENCHDEADPOOL2|FRiES|FUTiL|FWDHD)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(GHOULS|GiMBAP|GLiMMER|Goatlove)$" + "value": "^(GHOULS|GiMBAP|GLiMMER|Goatlove)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HERC|HiggsBoson|HiRoSHiMa|HYBRiS|HyDe)$" + "value": "^(HERC|HiggsBoson|HiRoSHiMa|HYBRiS|HyDe)$" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(JMT|JoKeR|JUSTICELEAGUE)$" + "value": "^(JMT|JoKeR|JUSTICELEAGUE)$" } }, { @@ -100,7 +100,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(KAZETV)$" + "value": "^(KAZETV)$" } }, { @@ -109,7 +109,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(L0SERNiGHT|LaoZi|LeON|LOFiDEL|LOST|LOWIMDB|LYPSG)$" + "value": "^(L0SERNiGHT|LaoZi|LeON|LOFiDEL|LOST|LOWIMDB|LYPSG)$" } }, { @@ -118,7 +118,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MAGiCAL|MANGACiTY|MAXAGAZ|MaxiBeNoul|McNULTY|MELBA|MiND|MORELAND|MUNSTER|MUxHD)$" + "value": "^(MAGiCAL|MANGACiTY|MAXAGAZ|MaxiBeNoul|McNULTY|MELBA|MiND|MORELAND|MUNSTER|MUxHD)$" } }, { @@ -127,7 +127,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(N0Z00M|NERDHD|NERO|NrZ|NTK)$" + "value": "^(N0Z00M|NERDHD|NERO|NrZ|NTK)$" } }, { @@ -136,7 +136,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(OBSTACLE|OohLaLa|OOKAMI)$" + "value": "^(OBSTACLE|OohLaLa|OOKAMI)$" } }, { @@ -145,7 +145,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(PANZeR|PHoQUE|PiNKPANTERS|PKPTRS|PRiDEHD|PROPJOE|PURE|PUREWASTEOFBW)$" + "value": "^(PANZeR|PHoQUE|PiNKPANTERS|PKPTRS|PRiDEHD|PROPJOE|PURE|PUREWASTEOFBW)$" } }, { @@ -154,7 +154,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ROUGH|RUDE|Ryotox)$" + "value": "^(ROUGH|RUDE|Ryotox)$" } }, { @@ -163,7 +163,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(SAFETY|SASHiMi|SEiGHT|SESKAPiLE|SharpHD|SHEEEiT|SHiNiGAMi(UHD)?|SiGeRiS|SILVIODANTE|SLEEPINGFOREST|SODAPOP|SPINE|SPOiLER|STRINGERBELL|SUNRiSE)$" + "value": "^(SAFETY|SASHiMi|SEiGHT|SESKAPiLE|SharpHD|SHEEEiT|SHiNiGAMi(UHD)?|SiGeRiS|SILVIODANTE|SLEEPINGFOREST|SODAPOP|SPINE|SPOiLER|STRINGERBELL|SUNRiSE)$" } }, { @@ -172,7 +172,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(tFR|THENiGHTMAREiNHD|THiNK|THREESOME|TiMELiNE|TSuNaMi)$" + "value": "^(tFR|THENiGHTMAREiNHD|THiNK|THREESOME|TiMELiNE|TSuNaMi)$" } }, { @@ -181,7 +181,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(UKDHD|UKDTV|ULSHD|Ulysse|USUNSKiLLED|URY|USURY)$" + "value": "^(UKDHD|UKDTV|ULSHD|Ulysse|USUNSKiLLED|URY|USURY)$" } }, { @@ -190,7 +190,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(VENUE|VFC|VoMiT)$" + "value": "^(VENUE|VFC|VoMiT)$" } }, { @@ -199,7 +199,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Wednesday29th)$" + "value": "^(Wednesday29th)$" } }, { @@ -208,7 +208,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ZEST|ZiRCON)$" + "value": "^(ZEST|ZiRCON)$" } } ] diff --git a/docs/json/sonarr/cf/french-web-tier-01.json b/docs/json/sonarr/cf/french-web-tier-01.json index 42a3ba854..9053740bf 100644 --- a/docs/json/sonarr/cf/french-web-tier-01.json +++ b/docs/json/sonarr/cf/french-web-tier-01.json @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(BONBON)$" + "value": "^(BONBON)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FCK)$" + "value": "^(FCK)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FRATERNiTY)$" + "value": "^(FRATERNiTY)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MTDK)$" + "value": "^(MTDK)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(NoLo)$" + "value": "^(NoLo)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(PATOPESTO)$" + "value": "^(PATOPESTO)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Psaro)$" + "value": "^(Psaro)$" } } ] diff --git a/docs/json/sonarr/cf/french-web-tier-02.json b/docs/json/sonarr/cf/french-web-tier-02.json index 743889725..4e46259f8 100644 --- a/docs/json/sonarr/cf/french-web-tier-02.json +++ b/docs/json/sonarr/cf/french-web-tier-02.json @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(COLL3CTiF)$" + "value": "^(COLL3CTiF)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FiND)$" + "value": "^(FiND)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FrIeNdS)$" + "value": "^(FrIeNdS)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FW)$" + "value": "^(FW)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(HeavyWeight)$" + "value": "^(HeavyWeight)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(NoNe)$" + "value": "^(NoNe)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(pERsO)$" + "value": "^(pERsO)$" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(RiPiT)$" + "value": "^(RiPiT)$" } } ] diff --git a/docs/json/sonarr/cf/french-web-tier-03.json b/docs/json/sonarr/cf/french-web-tier-03.json index 446abbe92..1c145968e 100644 --- a/docs/json/sonarr/cf/french-web-tier-03.json +++ b/docs/json/sonarr/cf/french-web-tier-03.json @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(ARK01)$" + "value": "^(ARK01)$" } }, { @@ -37,7 +37,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(BraD)$" + "value": "^(BraD)$" } }, { @@ -46,7 +46,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(dRuIdE)$" + "value": "^(dRuIdE)$" } }, { @@ -55,7 +55,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(FTMVHD)$" + "value": "^(FTMVHD)$" } }, { @@ -64,7 +64,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(LAZARUS)$" + "value": "^(LAZARUS)$" } }, { @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MYSTERiON)$" + "value": "^(MYSTERiON)$" } }, { @@ -82,7 +82,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Scaph)$" + "value": "^(Scaph)$" } }, { @@ -91,7 +91,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(WQM)$" + "value": "^(WQM)$" } } ] From 31ede67b009e2668a168f7993d0d066b100cc1a6 Mon Sep 17 00:00:00 2001 From: yammes08 <111231042+yammes08@users.noreply.github.com> Date: Fri, 21 Apr 2023 20:15:18 +0100 Subject: [PATCH 21/24] Remove placeholder identifiers Remove placeholder identifiers --- docs/recyclarr-configs/radarr/anime-radarr.yml | 4 ++-- docs/recyclarr-configs/radarr/hd-bluray-web.yml | 4 ++-- docs/recyclarr-configs/radarr/remux-web-1080p.yml | 4 ++-- docs/recyclarr-configs/radarr/remux-web-2160p.yml | 4 ++-- docs/recyclarr-configs/radarr/uhd-bluray-web.yml | 4 ++-- docs/recyclarr-configs/sonarr/web-1080p-v4.yml | 4 ++-- docs/recyclarr-configs/sonarr/web-2160p-v4.yml | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/recyclarr-configs/radarr/anime-radarr.yml b/docs/recyclarr-configs/radarr/anime-radarr.yml index fb42aa79f..7c160b6a1 100644 --- a/docs/recyclarr-configs/radarr/anime-radarr.yml +++ b/docs/recyclarr-configs/radarr/anime-radarr.yml @@ -1,7 +1,7 @@ radarr: radarr-anime: # A custom name used to identify this particular instance. - base_url: [radarr_url_goes_here] - api_key: [api_key_goes_here] + base_url: Put your Radarr URL here + api_key: Put your API key here quality_definition: type: movie diff --git a/docs/recyclarr-configs/radarr/hd-bluray-web.yml b/docs/recyclarr-configs/radarr/hd-bluray-web.yml index 6f19359cf..afcc9a0a4 100644 --- a/docs/recyclarr-configs/radarr/hd-bluray-web.yml +++ b/docs/recyclarr-configs/radarr/hd-bluray-web.yml @@ -1,7 +1,7 @@ radarr: radarr: # A custom name used to identify this particular instance. - base_url: [radarr_url_goes_here] - api_key: [api_key_goes_here] + base_url: Put your Radarr URL here + api_key: Put your API key here quality_definition: type: movie diff --git a/docs/recyclarr-configs/radarr/remux-web-1080p.yml b/docs/recyclarr-configs/radarr/remux-web-1080p.yml index 3c7cbbb2b..fe96cff7f 100644 --- a/docs/recyclarr-configs/radarr/remux-web-1080p.yml +++ b/docs/recyclarr-configs/radarr/remux-web-1080p.yml @@ -1,7 +1,7 @@ radarr: radarr: # A custom name used to identify this particular instance. - base_url: [radarr_url_goes_here] - api_key: [api_key_goes_here] + base_url: Put your Radarr URL here + api_key: Put your API key here quality_definition: type: movie diff --git a/docs/recyclarr-configs/radarr/remux-web-2160p.yml b/docs/recyclarr-configs/radarr/remux-web-2160p.yml index d265f8b94..acf70116c 100644 --- a/docs/recyclarr-configs/radarr/remux-web-2160p.yml +++ b/docs/recyclarr-configs/radarr/remux-web-2160p.yml @@ -1,7 +1,7 @@ radarr: radarr: # A custom name used to identify this particular instance. - base_url: [radarr_url_goes_here] - api_key: [api_key_goes_here] + base_url: Put your Radarr URL here + api_key: Put your API key here quality_definition: type: movie diff --git a/docs/recyclarr-configs/radarr/uhd-bluray-web.yml b/docs/recyclarr-configs/radarr/uhd-bluray-web.yml index 571ceea2d..5c63679c4 100644 --- a/docs/recyclarr-configs/radarr/uhd-bluray-web.yml +++ b/docs/recyclarr-configs/radarr/uhd-bluray-web.yml @@ -1,7 +1,7 @@ radarr: radarr: # A custom name used to identify this particular instance. - base_url: [radarr_url_goes_here] - api_key: [api_key_goes_here] + base_url: Put your Radarr URL here + api_key: Put your API key here quality_definition: type: movie diff --git a/docs/recyclarr-configs/sonarr/web-1080p-v4.yml b/docs/recyclarr-configs/sonarr/web-1080p-v4.yml index 115249197..30d67166d 100644 --- a/docs/recyclarr-configs/sonarr/web-1080p-v4.yml +++ b/docs/recyclarr-configs/sonarr/web-1080p-v4.yml @@ -1,8 +1,8 @@ # This config file is for use with Sonarr V4 only sonarr: sonarr: # A custom name used to identify this particular instance. - base_url: [sonarr_url_goes_here] - api_key: [api_key_goes_here] + base_url: Put your Sonarr URL here + api_key: Put your API key here quality_definition: type: series diff --git a/docs/recyclarr-configs/sonarr/web-2160p-v4.yml b/docs/recyclarr-configs/sonarr/web-2160p-v4.yml index a36fc39a5..d7c92ffd6 100644 --- a/docs/recyclarr-configs/sonarr/web-2160p-v4.yml +++ b/docs/recyclarr-configs/sonarr/web-2160p-v4.yml @@ -1,8 +1,8 @@ # This config file is for use with Sonarr V4 only sonarr: sonarr: # A custom name used to identify this particular instance. - base_url: [sonarr_url_goes_here] - api_key: [api_key_goes_here] + base_url: Put your Sonarr URL here + api_key: Put your API key here quality_definition: type: series From 0d48972279806d1a6319126bdcd8c285ae0249b2 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Sat, 22 Apr 2023 15:07:38 +0200 Subject: [PATCH 22/24] Remove placeholder identifiers Following commit [31ede67](https://github.com/TRaSH-/Guides/pull/1272/commits/31ede67b009e2668a168f7993d0d066b100cc1a6) --- docs/recyclarr-configs/radarr/french-hd-bluray-web-multi.yml | 4 ++-- docs/recyclarr-configs/radarr/french-hd-bluray-web-vostfr.yml | 4 ++-- .../recyclarr-configs/radarr/french-remux-web-1080p-multi.yml | 4 ++-- .../radarr/french-remux-web-1080p-vostfr.yml | 4 ++-- .../recyclarr-configs/radarr/french-remux-web-2160p-multi.yml | 4 ++-- .../radarr/french-remux-web-2160p-vostfr.yml | 4 ++-- docs/recyclarr-configs/radarr/french-uhd-bluray-web-multi.yml | 4 ++-- .../recyclarr-configs/radarr/french-uhd-bluray-web-vostfr.yml | 4 ++-- docs/recyclarr-configs/sonarr/french-anime-multi-v4.yml | 4 ++-- docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml | 4 ++-- docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml | 4 ++-- docs/recyclarr-configs/sonarr/french-web-1080p-vostfr-v4.yml | 4 ++-- docs/recyclarr-configs/sonarr/french-web-2160p-multi-v4.yml | 4 ++-- docs/recyclarr-configs/sonarr/french-web-2160p-vostfr-v4.yml | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) 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 176a0e703..1a22c0e6a 100644 --- a/docs/recyclarr-configs/radarr/french-hd-bluray-web-multi.yml +++ b/docs/recyclarr-configs/radarr/french-hd-bluray-web-multi.yml @@ -7,8 +7,8 @@ radarr: radarr_french_multi_bluray_web_1080p: # L'URL de base ainsi que la clé API de votre instance Radarr - base_url: [radarr_url_goes_here] - api_key: [api_key_goes_here] + base_url: Put your Radarr URL here + api_key: Put your API key here quality_definition: type: movie 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 91d919b8d..c996970a4 100644 --- a/docs/recyclarr-configs/radarr/french-hd-bluray-web-vostfr.yml +++ b/docs/recyclarr-configs/radarr/french-hd-bluray-web-vostfr.yml @@ -7,8 +7,8 @@ radarr: radarr_french_vostfr_bluray_web_1080p: # L'URL de base ainsi que la clé API de votre instance Radarr - base_url: [radarr_url_goes_here] - api_key: [api_key_goes_here] + base_url: Put your Radarr URL here + api_key: Put your API key here quality_definition: type: movie 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 49cc88a86..7923569c2 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-1080p-multi.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-1080p-multi.yml @@ -7,8 +7,8 @@ radarr: radarr_french_multi_remux_web_1080p: # L'URL de base ainsi que la clé API de votre instance Radarr - base_url: [radarr_url_goes_here] - api_key: [api_key_goes_here] + base_url: Put your Radarr URL here + api_key: Put your API key here quality_definition: type: movie 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 bcbe13620..2fcde159e 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-1080p-vostfr.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-1080p-vostfr.yml @@ -7,8 +7,8 @@ radarr: radarr_french_vostfr_remux_web_1080p: # L'URL de base ainsi que la clé API de votre instance Radarr - base_url: [radarr_url_goes_here] - api_key: [api_key_goes_here] + base_url: Put your Radarr URL here + api_key: Put your API key here quality_definition: type: movie 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 9cbd87116..b7515d0a7 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-2160p-multi.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-2160p-multi.yml @@ -7,8 +7,8 @@ radarr: radarr_french_multi_remux_web_2160p: # L'URL de base ainsi que la clé API de votre instance Radarr - base_url: [radarr_url_goes_here] - api_key: [api_key_goes_here] + base_url: Put your Radarr URL here + api_key: Put your API key here quality_definition: type: movie 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 807980ab8..2d64c9bd1 100644 --- a/docs/recyclarr-configs/radarr/french-remux-web-2160p-vostfr.yml +++ b/docs/recyclarr-configs/radarr/french-remux-web-2160p-vostfr.yml @@ -7,8 +7,8 @@ radarr: radarr_french_vostfr_remux_web_2160p: # L'URL de base ainsi que la clé API de votre instance Radarr - base_url: [radarr_url_goes_here] - api_key: [api_key_goes_here] + base_url: Put your Radarr URL here + api_key: Put your API key here quality_definition: type: movie 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 6a4c8f402..312483764 100644 --- a/docs/recyclarr-configs/radarr/french-uhd-bluray-web-multi.yml +++ b/docs/recyclarr-configs/radarr/french-uhd-bluray-web-multi.yml @@ -7,8 +7,8 @@ radarr: radarr_french_multi_bluray_web_2160p: # L'URL de base ainsi que la clé API de votre instance Radarr - base_url: [radarr_url_goes_here] - api_key: [api_key_goes_here] + base_url: Put your Radarr URL here + api_key: Put your API key here quality_definition: type: movie 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 8c86ba281..e944ac97e 100644 --- a/docs/recyclarr-configs/radarr/french-uhd-bluray-web-vostfr.yml +++ b/docs/recyclarr-configs/radarr/french-uhd-bluray-web-vostfr.yml @@ -7,8 +7,8 @@ radarr: radarr_french_multi_bluray_web_2160p: # L'URL de base ainsi que la clé API de votre instance Radarr - base_url: [radarr_url_goes_here] - api_key: [api_key_goes_here] + base_url: Put your Radarr URL here + api_key: Put your API key here quality_definition: type: movie diff --git a/docs/recyclarr-configs/sonarr/french-anime-multi-v4.yml b/docs/recyclarr-configs/sonarr/french-anime-multi-v4.yml index 7c9e83659..b7eabe919 100644 --- a/docs/recyclarr-configs/sonarr/french-anime-multi-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-anime-multi-v4.yml @@ -7,8 +7,8 @@ sonarr: sonarr_french_anime_multi: # L'URL de base ainsi que la clé API de votre instance Sonarr - base_url: [sonarr_url_goes_here] - api_key: [api_key_goes_here] + base_url: Put your Sonarr URL here + api_key: Put your API key here quality_definition: type: anime diff --git a/docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml b/docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml index 30aac5125..10b2a128c 100644 --- a/docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml @@ -7,8 +7,8 @@ sonarr: sonarr_french_anime_vostfr: # L'URL de base ainsi que la clé API de votre instance Sonarr - base_url: [sonarr_url_goes_here] - api_key: [api_key_goes_here] + base_url: Put your Sonarr URL here + api_key: Put your API key here quality_definition: type: anime 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 2f789eddc..1cb5aa4eb 100644 --- a/docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml @@ -7,8 +7,8 @@ sonarr: sonarr_french_multi_web_1080p: # L'URL de base ainsi que la clé API de votre instance Sonarr - base_url: [sonarr_url_goes_here] - api_key: [api_key_goes_here] + base_url: Put your Sonarr URL here + api_key: Put your API key here quality_definition: type: series 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 5b13c6716..4b1138770 100644 --- a/docs/recyclarr-configs/sonarr/french-web-1080p-vostfr-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-web-1080p-vostfr-v4.yml @@ -7,8 +7,8 @@ sonarr: sonarr_french_vostfr_web_1080p: # L'URL de base ainsi que la clé API de votre instance Sonarr - base_url: [sonarr_url_goes_here] - api_key: [api_key_goes_here] + base_url: Put your Sonarr URL here + api_key: Put your API key here quality_definition: type: series 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 e3b17c86b..e66a9ee24 100644 --- a/docs/recyclarr-configs/sonarr/french-web-2160p-multi-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-web-2160p-multi-v4.yml @@ -7,8 +7,8 @@ sonarr: sonarr_french_multi_web_2160p: # L'URL de base ainsi que la clé API de votre instance Sonarr - base_url: [sonarr_url_goes_here] - api_key: [api_key_goes_here] + base_url: Put your Sonarr URL here + api_key: Put your API key here quality_definition: type: series 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 2af85615e..664b0ec07 100644 --- a/docs/recyclarr-configs/sonarr/french-web-2160p-vostfr-v4.yml +++ b/docs/recyclarr-configs/sonarr/french-web-2160p-vostfr-v4.yml @@ -7,8 +7,8 @@ sonarr: sonarr_french_vostfr_web_2160p: # L'URL de base ainsi que la clé API de votre instance Sonarr - base_url: [sonarr_url_goes_here] - api_key: [api_key_goes_here] + base_url: Put your Sonarr URL here + api_key: Put your API key here quality_definition: type: series From 2daa90cb5ae0456b8da924f57132541b36a2fda4 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Sat, 22 Apr 2023 17:37:18 +0200 Subject: [PATCH 23/24] [Prowlarr] added VPN warning info --- docs/Prowlarr/prowlarr-setup-proxy.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/Prowlarr/prowlarr-setup-proxy.md b/docs/Prowlarr/prowlarr-setup-proxy.md index 3cebfe72e..0a8f624f5 100644 --- a/docs/Prowlarr/prowlarr-setup-proxy.md +++ b/docs/Prowlarr/prowlarr-setup-proxy.md @@ -2,6 +2,8 @@ It's not recommended to run the Starr apps through a VPN, what can happen is that the Starr apps doesn't update the posters or metadata or you can't add new movies/tv shows, it doesn't need to happen right away. but sooner or later it can and probably will happen. +!!! danger "To be clear it is not a matter if VPNs will cause issues with the Starr Apps, but when: image providers will block you and cloudflare is in front of most of Starr servers (updates, metadata, etc.) and liable to block you too" + Just run VPN on the apps that actually need it, like your torrent client, and perhaps in some cases certain indexers because of region/ISP restriction. !!! warning From dd9d04517e84e169cccad682016562a467ff000c Mon Sep 17 00:00:00 2001 From: Fabricio Silva Date: Tue, 18 Apr 2023 09:59:47 +0100 Subject: [PATCH 24/24] fix(recyclarr/anime): override score for streaming services --- .../sonarr/anime-sonarr-v4.yml | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/docs/recyclarr-configs/sonarr/anime-sonarr-v4.yml b/docs/recyclarr-configs/sonarr/anime-sonarr-v4.yml index a145b6e69..970156732 100644 --- a/docs/recyclarr-configs/sonarr/anime-sonarr-v4.yml +++ b/docs/recyclarr-configs/sonarr/anime-sonarr-v4.yml @@ -36,23 +36,36 @@ sonarr: - 0e5833d3af2cc5fa96a0c29cd4477feb # v3 - 4fc15eeb8f2f9a749f918217d4234ad8 # v4 # Anime Streaming Services - - d660701077794679fd59e8bdf4ce3a29 # AMZN - 3e0b26604165f463f3e8e192261e7284 # CR - - 89358767a60cc28783cdc3d0be9388a4 # DSNP - 1284d18e693de8efe0fe7d6b3e0b9170 # FUNi - - d34870697c9db575f17700212167be23 # NF - 44a8ee6403071dd7b8a3a8dd3fe8cb20 # VRV quality_profiles: - name: Remux-1080p - Anime + # Custom scoring + # Anime Streaming Services + - trash_ids: + - 89358767a60cc28783cdc3d0be9388a4 # DSNP + quality_profiles: + - name: Remux-1080p - Anime + score: 4 # required as this differs from the standard scoring + - trash_ids: + - d34870697c9db575f17700212167be23 # NF + quality_profiles: + - name: Remux-1080p - Anime + score: 2 # required as this differs from the standard scoring + - trash_ids: + - d660701077794679fd59e8bdf4ce3a29 # AMZN + quality_profiles: + - name: Remux-1080p - Anime + score: 1 # required as this differs from the standard scoring - trash_ids: - # Anime Streaming Services - 7dd31f3dee6d2ef8eeaa156e23c3857e # B-Global - 4c67ff059210182b59cdd41697b8cb08 # Bilibili - 570b03b3145a25011bf073274a407259 # HIDIVE quality_profiles: - name: Remux-1080p - Anime - score: 0 + score: 0 # no score in guide # Anime CF/Scoring - trash_ids: - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 @@ -75,6 +88,7 @@ sonarr: quality_profiles: - name: Remux-1080p - Anime score: 350 # required as this differs from the standard scoring + # Adjustable scoring section - trash_ids: - 418f50b10f1907201b6cfdf881f467b7 # Anime Dual Audio