From 6c02566eed7774ca6b34253948f4870c31b9cf0c Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Fri, 27 Jan 2023 11:31:05 +0100 Subject: [PATCH 01/17] Added Seiya to Acknowledgements --- docs/Sonarr/sonarr-setup-quality-profiles-french-en.md | 2 +- docs/Sonarr/sonarr-setup-quality-profiles-french-fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Sonarr/sonarr-setup-quality-profiles-french-en.md b/docs/Sonarr/sonarr-setup-quality-profiles-french-en.md index 5a6d7d70a..b5169c30f 100644 --- a/docs/Sonarr/sonarr-setup-quality-profiles-french-en.md +++ b/docs/Sonarr/sonarr-setup-quality-profiles-french-en.md @@ -196,7 +196,7 @@ A FAQ regarding most of the questions you could have is provided by TRaSH: [FAQ - A big thanks to all the people that helped me to test those profiles and formats (and continue to do so). - A special one to MySuperChef, PrL and KoUiGnAmAnN for their time and explanations. -- A special one to TheFrenchNaruto and Maxence which provided all of the Anime information. +- A special one to SeiyaGame, TheFrenchNaruto and Maxence which provided all of the Anime information. - A special one to Piou and Wikoul who are potentially both now in asylums due to the amount of testing. - [TRaSH](https://trash-guides.info/), for granting me a small space on his guide for this, his knowledge, and his friendliness. diff --git a/docs/Sonarr/sonarr-setup-quality-profiles-french-fr.md b/docs/Sonarr/sonarr-setup-quality-profiles-french-fr.md index dc2222d44..f795f3447 100644 --- a/docs/Sonarr/sonarr-setup-quality-profiles-french-fr.md +++ b/docs/Sonarr/sonarr-setup-quality-profiles-french-fr.md @@ -197,7 +197,7 @@ Une FAQ répondant à la plupart des questions que vous pourriez vous poser est - Un grand merci à toutes les personnes qui m'ont aidé à tester ces Profils et Formats (et qui continuent à le faire). - Une mention spéciale à MySuperChef, PrL et KoUiGnAmAnN pour leur temps et leurs explications. -- Une mention spéciale à TheFrenchNaruto et Maxence qui ont fourni toutes les informations concernant les animes. +- Une mention spéciale à SeiyaGame, TheFrenchNaruto et Maxence qui ont fourni toutes les informations concernant les animes. - Une mention spéciale pour Piou et Wikoul qui sont potentiellement tous les deux maintenant dans des asiles en raison de la quantité de tests effectués. - [TRaSH](https://trash-guides.info/), pour m'avoir accordé un petit espace sur son guide, ses connaissances, et sa gentillesse. From df45c2f44e69f568f1ca75737048211b11a9bef1 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Fri, 27 Jan 2023 11:33:07 +0100 Subject: [PATCH 02/17] Update of French Remux Tiers - Added `Tezcat74` to tier 01 - Moved `Obi` to tier 02, as most of its releases are now one-disc --- .../Radarr-collection-of-custom-formats.md | 13 +++++++++---- docs/json/radarr/cf/french-remux-tier-01.json | 16 ++++++++-------- docs/json/radarr/cf/french-remux-tier-02.json | 9 +++++++++ 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/docs/Radarr/Radarr-collection-of-custom-formats.md b/docs/Radarr/Radarr-collection-of-custom-formats.md index 43eae0719..ce3114f09 100644 --- a/docs/Radarr/Radarr-collection-of-custom-formats.md +++ b/docs/Radarr/Radarr-collection-of-custom-formats.md @@ -2253,7 +2253,9 @@ I also made 3 guides related to this one. ??? question "Remux Tier 01 - [CLICK TO EXPAND]" + - WiP - Groups doing remuxes with multiple sources (discs) mixing what's best. + - Groups doing remuxes with a groups from Remux Tier 01 or 02 and adding the best French Audio available. ??? example "JSON - [CLICK TO EXPAND]" @@ -2269,6 +2271,7 @@ I also made 3 guides related to this one. ??? question "Remux Tier 02 - [CLICK TO EXPAND]" + - WiP - Groups that use an automated way. - Groups active doing remuxes from a single sources (discs). - Groups that haven't released much or are not well recognized. (yet) @@ -2288,7 +2291,7 @@ I also made 3 guides related to this one. ??? question "FR UHD Bluray Tier 01 - [CLICK TO EXPAND]" - (WiP - This Custom Formats should be considered in alpha stage) + - WiP - Groups that created encodes from the remuxes without micro-sizing them. - HDR/DoVi (Depending what's offered and often both). - HD Audio (Atmos, TrueHD etc...). @@ -2307,7 +2310,7 @@ I also made 3 guides related to this one. ??? question "FR UHD Bluray Tier 02 - [CLICK TO EXPAND]" - (WiP - This Custom Formats should be considered in alpha stage) + - WiP - Groups that created encodes from the remuxes without micro-sizing them. - HDR/DoVi (Depending what's offered and often both). - HD Audio (Atmos, TrueHD etc...). @@ -2328,6 +2331,7 @@ I also made 3 guides related to this one. ??? question "FR HD Bluray Tier 01 - [CLICK TO EXPAND]" + - WiP - Groups that created encodes from the remuxes without micro-sizing them. - Groups that have a minimum of great releases (best encode in it's class 1080p and lower). @@ -2345,6 +2349,7 @@ I also made 3 guides related to this one. ??? question "FR HD Bluray Tier 02 - [CLICK TO EXPAND]" + - WiP - Groups that created encodes from the remuxes without micro-sizing them. - Groups that haven't released much or are not well recognized. (yet) - Groups that retired and don't have the best quality by todays standards. @@ -2363,7 +2368,7 @@ I also made 3 guides related to this one. ??? question "FR WEB Tier 01 - [CLICK TO EXPAND]" - - placeholder + - WiP - Groups that source directly from the streaming service ??? example "JSON - [CLICK TO EXPAND]" @@ -2380,7 +2385,7 @@ I also made 3 guides related to this one. ??? question "FR WEB Tier 02 - [CLICK TO EXPAND]" - - placeholder + - WiP - Groups that haven't released much or are not well recognized. (yet) - Groups that retired and don't have the best quality by todays standards. diff --git a/docs/json/radarr/cf/french-remux-tier-01.json b/docs/json/radarr/cf/french-remux-tier-01.json index 04e483f99..86086c45f 100644 --- a/docs/json/radarr/cf/french-remux-tier-01.json +++ b/docs/json/radarr/cf/french-remux-tier-01.json @@ -59,39 +59,39 @@ } }, { - "name": "Obi", + "name": "ONLY", "implementation": "ReleaseGroupSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(Obi)\\b" + "value": "\\b(ONLY)\\b" } }, { - "name": "ONLY", + "name": "PEPiTE", "implementation": "ReleaseGroupSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(ONLY)\\b" + "value": "\\b(PEPiTE)\\b" } }, { - "name": "PEPiTE", + "name": "Psaro", "implementation": "ReleaseGroupSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(PEPiTE)\\b" + "value": "\\b(Psaro)\\b" } }, { - "name": "Psaro", + "name": "Tezcat74", "implementation": "ReleaseGroupSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(Psaro)\\b" + "value": "\\b(Tezcat74)\\b" } } ] diff --git a/docs/json/radarr/cf/french-remux-tier-02.json b/docs/json/radarr/cf/french-remux-tier-02.json index 269d652f7..f33fbac94 100644 --- a/docs/json/radarr/cf/french-remux-tier-02.json +++ b/docs/json/radarr/cf/french-remux-tier-02.json @@ -49,6 +49,15 @@ "value": "\\b(MUSTANG)\\b" } }, + { + "name": "Obi", + "implementation": "ReleaseGroupSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(Obi)\\b" + } + }, { "name": "PATOMiEL", "implementation": "ReleaseGroupSpecification", From f8cf4320bcbc6f1aa6e870bbdf39b6c38ac39a70 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Fri, 27 Jan 2023 16:00:18 +0100 Subject: [PATCH 03/17] Recyclarr French Sonarr Configs --- .../french_anime_multi_v4.yml | 126 +++++++++++++++++ .../french_anime_vostfr_v4.yml | 124 +++++++++++++++++ .../french_web_1080p_multi_v4.yml | 130 ++++++++++++++++++ .../french_web_1080p_vostfr_v4.yml | 97 +++++++++++++ 4 files changed, 477 insertions(+) create mode 100644 docs/Sonarr/recyclarr-config/french_anime_multi_v4.yml create mode 100644 docs/Sonarr/recyclarr-config/french_anime_vostfr_v4.yml create mode 100644 docs/Sonarr/recyclarr-config/french_web_1080p_multi_v4.yml create mode 100644 docs/Sonarr/recyclarr-config/french_web_1080p_vostfr_v4.yml diff --git a/docs/Sonarr/recyclarr-config/french_anime_multi_v4.yml b/docs/Sonarr/recyclarr-config/french_anime_multi_v4.yml new file mode 100644 index 000000000..d2166de91 --- /dev/null +++ b/docs/Sonarr/recyclarr-config/french_anime_multi_v4.yml @@ -0,0 +1,126 @@ +# 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 "Anime MULTi" present dans le guide +# https://trash-guides.info/Sonarr/sonarr-setup-quality-profiles-french-fr/#exemple-pour-les-animes + +sonarr: + french_sonarr_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] + quality_definition: + type: anime + + # 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 au score de la release si elle possède effectivement un audio français. + # - 4721382d9ee05f1b4967a25e75072911 # French Audio + # ===== Versions françaises ===== + # Ceci permets malgré tout de renommer vos releases avec VOSTFR si c'est le cas. + - 07a32f77690263bb9fda1842db7e273f # VOSTFR + - 84f0acbda9c0c9de783894fb66df25aa # FanSUB + # ===== Indésirables ===== + - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK + - 3ba797e5dc13af4b8d9bb25e83d90de2 # FR LQ + - b4a1b3d705159cdca36d71e57ca86871 # Anime Raws + - e3515e519f3b1360cbfc17651944354c # Anime LQ Groups + - 9c14d194486c4014d422adc64092d794 # Dubs Only + - ea0bb4b6ba388992fad1092703b5ff7b # FastSUB + # ===== Versions ===== + - d2d7b8a9d39413da5f44054080e028a3 # v0 + - 273bd326df95955e1b6c26527d1df89b # v1 + - 228b8ee9aa0a609463efca874524a6b8 # v2 + - 0e5833d3af2cc5fa96a0c29cd4477feb # v3 + - 4fc15eeb8f2f9a749f918217d4234ad8 # v4 + # ===== Streaming Service ===== + - 44a8ee6403071dd7b8a3a8dd3fe8cb20 # VRV + # ===== Autres ===== + - b2550eb333d27b75833e25b8c2557b38 # 10bit + - cddfb4e32db826151d97352b8e37c648 # x264 + - c9eafd50846d299b862ca9bb6ea91950 # x265 + # ===== HQ Source Groups ===== + - db13a377f7afb29975ea39470434d2ef # FR Anime Tier 01 + - 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 + # 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 + # d'un MULTi/VOSTFR car celle-ci possède un score plus important. + # + # Vous pouvez aussi les activer dans le cas où vous avez activé Bazarr. + # - 949c16fe0a8147f50ba82cc2df9411c9 # Anime BD Tier 01 (Top SeaDex Muxers) + # - ed7f1e315e000aef424a58517fa48727 # Anime BD Tier 02 (SeaDex Muxers) + # - 096e406c92baa713da4a72d88030b815 # Anime BD Tier 03 (SeaDex Muxers) + # - 30feba9da3030c5ed1e0f7d610bcadc4 # Anime BD Tier 04 (SeaDex Muxers) + # - 545a76b14ddc349b8b185a6344e28b04 # Anime BD Tier 05 (Remuxes) + # - 25d2afecab632b1582eaf03b63055f72 # Anime BD Tier 06 (FanSubs) + # - 0329044e3d9137b08502a9f84a7e58db # Anime BD Tier 07 (P2P/Scene) + # - c81bbfb47fed3d5a3ad027d077f889de # Anime BD Tier 08 (Mini Encodes) + # - e0014372773c8f0e1bef8824f00c7dc4 # Anime Web Tier 01 (Muxers) + # - 19180499de5ef2b84b6ec59aae444696 # Anime Web Tier 02 (Top FanSubs) + # - c27f2ae6a4e82373b0f1da094e2489ad # Anime Web Tier 03 (Official Subs) + # - 4fd5528a3a8024e6b49f9c67053ea5f3 # Anime Web Tier 04 (Official Subs) + # - 29c2a13d091144f63307e4a8ce963a39 # Anime Web Tier 05 (FanSubs) + # - dc262f88d74c651b12e9d90b39f6c753 # Anime Web Tier 06 (FanSubs) + quality_profiles: + - name: FR-ANIME-MULTi + reset_unmatched_scores: true + + - trash_ids: + - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 + quality_profiles: + - name: FR-ANIME-MULTi + score: -10000 + + # ==== Scores Optionnels ==== + # Décommenter le score associé si c'est ce que vous souhaitez + + # Si vous préférez les releases non censurées + - trash_ids: + - 026d5aadd1a6b4e550b134cb6c72b3ca # Uncensored + quality_profiles: + - name: FR-ANIME-MULTi + # score: 101 + + # Si vous préférez avoir des versions Dual Audio (audio original et anglais) au cas où Sonarr ne trouve pas de sortie VOSTFR ou MULTi. + - trash_ids: + - 418f50b10f1907201b6cfdf881f467b7 # Anime Dual Audio + quality_profiles: + - name: FR-ANIME-MULTi + # score: 101 + + # Si vous ne voulez pas non-plus de FanSUB. + # Pensez à le supprimer de la ligne 21 et le Format Personnalisé suivant aussi dans ce cas. + - trash_ids: + - 84f0acbda9c0c9de783894fb66df25aa # FanSUB + quality_profiles: + - name: FR-ANIME-MULTi + # score: -10000 + + # Les groupes FanSUB peuvent être notés soit 1400 (par défaut) soit 1000 + # selon que vous souhaitez privilégier les sorties FanSUB ou SeaDex. + # Ils peuvent aussi être supprimés si vous ne souhaitez pas de FanSUB. + - trash_ids: + - 44b6c964dad997577d793fd004a39224 # FR Anime FanSub + quality_profiles: + - name: FR-ANIME-MULTi + # score: 1000 + + # Les Formats Personnalisés suivants sont optionnels et peuvent être inclus ou non. + # Cela est dû au fait que certains d'entre eux ont tendance à publier des anime doublés. + - trash_ids: + - ddb8eaa9c85a549c50034d280539d54d # FR WEB Tier 01 + - a4c51febd4d8b2a0db10a3c974f21d92 # FR WEB Tier 02 + - dbfc0a4b5cb4cbd693311c4482ae9683 # FR WEB Tier 03 + quality_profiles: + - name: FR-ANIME-MULTi + score: 1100 diff --git a/docs/Sonarr/recyclarr-config/french_anime_vostfr_v4.yml b/docs/Sonarr/recyclarr-config/french_anime_vostfr_v4.yml new file mode 100644 index 000000000..4eecdc616 --- /dev/null +++ b/docs/Sonarr/recyclarr-config/french_anime_vostfr_v4.yml @@ -0,0 +1,124 @@ +# 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 "Anime VOSTFR" present dans le guide +# https://trash-guides.info/Sonarr/sonarr-setup-quality-profiles-french-fr/#exemple-pour-les-animes + +sonarr: + french_sonarr_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] + quality_definition: + type: anime + + # La liste de Formats Personnalisés à synchroniser avec Sonarr. + custom_formats: + - trash_ids: + # ===== Versions françaises ===== + - 84f0acbda9c0c9de783894fb66df25aa # FanSUB + # ===== Indésirables ===== + - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK + - 3ba797e5dc13af4b8d9bb25e83d90de2 # FR LQ + - b4a1b3d705159cdca36d71e57ca86871 # Anime Raws + - e3515e519f3b1360cbfc17651944354c # Anime LQ Groups + - 9c14d194486c4014d422adc64092d794 # Dubs Only + - ea0bb4b6ba388992fad1092703b5ff7b # FastSUB + # ===== Versions ===== + - d2d7b8a9d39413da5f44054080e028a3 # v0 + - 273bd326df95955e1b6c26527d1df89b # v1 + - 228b8ee9aa0a609463efca874524a6b8 # v2 + - 0e5833d3af2cc5fa96a0c29cd4477feb # v3 + - 4fc15eeb8f2f9a749f918217d4234ad8 # v4 + # ===== Streaming Service ===== + - 44a8ee6403071dd7b8a3a8dd3fe8cb20 # VRV + # ===== Autres ===== + - b2550eb333d27b75833e25b8c2557b38 # 10bit + - cddfb4e32db826151d97352b8e37c648 # x264 + - c9eafd50846d299b862ca9bb6ea91950 # x265 + # ===== HQ Source Groups ===== + - db13a377f7afb29975ea39470434d2ef # FR Anime Tier 01 + - 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 + # 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 + # d'un VOSTFR car celle-ci possède un score plus important. + # + # Vous pouvez aussi les activer dans le cas où vous avez activé Bazarr. + # - 949c16fe0a8147f50ba82cc2df9411c9 # Anime BD Tier 01 (Top SeaDex Muxers) + # - ed7f1e315e000aef424a58517fa48727 # Anime BD Tier 02 (SeaDex Muxers) + # - 096e406c92baa713da4a72d88030b815 # Anime BD Tier 03 (SeaDex Muxers) + # - 30feba9da3030c5ed1e0f7d610bcadc4 # Anime BD Tier 04 (SeaDex Muxers) + # - 545a76b14ddc349b8b185a6344e28b04 # Anime BD Tier 05 (Remuxes) + # - 25d2afecab632b1582eaf03b63055f72 # Anime BD Tier 06 (FanSubs) + # - 0329044e3d9137b08502a9f84a7e58db # Anime BD Tier 07 (P2P/Scene) + # - c81bbfb47fed3d5a3ad027d077f889de # Anime BD Tier 08 (Mini Encodes) + # - e0014372773c8f0e1bef8824f00c7dc4 # Anime Web Tier 01 (Muxers) + # - 19180499de5ef2b84b6ec59aae444696 # Anime Web Tier 02 (Top FanSubs) + # - c27f2ae6a4e82373b0f1da094e2489ad # Anime Web Tier 03 (Official Subs) + # - 4fd5528a3a8024e6b49f9c67053ea5f3 # Anime Web Tier 04 (Official Subs) + # - 29c2a13d091144f63307e4a8ce963a39 # Anime Web Tier 05 (FanSubs) + # - dc262f88d74c651b12e9d90b39f6c753 # Anime Web Tier 06 (FanSubs) + quality_profiles: + - name: FR-ANIME-VOSTFR + reset_unmatched_scores: true + + - trash_ids: + - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 + quality_profiles: + - name: FR-ANIME-VOSTFR + score: -10000 + + # ===== MULTi Audio ===== + # Nécessaire vu qu'on ne souhaite pas de MULTis + - trash_ids: + - 2f6e84efc47246ec9071e311e71c4953 # Multi-Audio + quality_profiles: + - name: FR-ANIME-VOSTFR + score: -10000 + + # ===== Versions françaises ===== + - trash_ids: + - 07a32f77690263bb9fda1842db7e273f # VOSTFR + quality_profiles: + - name: FR-ANIME-VOSTFR + score: 101 + + # ==== Scores Optionnels ==== + # Décommenter le score associé si c'est ce que vous souhaitez + + # Si vous préférez les releases non censurées + - trash_ids: + - 026d5aadd1a6b4e550b134cb6c72b3ca # Uncensored + quality_profiles: + - name: FR-ANIME-VOSTFR + # score: 101 + + # Si vous préférez avoir des versions Dual Audio (audio original et anglais) au cas où Sonarr ne trouve pas de sortie VOSTFR ou MULTi. + - trash_ids: + - 418f50b10f1907201b6cfdf881f467b7 # Anime Dual Audio + quality_profiles: + - name: FR-ANIME-VOSTFR + # score: 101 + + # Si vous ne voulez pas non-plus de FanSUB. + # Pensez à le supprimer de la ligne 21 et le Format Personnalisé suivant aussi dans ce cas. + - trash_ids: + - 84f0acbda9c0c9de783894fb66df25aa # FanSUB + quality_profiles: + - name: FR-ANIME-VOSTFR + # score: -10000 + + # Les groupes FanSUB peuvent être notés soit 1400 (par défaut) soit 1000 + # selon que vous souhaitez privilégier les sorties FanSUB ou SeaDex. + # Ils peuvent aussi être supprimés si vous ne souhaitez pas de FanSUB. + - trash_ids: + - 44b6c964dad997577d793fd004a39224 # FR Anime FanSub + quality_profiles: + - name: FR-ANIME-VOSTFR + # score: 1000 diff --git a/docs/Sonarr/recyclarr-config/french_web_1080p_multi_v4.yml b/docs/Sonarr/recyclarr-config/french_web_1080p_multi_v4.yml new file mode 100644 index 000000000..980a57141 --- /dev/null +++ b/docs/Sonarr/recyclarr-config/french_web_1080p_multi_v4.yml @@ -0,0 +1,130 @@ +# 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 1080p MULTi" present dans le guide +# https://trash-guides.info/Sonarr/sonarr-setup-quality-profiles-french-fr/#webdl-1080p + +sonarr: + french_sonarr_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] + quality_definition: + type: series + + # 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 + # ===== Indésirables ===== + - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK + - 3ba797e5dc13af4b8d9bb25e83d90de2 # FR LQ + - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ + - 47435ece6b99a0b477caf360e79ba0bb # x265 (HD) + - 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 + - 5d2317d99af813b6529c7ebf01c83533 # VDL + # 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-1080p + reset_unmatched_scores: true + + - trash_ids: + - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 + quality_profiles: + - name: FR-MULTi-WEB-1080p + 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 ou non obtenir un certain + # type d'audio français. Par exemple si vous ne souhaitez pas de la VQ. + # 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 + - trash_ids: + - 7ae924ee9b2f39df3283c6c0beb8a2aa # VOF + quality_profiles: + - name: FR-MULTi-WEB-1080p + # score: -10000 + - trash_ids: + - b6816a0e1d4b64bf3550ad3b74b009b6 # VFI + quality_profiles: + - name: FR-MULTi-WEB-1080p + # score: -10000 + - trash_ids: + - 7a7f4e4f58bd1058440236d033a90b67 # VFQ + quality_profiles: + - name: FR-MULTi-WEB-1080p + # score: -10000 + - trash_ids: + - 82085412d9a53ba8d8e46fc624eb701d # VQ + quality_profiles: + - name: FR-MULTi-WEB-1080p + # score: -10000 + - trash_ids: + - 0ce1e39a4676c6692ce47935278dac76 # VFB + quality_profiles: + - name: FR-MULTi-WEB-1080p + # score: -10000 + - 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 + + # Si vous ne voulez pas non-plus de FanSUB. + - trash_ids: + - 84f0acbda9c0c9de783894fb66df25aa # FanSUB + quality_profiles: + - name: FR-MULTi-WEB-1080p + # score: -10000 diff --git a/docs/Sonarr/recyclarr-config/french_web_1080p_vostfr_v4.yml b/docs/Sonarr/recyclarr-config/french_web_1080p_vostfr_v4.yml new file mode 100644 index 000000000..cceba154b --- /dev/null +++ b/docs/Sonarr/recyclarr-config/french_web_1080p_vostfr_v4.yml @@ -0,0 +1,97 @@ +# 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 1080p VOSTFR" present dans le guide +# https://trash-guides.info/Sonarr/sonarr-setup-quality-profiles-french-fr/#webdl-1080p + +sonarr: + french_sonarr_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] + quality_definition: + type: series + + # La liste de Formats Personnalisés à synchroniser avec Sonarr. + custom_formats: + - trash_ids: + # ===== Indésirables ===== + - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK + - 3ba797e5dc13af4b8d9bb25e83d90de2 # FR LQ + - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ + - 47435ece6b99a0b477caf360e79ba0bb # x265 (HD) + - 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 + - 5d2317d99af813b6529c7ebf01c83533 # VDL + # 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-1080p + reset_unmatched_scores: true + + - trash_ids: + - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 + quality_profiles: + - name: FR-VOSTFR-WEB-1080p + 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-1080p + 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-1080p + 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-1080p + # score: -10000 From c0586369143fe88678696cc3159aea6d8cb27950 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Mon, 30 Jan 2023 12:01:10 +0100 Subject: [PATCH 04/17] Added French Anime Streaming Service --- .../sonarr-collection-of-custom-formats.md | 40 ++++++++++++++++- docs/json/sonarr/cf/french-adn.json | 44 +++++++++++++++++++ docs/json/sonarr/cf/french-wkn.json | 43 ++++++++++++++++++ ...narr-french-streaming-services-anime-en.md | 10 +++++ ...narr-french-streaming-services-anime-fr.md | 10 +++++ 5 files changed, 145 insertions(+), 2 deletions(-) create mode 100644 docs/json/sonarr/cf/french-adn.json create mode 100644 docs/json/sonarr/cf/french-wkn.json create mode 100644 includes/french-guide/sonarr-french-streaming-services-anime-en.md create mode 100644 includes/french-guide/sonarr-french-streaming-services-anime-fr.md diff --git a/docs/Sonarr/sonarr-collection-of-custom-formats.md b/docs/Sonarr/sonarr-collection-of-custom-formats.md index 6237d706e..c0bbd793e 100644 --- a/docs/Sonarr/sonarr-collection-of-custom-formats.md +++ b/docs/Sonarr/sonarr-collection-of-custom-formats.md @@ -82,8 +82,8 @@ I also made 3 guides related to this one. | | [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) | | +| | [SDR](#sdr) | [FanSUB](#fansub) | [ADN](#adn) | +| | [DV (FEL)](#dv-fel) | [FastSUB](#fastsub) | [WKN](#wkn) | ------ @@ -2497,3 +2497,39 @@ I also made 3 guides related to this one. ``` [TOP](#index) + +------ + +### ADN + +ADN = Animation Digital Network + +??? question "ADN - [CLICK TO EXPAND]" + + [From Wikipedia, the free encyclopedia](https://fr.wikipedia.org/wiki/Animation_Digital_Network){:target="_blank" rel="noopener noreferrer"} + +??? example "JSON - [CLICK TO EXPAND]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/french-adn.json' %]][[% endfilter %]] + ``` + +[TOP](#index) + +------ + +### WKN + +WKN = Wakanim + +??? question "WKN - [CLICK TO EXPAND]" + + [From Wikipedia, the free encyclopedia](https://fr.wikipedia.org/wiki/Wakanim){:target="_blank" rel="noopener noreferrer"} + +??? example "JSON - [CLICK TO EXPAND]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/french-wkn.json' %]][[% endfilter %]] + ``` + +[TOP](#index) diff --git a/docs/json/sonarr/cf/french-adn.json b/docs/json/sonarr/cf/french-adn.json new file mode 100644 index 000000000..50d4e3c42 --- /dev/null +++ b/docs/json/sonarr/cf/french-adn.json @@ -0,0 +1,44 @@ +{ + "trash_id": "d54cd2bf1326287275b56bccedb72ee2", + "trash_score": 3, + "name": "ADN", + "includeCustomFormatWhenRenaming": true, + "specifications": [ + { + "name": "WEBDL", + "implementation": "SourceSpecification", + "negate": false, + "required": false, + "fields": { + "value": 3 + } + }, + { + "name": "WEBRIP", + "implementation": "SourceSpecification", + "negate": false, + "required": false, + "fields": { + "value": 4 + } + }, + { + "name": "WEB", + "implementation": "SourceSpecification", + "negate": false, + "required": false, + "fields": { + "value": 1 + } + }, + { + "name": "ADN", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": true, + "fields": { + "value": "\\b(ADN)\\b" + } + } + ] +} diff --git a/docs/json/sonarr/cf/french-wkn.json b/docs/json/sonarr/cf/french-wkn.json new file mode 100644 index 000000000..106b6d8d1 --- /dev/null +++ b/docs/json/sonarr/cf/french-wkn.json @@ -0,0 +1,43 @@ +{ + "trash_id": "e5e6405d439dcd1af90962538acd4fe0", + "name": "WKN", + "includeCustomFormatWhenRenaming": true, + "specifications": [ + { + "name": "WEBDL", + "implementation": "SourceSpecification", + "negate": false, + "required": false, + "fields": { + "value": 3 + } + }, + { + "name": "WEBRIP", + "implementation": "SourceSpecification", + "negate": false, + "required": false, + "fields": { + "value": 4 + } + }, + { + "name": "WEB", + "implementation": "SourceSpecification", + "negate": false, + "required": false, + "fields": { + "value": 1 + } + }, + { + "name": "WKN", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": true, + "fields": { + "value": "\\b(WKN|Waka(nim)?)\\b" + } + } + ] +} diff --git a/includes/french-guide/sonarr-french-streaming-services-anime-en.md b/includes/french-guide/sonarr-french-streaming-services-anime-en.md new file mode 100644 index 000000000..9507d8145 --- /dev/null +++ b/includes/french-guide/sonarr-french-streaming-services-anime-en.md @@ -0,0 +1,10 @@ +??? abstract "French Anime Streaming Services - [CLICK TO EXPAND]" + | Custom Format | Score | Trash ID | + | -------------------------------------------------------------------------------------------- | ----------------------------------------------- | -------------------------------------------- | + | [{{ sonarr['cf']['french-adn']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#adn) | {{ sonarr['cf']['french-adn']['trash_score'] }} | {{ sonarr['cf']['french-adn']['trash_id'] }} | + | [{{ sonarr['cf']['french-wkn']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#wkn) | 0 | {{ sonarr['cf']['french-wkn']['trash_id'] }} | + + ??? info "Info - [CLICK TO EXPAND]" + + - **ADN**: Animation Digital Network, abbreviated ADN, formerly Anime Digital Network, is a VoD and simulcast platform born from the merger between KZPlay, belonging to Kazé, and Genzai, belonging to Kana Home Video, with the theme of broadcasting series and features Japanese and Franco-Belgian animated films. + - **WKN** (*or Wakanim*): Wakanim was a French subscription video on-demand streaming service owned by U.S.-based Funimation. The service was specialized in the online streaming and simulcasting of Japanese anime series. It was also the first company to offer videos for download without digital rights management on anime series in Europe. The service was consolidated into Crunchyroll in March 2022. diff --git a/includes/french-guide/sonarr-french-streaming-services-anime-fr.md b/includes/french-guide/sonarr-french-streaming-services-anime-fr.md new file mode 100644 index 000000000..a23056d45 --- /dev/null +++ b/includes/french-guide/sonarr-french-streaming-services-anime-fr.md @@ -0,0 +1,10 @@ +??? abstract "Services de streaming français d'Animés - [CLIQUEZ POUR AFFICHER]" + | Formats Personnalisés | Score | Trash ID | + | -------------------------------------------------------------------------------------------- | ----------------------------------------------- | -------------------------------------------- | + | [{{ sonarr['cf']['french-adn']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#adn) | {{ sonarr['cf']['french-adn']['trash_score'] }} | {{ sonarr['cf']['french-adn']['trash_id'] }} | + | [{{ sonarr['cf']['french-wkn']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#wkn) | 0 | {{ sonarr['cf']['french-wkn']['trash_id'] }} | + + ??? info "Info - [CLICK TO EXPAND]" + + - **ADN**: Animation Digital Network, abrégé ADN, anciennement Anime Digital Network, est une plate-forme de VoD et simulcast née de la fusion entre KZPlay, appartenant à Kazé, et Genzai, appartenant à Kana Home Video, ayant pour thématique la diffusion de séries et longs métrages d'animation japonaise et franco-belge. + - **WKN** (*ou Wakanim*): Wakanim est une plateforme de VOD ayant pour thématique la diffusion de séries d'animation japonaise. C'est également la première société à proposer des vidéos en téléchargement sans gestion des droits numériques sur des séries d'animation en Europe. En mars 2022, le catalogue de la plateforme est fusionné sur Crunchyroll. From 76be14f0ba29e809315eca145bf8d21b3af067da Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Mon, 30 Jan 2023 12:01:47 +0100 Subject: [PATCH 05/17] Update sonarr-collection-of-custom-formats.md Fix double ")" --- docs/Sonarr/sonarr-collection-of-custom-formats.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Sonarr/sonarr-collection-of-custom-formats.md b/docs/Sonarr/sonarr-collection-of-custom-formats.md index c0bbd793e..7583c9fe2 100644 --- a/docs/Sonarr/sonarr-collection-of-custom-formats.md +++ b/docs/Sonarr/sonarr-collection-of-custom-formats.md @@ -1996,7 +1996,7 @@ I also made 3 guides related to this one. ### Bilibili ??? question "Bilibili - [CLICK TO EXPAND]" - [From Wikipedia, the free encyclopedia](https://www.wikiwand.com/en/Bilibili)){:target="_blank" rel="noopener noreferrer"} + [From Wikipedia, the free encyclopedia](https://www.wikiwand.com/en/Bilibili){:target="_blank" rel="noopener noreferrer"} ??? example "JSON - [CLICK TO EXPAND]" From ebeb9362a46b1b4dd6e66469686f357e1fadff7e Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Mon, 30 Jan 2023 12:02:40 +0100 Subject: [PATCH 06/17] Added Anime Streaming services to French Anime guide --- docs/Sonarr/sonarr-setup-quality-profiles-french-en.md | 4 +++- docs/Sonarr/sonarr-setup-quality-profiles-french-fr.md | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/Sonarr/sonarr-setup-quality-profiles-french-en.md b/docs/Sonarr/sonarr-setup-quality-profiles-french-en.md index b5169c30f..b59ef0d2d 100644 --- a/docs/Sonarr/sonarr-setup-quality-profiles-french-en.md +++ b/docs/Sonarr/sonarr-setup-quality-profiles-french-en.md @@ -170,7 +170,9 @@ If you are looking to grab Anime with either French sub or MULTi audio (original {! include-markdown "../../includes/french-guide/sonarr-french-unwanted-uhd-en.md" !} -{! include-markdown "../../includes/cf/sonarr-misc.md" !} +{! include-markdown "../../includes/cf/sonarr-streaming-services-anime.md" !} + +{! include-markdown "../../includes/french-guide/sonarr-french-streaming-services-anime-en.md" !} {! include-markdown "../../includes/french-guide/sonarr-cf-french-anime-scoring-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 f795f3447..2b9dac9cc 100644 --- a/docs/Sonarr/sonarr-setup-quality-profiles-french-fr.md +++ b/docs/Sonarr/sonarr-setup-quality-profiles-french-fr.md @@ -171,7 +171,9 @@ Si vous cherchez des animes avec des sous-titres français ou en MULTi (audio or {! include-markdown "../../includes/french-guide/sonarr-french-unwanted-uhd-fr.md" !} -{! include-markdown "../../includes/cf/sonarr-misc.md" !} +{! include-markdown "../../includes/cf/sonarr-streaming-services-anime.md" !} + +{! include-markdown "../../includes/french-guide/sonarr-french-streaming-services-anime-fr.md" !} {! include-markdown "../../includes/french-guide/sonarr-cf-french-anime-scoring-fr.md" !} From eafc913055e3d885e1f2fe6055447e6b8f45a7fc Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Mon, 30 Jan 2023 12:02:59 +0100 Subject: [PATCH 07/17] Updated French Recyclarr configs --- .../recyclarr-config/french_anime_multi_v4.yml | 12 +++++++++++- .../recyclarr-config/french_anime_vostfr_v4.yml | 12 +++++++++++- .../recyclarr-config/french_web_1080p_multi_v4.yml | 1 + .../recyclarr-config/french_web_1080p_vostfr_v4.yml | 1 + 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/docs/Sonarr/recyclarr-config/french_anime_multi_v4.yml b/docs/Sonarr/recyclarr-config/french_anime_multi_v4.yml index d2166de91..5df4b28ae 100644 --- a/docs/Sonarr/recyclarr-config/french_anime_multi_v4.yml +++ b/docs/Sonarr/recyclarr-config/french_anime_multi_v4.yml @@ -40,7 +40,17 @@ sonarr: - 0e5833d3af2cc5fa96a0c29cd4477feb # v3 - 4fc15eeb8f2f9a749f918217d4234ad8 # v4 # ===== Streaming Service ===== + - d54cd2bf1326287275b56bccedb72ee2 # ADN + - d660701077794679fd59e8bdf4ce3a29 # AMZN + - 7dd31f3dee6d2ef8eeaa156e23c3857e # B-Global + - 4c67ff059210182b59cdd41697b8cb08 # Bilibili + - 3e0b26604165f463f3e8e192261e7284 # CR + - 89358767a60cc28783cdc3d0be9388a4 # DSNP + - 1284d18e693de8efe0fe7d6b3e0b9170 # FUNi + - 570b03b3145a25011bf073274a407259 # HIDIVE + - d34870697c9db575f17700212167be23 # NF - 44a8ee6403071dd7b8a3a8dd3fe8cb20 # VRV + - e5e6405d439dcd1af90962538acd4fe0 # WKN # ===== Autres ===== - b2550eb333d27b75833e25b8c2557b38 # 10bit - cddfb4e32db826151d97352b8e37c648 # x264 @@ -56,7 +66,7 @@ sonarr: # Il est tout de fois possible que dans ce cas Sonarr récupére une release SeaDex au lieu # d'un MULTi/VOSTFR car celle-ci possède un score plus important. # - # Vous pouvez aussi les activer dans le cas où vous avez activé Bazarr. + # Vous pouvez aussi les activer dans le cas où vous avez configuré Bazarr. # - 949c16fe0a8147f50ba82cc2df9411c9 # Anime BD Tier 01 (Top SeaDex Muxers) # - ed7f1e315e000aef424a58517fa48727 # Anime BD Tier 02 (SeaDex Muxers) # - 096e406c92baa713da4a72d88030b815 # Anime BD Tier 03 (SeaDex Muxers) diff --git a/docs/Sonarr/recyclarr-config/french_anime_vostfr_v4.yml b/docs/Sonarr/recyclarr-config/french_anime_vostfr_v4.yml index 4eecdc616..90af17a20 100644 --- a/docs/Sonarr/recyclarr-config/french_anime_vostfr_v4.yml +++ b/docs/Sonarr/recyclarr-config/french_anime_vostfr_v4.yml @@ -33,7 +33,17 @@ sonarr: - 0e5833d3af2cc5fa96a0c29cd4477feb # v3 - 4fc15eeb8f2f9a749f918217d4234ad8 # v4 # ===== Streaming Service ===== + - d54cd2bf1326287275b56bccedb72ee2 # ADN + - d660701077794679fd59e8bdf4ce3a29 # AMZN + - 7dd31f3dee6d2ef8eeaa156e23c3857e # B-Global + - 4c67ff059210182b59cdd41697b8cb08 # Bilibili + - 3e0b26604165f463f3e8e192261e7284 # CR + - 89358767a60cc28783cdc3d0be9388a4 # DSNP + - 1284d18e693de8efe0fe7d6b3e0b9170 # FUNi + - 570b03b3145a25011bf073274a407259 # HIDIVE + - d34870697c9db575f17700212167be23 # NF - 44a8ee6403071dd7b8a3a8dd3fe8cb20 # VRV + - e5e6405d439dcd1af90962538acd4fe0 # WKN # ===== Autres ===== - b2550eb333d27b75833e25b8c2557b38 # 10bit - cddfb4e32db826151d97352b8e37c648 # x264 @@ -49,7 +59,7 @@ sonarr: # Il est tout de fois possible que dans ce cas Sonarr récupére une release SeaDex au lieu # d'un VOSTFR car celle-ci possède un score plus important. # - # Vous pouvez aussi les activer dans le cas où vous avez activé Bazarr. + # Vous pouvez aussi les activer dans le cas où vous avez configuré Bazarr. # - 949c16fe0a8147f50ba82cc2df9411c9 # Anime BD Tier 01 (Top SeaDex Muxers) # - ed7f1e315e000aef424a58517fa48727 # Anime BD Tier 02 (SeaDex Muxers) # - 096e406c92baa713da4a72d88030b815 # Anime BD Tier 03 (SeaDex Muxers) diff --git a/docs/Sonarr/recyclarr-config/french_web_1080p_multi_v4.yml b/docs/Sonarr/recyclarr-config/french_web_1080p_multi_v4.yml index 980a57141..141be5182 100644 --- a/docs/Sonarr/recyclarr-config/french_web_1080p_multi_v4.yml +++ b/docs/Sonarr/recyclarr-config/french_web_1080p_multi_v4.yml @@ -48,6 +48,7 @@ sonarr: - 3ac5d84fce98bab1b531393e9c82f467 # QIBI - c30d2958827d1867c73318a5a2957eb1 # RED - ae58039e1319178e6be73caab5c42166 # SHO + - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN - 5d2317d99af813b6529c7ebf01c83533 # VDL # 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+ diff --git a/docs/Sonarr/recyclarr-config/french_web_1080p_vostfr_v4.yml b/docs/Sonarr/recyclarr-config/french_web_1080p_vostfr_v4.yml index cceba154b..f51c950a3 100644 --- a/docs/Sonarr/recyclarr-config/french_web_1080p_vostfr_v4.yml +++ b/docs/Sonarr/recyclarr-config/french_web_1080p_vostfr_v4.yml @@ -43,6 +43,7 @@ sonarr: - 3ac5d84fce98bab1b531393e9c82f467 # QIBI - c30d2958827d1867c73318a5a2957eb1 # RED - ae58039e1319178e6be73caab5c42166 # SHO + - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN - 5d2317d99af813b6529c7ebf01c83533 # VDL # 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+ From 06dd8ca6f09d21b871b6c1dbb515469c823bf538 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Mon, 30 Jan 2023 12:03:25 +0100 Subject: [PATCH 08/17] Update french-anime-tier-02.json Added the other name of Good Job! Alexis --- docs/json/sonarr/cf/french-anime-tier-02.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/json/sonarr/cf/french-anime-tier-02.json b/docs/json/sonarr/cf/french-anime-tier-02.json index 161e4aca3..7b2052d10 100644 --- a/docs/json/sonarr/cf/french-anime-tier-02.json +++ b/docs/json/sonarr/cf/french-anime-tier-02.json @@ -28,7 +28,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Good[ .-]?Job!?[ .-]?Alexis)\\b" + "value": "\\b(Good[ .-]?(Job|Rip|Sub)!?[ .-]?Alexis)\\b" } }, { From c7fdd3abdf88b3a8827eee8a326b23ddad0a2741 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Mon, 30 Jan 2023 12:04:00 +0100 Subject: [PATCH 09/17] Update FR Radarr Remux Tier Zapax has been promoted to tier 01 --- docs/json/radarr/cf/french-remux-tier-01.json | 9 +++++++++ docs/json/radarr/cf/french-remux-tier-02.json | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/json/radarr/cf/french-remux-tier-01.json b/docs/json/radarr/cf/french-remux-tier-01.json index 86086c45f..2e6c3142d 100644 --- a/docs/json/radarr/cf/french-remux-tier-01.json +++ b/docs/json/radarr/cf/french-remux-tier-01.json @@ -93,6 +93,15 @@ "fields": { "value": "\\b(Tezcat74)\\b" } + }, + { + "name": "Zapax", + "implementation": "ReleaseGroupSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(Zapax)\\b" + } } ] } diff --git a/docs/json/radarr/cf/french-remux-tier-02.json b/docs/json/radarr/cf/french-remux-tier-02.json index f33fbac94..8c09730d0 100644 --- a/docs/json/radarr/cf/french-remux-tier-02.json +++ b/docs/json/radarr/cf/french-remux-tier-02.json @@ -93,15 +93,6 @@ "fields": { "value": "\\b(Sicario)\\b" } - }, - { - "name": "Zapax", - "implementation": "ReleaseGroupSpecification", - "negate": false, - "required": false, - "fields": { - "value": "\\b(Zapax)\\b" - } } ] } From ff66025519b222f8750521cbdb87ea5867c982a5 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Mon, 30 Jan 2023 14:10:55 +0100 Subject: [PATCH 10/17] Update french_anime_multi_v4.yml yamllint check --- .../french_anime_multi_v4.yml | 187 +++++++++--------- 1 file changed, 93 insertions(+), 94 deletions(-) diff --git a/docs/Sonarr/recyclarr-config/french_anime_multi_v4.yml b/docs/Sonarr/recyclarr-config/french_anime_multi_v4.yml index 5df4b28ae..fa33dedbc 100644 --- a/docs/Sonarr/recyclarr-config/french_anime_multi_v4.yml +++ b/docs/Sonarr/recyclarr-config/french_anime_multi_v4.yml @@ -4,133 +4,132 @@ # Cet exemple est pour Sonarr et le profil "Anime MULTi" present dans le guide # https://trash-guides.info/Sonarr/sonarr-setup-quality-profiles-french-fr/#exemple-pour-les-animes - sonarr: french_sonarr_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] + quality_definition: type: anime - # La liste de Formats Personnalisés à synchroniser avec Sonarr. - custom_formats: + custom_formats: + # La liste de Formats Personnalisés à synchroniser avec Sonarr. - trash_ids: - # ===== MULTi Audio ===== - - 2f6e84efc47246ec9071e311e71c4953 # Multi-Audio - - 7982e39789f17864f57b11f1996844f4 # Multi-French - # Décommentez la ligne suivante si vous voulez donner un léger bonus au score de la release si elle possède effectivement un audio français. - # - 4721382d9ee05f1b4967a25e75072911 # French Audio - # ===== Versions françaises ===== - # Ceci permets malgré tout de renommer vos releases avec VOSTFR si c'est le cas. - - 07a32f77690263bb9fda1842db7e273f # VOSTFR - - 84f0acbda9c0c9de783894fb66df25aa # FanSUB - # ===== Indésirables ===== - - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK - - 3ba797e5dc13af4b8d9bb25e83d90de2 # FR LQ - - b4a1b3d705159cdca36d71e57ca86871 # Anime Raws - - e3515e519f3b1360cbfc17651944354c # Anime LQ Groups - - 9c14d194486c4014d422adc64092d794 # Dubs Only - - ea0bb4b6ba388992fad1092703b5ff7b # FastSUB - # ===== Versions ===== - - d2d7b8a9d39413da5f44054080e028a3 # v0 - - 273bd326df95955e1b6c26527d1df89b # v1 - - 228b8ee9aa0a609463efca874524a6b8 # v2 - - 0e5833d3af2cc5fa96a0c29cd4477feb # v3 - - 4fc15eeb8f2f9a749f918217d4234ad8 # v4 - # ===== Streaming Service ===== - - d54cd2bf1326287275b56bccedb72ee2 # ADN - - d660701077794679fd59e8bdf4ce3a29 # AMZN - - 7dd31f3dee6d2ef8eeaa156e23c3857e # B-Global - - 4c67ff059210182b59cdd41697b8cb08 # Bilibili - - 3e0b26604165f463f3e8e192261e7284 # CR - - 89358767a60cc28783cdc3d0be9388a4 # DSNP - - 1284d18e693de8efe0fe7d6b3e0b9170 # FUNi - - 570b03b3145a25011bf073274a407259 # HIDIVE - - d34870697c9db575f17700212167be23 # NF - - 44a8ee6403071dd7b8a3a8dd3fe8cb20 # VRV - - e5e6405d439dcd1af90962538acd4fe0 # WKN - # ===== Autres ===== - - b2550eb333d27b75833e25b8c2557b38 # 10bit - - cddfb4e32db826151d97352b8e37c648 # x264 - - c9eafd50846d299b862ca9bb6ea91950 # x265 - # ===== HQ Source Groups ===== - - db13a377f7afb29975ea39470434d2ef # FR Anime Tier 01 - - 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 - # 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 - # d'un MULTi/VOSTFR car celle-ci possède un score plus important. - # - # Vous pouvez aussi les activer dans le cas où vous avez configuré Bazarr. - # - 949c16fe0a8147f50ba82cc2df9411c9 # Anime BD Tier 01 (Top SeaDex Muxers) - # - ed7f1e315e000aef424a58517fa48727 # Anime BD Tier 02 (SeaDex Muxers) - # - 096e406c92baa713da4a72d88030b815 # Anime BD Tier 03 (SeaDex Muxers) - # - 30feba9da3030c5ed1e0f7d610bcadc4 # Anime BD Tier 04 (SeaDex Muxers) - # - 545a76b14ddc349b8b185a6344e28b04 # Anime BD Tier 05 (Remuxes) - # - 25d2afecab632b1582eaf03b63055f72 # Anime BD Tier 06 (FanSubs) - # - 0329044e3d9137b08502a9f84a7e58db # Anime BD Tier 07 (P2P/Scene) - # - c81bbfb47fed3d5a3ad027d077f889de # Anime BD Tier 08 (Mini Encodes) - # - e0014372773c8f0e1bef8824f00c7dc4 # Anime Web Tier 01 (Muxers) - # - 19180499de5ef2b84b6ec59aae444696 # Anime Web Tier 02 (Top FanSubs) - # - c27f2ae6a4e82373b0f1da094e2489ad # Anime Web Tier 03 (Official Subs) - # - 4fd5528a3a8024e6b49f9c67053ea5f3 # Anime Web Tier 04 (Official Subs) - # - 29c2a13d091144f63307e4a8ce963a39 # Anime Web Tier 05 (FanSubs) - # - dc262f88d74c651b12e9d90b39f6c753 # Anime Web Tier 06 (FanSubs) + # ===== MULTi Audio ===== + - 2f6e84efc47246ec9071e311e71c4953 # Multi-Audio + - 7982e39789f17864f57b11f1996844f4 # Multi-French + # Décommentez la ligne suivante si vous voulez donner un léger bonus au score de la release si elle possède effectivement un audio français. + # - 4721382d9ee05f1b4967a25e75072911 # French Audio + # ===== Versions françaises ===== + # Ceci permets malgré tout de renommer vos releases avec VOSTFR si c'est le cas. + - 07a32f77690263bb9fda1842db7e273f # VOSTFR + - 84f0acbda9c0c9de783894fb66df25aa # FanSUB + # ===== Indésirables ===== + - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK + - 3ba797e5dc13af4b8d9bb25e83d90de2 # FR LQ + - b4a1b3d705159cdca36d71e57ca86871 # Anime Raws + - e3515e519f3b1360cbfc17651944354c # Anime LQ Groups + - 9c14d194486c4014d422adc64092d794 # Dubs Only + - ea0bb4b6ba388992fad1092703b5ff7b # FastSUB + # ===== Versions ===== + - d2d7b8a9d39413da5f44054080e028a3 # v0 + - 273bd326df95955e1b6c26527d1df89b # v1 + - 228b8ee9aa0a609463efca874524a6b8 # v2 + - 0e5833d3af2cc5fa96a0c29cd4477feb # v3 + - 4fc15eeb8f2f9a749f918217d4234ad8 # v4 + # ===== Streaming Service ===== + - d54cd2bf1326287275b56bccedb72ee2 # ADN + - d660701077794679fd59e8bdf4ce3a29 # AMZN + - 7dd31f3dee6d2ef8eeaa156e23c3857e # B-Global + - 4c67ff059210182b59cdd41697b8cb08 # Bilibili + - 3e0b26604165f463f3e8e192261e7284 # CR + - 89358767a60cc28783cdc3d0be9388a4 # DSNP + - 1284d18e693de8efe0fe7d6b3e0b9170 # FUNi + - 570b03b3145a25011bf073274a407259 # HIDIVE + - d34870697c9db575f17700212167be23 # NF + - 44a8ee6403071dd7b8a3a8dd3fe8cb20 # VRV + - e5e6405d439dcd1af90962538acd4fe0 # WKN + # ===== Autres ===== + - b2550eb333d27b75833e25b8c2557b38 # 10bit + - cddfb4e32db826151d97352b8e37c648 # x264 + - c9eafd50846d299b862ca9bb6ea91950 # x265 + # ===== HQ Source Groups ===== + - db13a377f7afb29975ea39470434d2ef # FR Anime Tier 01 + - 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 + # 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 + # d'un MULTi/VOSTFR car celle-ci possède un score plus important. + # + # Vous pouvez aussi les activer dans le cas où vous avez configuré Bazarr. + # - 949c16fe0a8147f50ba82cc2df9411c9 # Anime BD Tier 01 (Top SeaDex Muxers) + # - ed7f1e315e000aef424a58517fa48727 # Anime BD Tier 02 (SeaDex Muxers) + # - 096e406c92baa713da4a72d88030b815 # Anime BD Tier 03 (SeaDex Muxers) + # - 30feba9da3030c5ed1e0f7d610bcadc4 # Anime BD Tier 04 (SeaDex Muxers) + # - 545a76b14ddc349b8b185a6344e28b04 # Anime BD Tier 05 (Remuxes) + # - 25d2afecab632b1582eaf03b63055f72 # Anime BD Tier 06 (FanSubs) + # - 0329044e3d9137b08502a9f84a7e58db # Anime BD Tier 07 (P2P/Scene) + # - c81bbfb47fed3d5a3ad027d077f889de # Anime BD Tier 08 (Mini Encodes) + # - e0014372773c8f0e1bef8824f00c7dc4 # Anime Web Tier 01 (Muxers) + # - 19180499de5ef2b84b6ec59aae444696 # Anime Web Tier 02 (Top FanSubs) + # - c27f2ae6a4e82373b0f1da094e2489ad # Anime Web Tier 03 (Official Subs) + # - 4fd5528a3a8024e6b49f9c67053ea5f3 # Anime Web Tier 04 (Official Subs) + # - 29c2a13d091144f63307e4a8ce963a39 # Anime Web Tier 05 (FanSubs) + # - dc262f88d74c651b12e9d90b39f6c753 # Anime Web Tier 06 (FanSubs) quality_profiles: - - name: FR-ANIME-MULTi - reset_unmatched_scores: true - + - name: FR-ANIME-MULTi + reset_unmatched_scores: true + - trash_ids: - - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 + - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 quality_profiles: - - name: FR-ANIME-MULTi - score: -10000 - + - name: FR-ANIME-MULTi + score: -10000 + # ==== Scores Optionnels ==== # Décommenter le score associé si c'est ce que vous souhaitez # Si vous préférez les releases non censurées - trash_ids: - - 026d5aadd1a6b4e550b134cb6c72b3ca # Uncensored + - 026d5aadd1a6b4e550b134cb6c72b3ca # Uncensored quality_profiles: - - name: FR-ANIME-MULTi - # score: 101 + - name: FR-ANIME-MULTi + # score: 101 # Si vous préférez avoir des versions Dual Audio (audio original et anglais) au cas où Sonarr ne trouve pas de sortie VOSTFR ou MULTi. - trash_ids: - - 418f50b10f1907201b6cfdf881f467b7 # Anime Dual Audio + - 418f50b10f1907201b6cfdf881f467b7 # Anime Dual Audio quality_profiles: - - name: FR-ANIME-MULTi - # score: 101 + - name: FR-ANIME-MULTi + # score: 101 # Si vous ne voulez pas non-plus de FanSUB. # Pensez à le supprimer de la ligne 21 et le Format Personnalisé suivant aussi dans ce cas. - trash_ids: - - 84f0acbda9c0c9de783894fb66df25aa # FanSUB + - 84f0acbda9c0c9de783894fb66df25aa # FanSUB quality_profiles: - - name: FR-ANIME-MULTi - # score: -10000 - + - name: FR-ANIME-MULTi + # score: -10000 + # Les groupes FanSUB peuvent être notés soit 1400 (par défaut) soit 1000 # selon que vous souhaitez privilégier les sorties FanSUB ou SeaDex. # Ils peuvent aussi être supprimés si vous ne souhaitez pas de FanSUB. - trash_ids: - - 44b6c964dad997577d793fd004a39224 # FR Anime FanSub + - 44b6c964dad997577d793fd004a39224 # FR Anime FanSub quality_profiles: - - name: FR-ANIME-MULTi - # score: 1000 - + - name: FR-ANIME-MULTi + # score: 1000 + # Les Formats Personnalisés suivants sont optionnels et peuvent être inclus ou non. # Cela est dû au fait que certains d'entre eux ont tendance à publier des anime doublés. - trash_ids: - - ddb8eaa9c85a549c50034d280539d54d # FR WEB Tier 01 - - a4c51febd4d8b2a0db10a3c974f21d92 # FR WEB Tier 02 - - dbfc0a4b5cb4cbd693311c4482ae9683 # FR WEB Tier 03 + - ddb8eaa9c85a549c50034d280539d54d # FR WEB Tier 01 + - a4c51febd4d8b2a0db10a3c974f21d92 # FR WEB Tier 02 + - dbfc0a4b5cb4cbd693311c4482ae9683 # FR WEB Tier 03 quality_profiles: - - name: FR-ANIME-MULTi - score: 1100 + - name: FR-ANIME-MULTi + score: 1100 From b8dac892a8e80b7ebb26042b57d6345d3d93766d Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Tue, 31 Jan 2023 10:09:57 +0100 Subject: [PATCH 11/17] Fix for yamllint verification --- .../french_anime_vostfr_v4.yml | 183 ++++++++++-------- .../french_web_1080p_multi_v4.yml | 163 ++++++++-------- .../french_web_1080p_vostfr_v4.yml | 117 ++++++----- 3 files changed, 239 insertions(+), 224 deletions(-) diff --git a/docs/Sonarr/recyclarr-config/french_anime_vostfr_v4.yml b/docs/Sonarr/recyclarr-config/french_anime_vostfr_v4.yml index 90af17a20..c07f27e54 100644 --- a/docs/Sonarr/recyclarr-config/french_anime_vostfr_v4.yml +++ b/docs/Sonarr/recyclarr-config/french_anime_vostfr_v4.yml @@ -4,131 +4,148 @@ # Cet exemple est pour Sonarr et le profil "Anime VOSTFR" present dans le guide # https://trash-guides.info/Sonarr/sonarr-setup-quality-profiles-french-fr/#exemple-pour-les-animes - sonarr: french_sonarr_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] + quality_definition: type: anime # La liste de Formats Personnalisés à synchroniser avec Sonarr. custom_formats: - trash_ids: - # ===== Versions françaises ===== - - 84f0acbda9c0c9de783894fb66df25aa # FanSUB - # ===== Indésirables ===== - - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK - - 3ba797e5dc13af4b8d9bb25e83d90de2 # FR LQ - - b4a1b3d705159cdca36d71e57ca86871 # Anime Raws - - e3515e519f3b1360cbfc17651944354c # Anime LQ Groups - - 9c14d194486c4014d422adc64092d794 # Dubs Only - - ea0bb4b6ba388992fad1092703b5ff7b # FastSUB - # ===== Versions ===== - - d2d7b8a9d39413da5f44054080e028a3 # v0 - - 273bd326df95955e1b6c26527d1df89b # v1 - - 228b8ee9aa0a609463efca874524a6b8 # v2 - - 0e5833d3af2cc5fa96a0c29cd4477feb # v3 - - 4fc15eeb8f2f9a749f918217d4234ad8 # v4 - # ===== Streaming Service ===== - - d54cd2bf1326287275b56bccedb72ee2 # ADN - - d660701077794679fd59e8bdf4ce3a29 # AMZN - - 7dd31f3dee6d2ef8eeaa156e23c3857e # B-Global - - 4c67ff059210182b59cdd41697b8cb08 # Bilibili - - 3e0b26604165f463f3e8e192261e7284 # CR - - 89358767a60cc28783cdc3d0be9388a4 # DSNP - - 1284d18e693de8efe0fe7d6b3e0b9170 # FUNi - - 570b03b3145a25011bf073274a407259 # HIDIVE - - d34870697c9db575f17700212167be23 # NF - - 44a8ee6403071dd7b8a3a8dd3fe8cb20 # VRV - - e5e6405d439dcd1af90962538acd4fe0 # WKN - # ===== Autres ===== - - b2550eb333d27b75833e25b8c2557b38 # 10bit - - cddfb4e32db826151d97352b8e37c648 # x264 - - c9eafd50846d299b862ca9bb6ea91950 # x265 - # ===== HQ Source Groups ===== - - db13a377f7afb29975ea39470434d2ef # FR Anime Tier 01 - - 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 - # 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 - # d'un VOSTFR car celle-ci possède un score plus important. - # - # Vous pouvez aussi les activer dans le cas où vous avez configuré Bazarr. - # - 949c16fe0a8147f50ba82cc2df9411c9 # Anime BD Tier 01 (Top SeaDex Muxers) - # - ed7f1e315e000aef424a58517fa48727 # Anime BD Tier 02 (SeaDex Muxers) - # - 096e406c92baa713da4a72d88030b815 # Anime BD Tier 03 (SeaDex Muxers) - # - 30feba9da3030c5ed1e0f7d610bcadc4 # Anime BD Tier 04 (SeaDex Muxers) - # - 545a76b14ddc349b8b185a6344e28b04 # Anime BD Tier 05 (Remuxes) - # - 25d2afecab632b1582eaf03b63055f72 # Anime BD Tier 06 (FanSubs) - # - 0329044e3d9137b08502a9f84a7e58db # Anime BD Tier 07 (P2P/Scene) - # - c81bbfb47fed3d5a3ad027d077f889de # Anime BD Tier 08 (Mini Encodes) - # - e0014372773c8f0e1bef8824f00c7dc4 # Anime Web Tier 01 (Muxers) - # - 19180499de5ef2b84b6ec59aae444696 # Anime Web Tier 02 (Top FanSubs) - # - c27f2ae6a4e82373b0f1da094e2489ad # Anime Web Tier 03 (Official Subs) - # - 4fd5528a3a8024e6b49f9c67053ea5f3 # Anime Web Tier 04 (Official Subs) - # - 29c2a13d091144f63307e4a8ce963a39 # Anime Web Tier 05 (FanSubs) - # - dc262f88d74c651b12e9d90b39f6c753 # Anime Web Tier 06 (FanSubs) + # ===== Versions françaises ===== + - 84f0acbda9c0c9de783894fb66df25aa # FanSUB + # ===== Indésirables ===== + - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK + - 3ba797e5dc13af4b8d9bb25e83d90de2 # FR LQ + - b4a1b3d705159cdca36d71e57ca86871 # Anime Raws + - e3515e519f3b1360cbfc17651944354c # Anime LQ Groups + - 9c14d194486c4014d422adc64092d794 # Dubs Only + - ea0bb4b6ba388992fad1092703b5ff7b # FastSUB + # ===== Versions ===== + - d2d7b8a9d39413da5f44054080e028a3 # v0 + - 273bd326df95955e1b6c26527d1df89b # v1 + - 228b8ee9aa0a609463efca874524a6b8 # v2 + - 0e5833d3af2cc5fa96a0c29cd4477feb # v3 + - 4fc15eeb8f2f9a749f918217d4234ad8 # v4 + # ===== Streaming Service ===== + - d54cd2bf1326287275b56bccedb72ee2 # ADN + - d660701077794679fd59e8bdf4ce3a29 # AMZN + - 7dd31f3dee6d2ef8eeaa156e23c3857e # B-Global + - 4c67ff059210182b59cdd41697b8cb08 # Bilibili + - 3e0b26604165f463f3e8e192261e7284 # CR + - 89358767a60cc28783cdc3d0be9388a4 # DSNP + - 1284d18e693de8efe0fe7d6b3e0b9170 # FUNi + - 570b03b3145a25011bf073274a407259 # HIDIVE + - d34870697c9db575f17700212167be23 # NF + - 44a8ee6403071dd7b8a3a8dd3fe8cb20 # VRV + - e5e6405d439dcd1af90962538acd4fe0 # WKN + # ===== Autres ===== + - b2550eb333d27b75833e25b8c2557b38 # 10bit + - cddfb4e32db826151d97352b8e37c648 # x264 + - c9eafd50846d299b862ca9bb6ea91950 # x265 + # ===== HQ Source Groups ===== + - db13a377f7afb29975ea39470434d2ef # FR Anime Tier 01 + - 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 + # 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 + # d'un VOSTFR car celle-ci possède un score plus important. + # + # Vous pouvez aussi les activer dans le cas où vous avez configuré Bazarr. + # - 949c16fe0a8147f50ba82cc2df9411c9 # Anime BD Tier 01 (Top SeaDex Muxers) + # - ed7f1e315e000aef424a58517fa48727 # Anime BD Tier 02 (SeaDex Muxers) + # - 096e406c92baa713da4a72d88030b815 # Anime BD Tier 03 (SeaDex Muxers) + # - 30feba9da3030c5ed1e0f7d610bcadc4 # Anime BD Tier 04 (SeaDex Muxers) + # - 545a76b14ddc349b8b185a6344e28b04 # Anime BD Tier 05 (Remuxes) + # - 25d2afecab632b1582eaf03b63055f72 # Anime BD Tier 06 (FanSubs) + # - 0329044e3d9137b08502a9f84a7e58db # Anime BD Tier 07 (P2P/Scene) + # - c81bbfb47fed3d5a3ad027d077f889de # Anime BD Tier 08 (Mini Encodes) + # - e0014372773c8f0e1bef8824f00c7dc4 # Anime Web Tier 01 (Muxers) + # - 19180499de5ef2b84b6ec59aae444696 # Anime Web Tier 02 (Top FanSubs) + # - c27f2ae6a4e82373b0f1da094e2489ad # Anime Web Tier 03 (Official Subs) + # - 4fd5528a3a8024e6b49f9c67053ea5f3 # Anime Web Tier 04 (Official Subs) + # - 29c2a13d091144f63307e4a8ce963a39 # Anime Web Tier 05 (FanSubs) + # - dc262f88d74c651b12e9d90b39f6c753 # Anime Web Tier 06 (FanSubs) + quality_profiles: + - name: FR-ANIME-VOSTFR + reset_unmatched_scores: true + + - trash_ids: + - d660701077794679fd59e8bdf4ce3a29 # AMZN + quality_profiles: + - name: FR-ANIME-VOSTFR + score: 1 + + - trash_ids: + - 89358767a60cc28783cdc3d0be9388a4 # DSNP + quality_profiles: + - name: FR-ANIME-VOSTFR + score: 4 + + - trash_ids: + - d34870697c9db575f17700212167be23 # NF quality_profiles: - - name: FR-ANIME-VOSTFR - reset_unmatched_scores: true + - name: FR-ANIME-VOSTFR + score: 2 - trash_ids: - - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 + - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 quality_profiles: - - name: FR-ANIME-VOSTFR - score: -10000 + - name: FR-ANIME-VOSTFR + score: -10000 # ===== MULTi Audio ===== # Nécessaire vu qu'on ne souhaite pas de MULTis - trash_ids: - - 2f6e84efc47246ec9071e311e71c4953 # Multi-Audio + - 2f6e84efc47246ec9071e311e71c4953 # Multi-Audio quality_profiles: - - name: FR-ANIME-VOSTFR - score: -10000 + - name: FR-ANIME-VOSTFR + score: -10000 # ===== Versions françaises ===== - trash_ids: - - 07a32f77690263bb9fda1842db7e273f # VOSTFR + - 07a32f77690263bb9fda1842db7e273f # VOSTFR quality_profiles: - - name: FR-ANIME-VOSTFR - score: 101 + - name: FR-ANIME-VOSTFR + score: 101 # ==== Scores Optionnels ==== # Décommenter le score associé si c'est ce que vous souhaitez # Si vous préférez les releases non censurées - trash_ids: - - 026d5aadd1a6b4e550b134cb6c72b3ca # Uncensored + - 026d5aadd1a6b4e550b134cb6c72b3ca # Uncensored quality_profiles: - - name: FR-ANIME-VOSTFR - # score: 101 + - name: FR-ANIME-VOSTFR + # score: 101 # Si vous préférez avoir des versions Dual Audio (audio original et anglais) au cas où Sonarr ne trouve pas de sortie VOSTFR ou MULTi. - trash_ids: - - 418f50b10f1907201b6cfdf881f467b7 # Anime Dual Audio + - 418f50b10f1907201b6cfdf881f467b7 # Anime Dual Audio quality_profiles: - - name: FR-ANIME-VOSTFR - # score: 101 + - name: FR-ANIME-VOSTFR + # score: 101 # Si vous ne voulez pas non-plus de FanSUB. # Pensez à le supprimer de la ligne 21 et le Format Personnalisé suivant aussi dans ce cas. - trash_ids: - - 84f0acbda9c0c9de783894fb66df25aa # FanSUB + - 84f0acbda9c0c9de783894fb66df25aa # FanSUB quality_profiles: - - name: FR-ANIME-VOSTFR - # score: -10000 - + - name: FR-ANIME-VOSTFR + # score: -10000 + # Les groupes FanSUB peuvent être notés soit 1400 (par défaut) soit 1000 # selon que vous souhaitez privilégier les sorties FanSUB ou SeaDex. # Ils peuvent aussi être supprimés si vous ne souhaitez pas de FanSUB. - trash_ids: - - 44b6c964dad997577d793fd004a39224 # FR Anime FanSub + - 44b6c964dad997577d793fd004a39224 # FR Anime FanSub quality_profiles: - - name: FR-ANIME-VOSTFR - # score: 1000 + - name: FR-ANIME-VOSTFR + # score: 1000 diff --git a/docs/Sonarr/recyclarr-config/french_web_1080p_multi_v4.yml b/docs/Sonarr/recyclarr-config/french_web_1080p_multi_v4.yml index 141be5182..2960a8152 100644 --- a/docs/Sonarr/recyclarr-config/french_web_1080p_multi_v4.yml +++ b/docs/Sonarr/recyclarr-config/french_web_1080p_multi_v4.yml @@ -4,79 +4,78 @@ # Cet exemple est pour Sonarr et le profil "WEB 1080p MULTi" present dans le guide # https://trash-guides.info/Sonarr/sonarr-setup-quality-profiles-french-fr/#webdl-1080p - sonarr: french_sonarr_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] + quality_definition: type: series # 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 - # ===== Indésirables ===== - - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK - - 3ba797e5dc13af4b8d9bb25e83d90de2 # FR LQ - - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ - - 47435ece6b99a0b477caf360e79ba0bb # x265 (HD) - - 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 - # 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 + # ===== 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 + # ===== Indésirables ===== + - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK + - 3ba797e5dc13af4b8d9bb25e83d90de2 # FR LQ + - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ + - 47435ece6b99a0b477caf360e79ba0bb # x265 (HD) + - 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 + # 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-1080p - reset_unmatched_scores: true + - name: FR-MULTi-WEB-1080p + reset_unmatched_scores: true - trash_ids: - - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 + - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 quality_profiles: - - name: FR-MULTi-WEB-1080p - score: -10000 + - name: FR-MULTi-WEB-1080p + score: -10000 # ===== Versions françaises ===== # Activez ou désactiver les Formats Personnalisés suivant si vous souhaitez noter vos releases avec. @@ -85,47 +84,47 @@ sonarr: # 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 + - 2c29a39a4fdfd6d258799bc4c09731b9 # VFF quality_profiles: - - name: FR-MULTi-WEB-1080p - # score: -10000 + - name: FR-MULTi-WEB-1080p + # score: -10000 - trash_ids: - - 7ae924ee9b2f39df3283c6c0beb8a2aa # VOF + - 7ae924ee9b2f39df3283c6c0beb8a2aa # VOF quality_profiles: - - name: FR-MULTi-WEB-1080p - # score: -10000 + - name: FR-MULTi-WEB-1080p + # score: -10000 - trash_ids: - - b6816a0e1d4b64bf3550ad3b74b009b6 # VFI + - b6816a0e1d4b64bf3550ad3b74b009b6 # VFI quality_profiles: - - name: FR-MULTi-WEB-1080p - # score: -10000 + - name: FR-MULTi-WEB-1080p + # score: -10000 - trash_ids: - - 7a7f4e4f58bd1058440236d033a90b67 # VFQ + - 7a7f4e4f58bd1058440236d033a90b67 # VFQ quality_profiles: - - name: FR-MULTi-WEB-1080p - # score: -10000 + - name: FR-MULTi-WEB-1080p + # score: -10000 - trash_ids: - - 82085412d9a53ba8d8e46fc624eb701d # VQ + - 82085412d9a53ba8d8e46fc624eb701d # VQ quality_profiles: - - name: FR-MULTi-WEB-1080p - # score: -10000 + - name: FR-MULTi-WEB-1080p + # score: -10000 - trash_ids: - - 0ce1e39a4676c6692ce47935278dac76 # VFB + - 0ce1e39a4676c6692ce47935278dac76 # VFB quality_profiles: - - name: FR-MULTi-WEB-1080p - # score: -10000 + - name: FR-MULTi-WEB-1080p + # score: -10000 - trash_ids: - - 07a32f77690263bb9fda1842db7e273f # VOSTFR + - 07a32f77690263bb9fda1842db7e273f # VOSTFR quality_profiles: - - name: FR-MULTi-WEB-1080p - # score: -10000 + - name: FR-MULTi-WEB-1080p + # score: -10000 # ==== 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 + - 84f0acbda9c0c9de783894fb66df25aa # FanSUB quality_profiles: - - name: FR-MULTi-WEB-1080p - # score: -10000 + - name: FR-MULTi-WEB-1080p + # score: -10000 diff --git a/docs/Sonarr/recyclarr-config/french_web_1080p_vostfr_v4.yml b/docs/Sonarr/recyclarr-config/french_web_1080p_vostfr_v4.yml index f51c950a3..5da089367 100644 --- a/docs/Sonarr/recyclarr-config/french_web_1080p_vostfr_v4.yml +++ b/docs/Sonarr/recyclarr-config/french_web_1080p_vostfr_v4.yml @@ -4,95 +4,94 @@ # Cet exemple est pour Sonarr et le profil "WEB 1080p VOSTFR" present dans le guide # https://trash-guides.info/Sonarr/sonarr-setup-quality-profiles-french-fr/#webdl-1080p - sonarr: french_sonarr_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] + quality_definition: type: series # La liste de Formats Personnalisés à synchroniser avec Sonarr. custom_formats: - trash_ids: - # ===== Indésirables ===== - - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK - - 3ba797e5dc13af4b8d9bb25e83d90de2 # FR LQ - - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ - - 47435ece6b99a0b477caf360e79ba0bb # x265 (HD) - - 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 - # 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 + # ===== Indésirables ===== + - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK + - 3ba797e5dc13af4b8d9bb25e83d90de2 # FR LQ + - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ + - 47435ece6b99a0b477caf360e79ba0bb # x265 (HD) + - 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 + # 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-1080p - reset_unmatched_scores: true + - name: FR-VOSTFR-WEB-1080p + reset_unmatched_scores: true - trash_ids: - - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 + - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 quality_profiles: - - name: FR-VOSTFR-WEB-1080p - score: -10000 + - name: FR-VOSTFR-WEB-1080p + score: -10000 # ===== MULTi Audio ===== # Nécessaire vu qu'on ne souhaite pas de MULTi - trash_ids: - - 2f6e84efc47246ec9071e311e71c4953 # Multi-Audio + - 2f6e84efc47246ec9071e311e71c4953 # Multi-Audio quality_profiles: - - name: FR-VOSTFR-WEB-1080p - score: -10000 + - name: FR-VOSTFR-WEB-1080p + 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 + - 07a32f77690263bb9fda1842db7e273f # VOSTFR quality_profiles: - - name: FR-VOSTFR-WEB-1080p - score: 1000 + - name: FR-VOSTFR-WEB-1080p + 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 + - 84f0acbda9c0c9de783894fb66df25aa # FanSUB quality_profiles: - - name: FR-VOSTFR-WEB-1080p - # score: -10000 + - name: FR-VOSTFR-WEB-1080p + # score: -10000 From 48e2d5b94978e3d11dc661c95e887b795e81d9ab Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Tue, 31 Jan 2023 10:10:43 +0100 Subject: [PATCH 12/17] Fix streaming service score for anime --- .../french_anime_multi_v4.yml | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/docs/Sonarr/recyclarr-config/french_anime_multi_v4.yml b/docs/Sonarr/recyclarr-config/french_anime_multi_v4.yml index fa33dedbc..4c88f6a7f 100644 --- a/docs/Sonarr/recyclarr-config/french_anime_multi_v4.yml +++ b/docs/Sonarr/recyclarr-config/french_anime_multi_v4.yml @@ -40,14 +40,11 @@ sonarr: - 4fc15eeb8f2f9a749f918217d4234ad8 # v4 # ===== Streaming Service ===== - d54cd2bf1326287275b56bccedb72ee2 # ADN - - d660701077794679fd59e8bdf4ce3a29 # AMZN - 7dd31f3dee6d2ef8eeaa156e23c3857e # B-Global - 4c67ff059210182b59cdd41697b8cb08 # Bilibili - 3e0b26604165f463f3e8e192261e7284 # CR - - 89358767a60cc28783cdc3d0be9388a4 # DSNP - 1284d18e693de8efe0fe7d6b3e0b9170 # FUNi - 570b03b3145a25011bf073274a407259 # HIDIVE - - d34870697c9db575f17700212167be23 # NF - 44a8ee6403071dd7b8a3a8dd3fe8cb20 # VRV - e5e6405d439dcd1af90962538acd4fe0 # WKN # ===== Autres ===== @@ -84,6 +81,24 @@ sonarr: - name: FR-ANIME-MULTi reset_unmatched_scores: true + - trash_ids: + - d660701077794679fd59e8bdf4ce3a29 # AMZN + quality_profiles: + - name: FR-ANIME-MULTi + score: 1 + + - trash_ids: + - 89358767a60cc28783cdc3d0be9388a4 # DSNP + quality_profiles: + - name: FR-ANIME-MULTi + score: 4 + + - trash_ids: + - d34870697c9db575f17700212167be23 # NF + quality_profiles: + - name: FR-ANIME-MULTi + score: 2 + - trash_ids: - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 quality_profiles: @@ -115,7 +130,7 @@ sonarr: - name: FR-ANIME-MULTi # score: -10000 - # Les groupes FanSUB peuvent être notés soit 1400 (par défaut) soit 1000 + # Les groupes FanSUB peuvent être notés soit 1400 (par défaut) soit 1000 # selon que vous souhaitez privilégier les sorties FanSUB ou SeaDex. # Ils peuvent aussi être supprimés si vous ne souhaitez pas de FanSUB. - trash_ids: From 96812788804d8111ee041b855e702661f288637d Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Tue, 31 Jan 2023 10:16:02 +0100 Subject: [PATCH 13/17] More yamllint fixes --- .../french_anime_vostfr_v4.yml | 10 +-- .../french_web_1080p_multi_v4.yml | 66 +++++++------- .../french_web_1080p_vostfr_v4.yml | 86 +++++++++---------- 3 files changed, 81 insertions(+), 81 deletions(-) diff --git a/docs/Sonarr/recyclarr-config/french_anime_vostfr_v4.yml b/docs/Sonarr/recyclarr-config/french_anime_vostfr_v4.yml index c07f27e54..dad1ddae3 100644 --- a/docs/Sonarr/recyclarr-config/french_anime_vostfr_v4.yml +++ b/docs/Sonarr/recyclarr-config/french_anime_vostfr_v4.yml @@ -94,13 +94,13 @@ sonarr: quality_profiles: - name: FR-ANIME-VOSTFR score: 2 - + - trash_ids: - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 quality_profiles: - name: FR-ANIME-VOSTFR score: -10000 - + # ===== MULTi Audio ===== # Nécessaire vu qu'on ne souhaite pas de MULTis - trash_ids: @@ -108,14 +108,14 @@ sonarr: quality_profiles: - name: FR-ANIME-VOSTFR score: -10000 - + # ===== Versions françaises ===== - trash_ids: - 07a32f77690263bb9fda1842db7e273f # VOSTFR quality_profiles: - name: FR-ANIME-VOSTFR score: 101 - + # ==== Scores Optionnels ==== # Décommenter le score associé si c'est ce que vous souhaitez @@ -141,7 +141,7 @@ sonarr: - name: FR-ANIME-VOSTFR # score: -10000 - # Les groupes FanSUB peuvent être notés soit 1400 (par défaut) soit 1000 + # Les groupes FanSUB peuvent être notés soit 1400 (par défaut) soit 1000 # selon que vous souhaitez privilégier les sorties FanSUB ou SeaDex. # Ils peuvent aussi être supprimés si vous ne souhaitez pas de FanSUB. - trash_ids: diff --git a/docs/Sonarr/recyclarr-config/french_web_1080p_multi_v4.yml b/docs/Sonarr/recyclarr-config/french_web_1080p_multi_v4.yml index 2960a8152..11ccd2755 100644 --- a/docs/Sonarr/recyclarr-config/french_web_1080p_multi_v4.yml +++ b/docs/Sonarr/recyclarr-config/french_web_1080p_multi_v4.yml @@ -17,20 +17,20 @@ sonarr: custom_formats: - trash_ids: # ===== MULTi Audio ===== - - 2f6e84efc47246ec9071e311e71c4953 # Multi-Audio - - 7982e39789f17864f57b11f1996844f4 # Multi-French + - 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 + # - 4721382d9ee05f1b4967a25e75072911 # French Audio # ===== Indésirables ===== - - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK - - 3ba797e5dc13af4b8d9bb25e83d90de2 # FR LQ - - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ - - 47435ece6b99a0b477caf360e79ba0bb # x265 (HD) - - ea0bb4b6ba388992fad1092703b5ff7b # FastSUB + - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK + - 3ba797e5dc13af4b8d9bb25e83d90de2 # FR LQ + - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ + - 47435ece6b99a0b477caf360e79ba0bb # x265 (HD) + - ea0bb4b6ba388992fad1092703b5ff7b # FastSUB # ===== Misc ===== - - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper - - eb3d5cc0a2be0db205fb823640db6a3c # Repack2 - - 44e7c4de10ae50265753082e5dc76047 # Repack3 + - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper + - eb3d5cc0a2be0db205fb823640db6a3c # Repack2 + - 44e7c4de10ae50265753082e5dc76047 # Repack3 # ===== Services de Streaming ===== - d660701077794679fd59e8bdf4ce3a29 # AMZN - f67c9ca88f463a48346062e8ad07713f # ATVP @@ -50,33 +50,33 @@ sonarr: - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN - 5d2317d99af813b6529c7ebf01c83533 # VDL # 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 + - f27d46a831e6b16fa3fee2c4e5d10984 # Canal+ + - 0455d6519a550dbf648c97b56e7231d2 # SALTO + - b0d6195c23ae254932da00512db7e8a8 # RTBF # ===== HQ Source Groups ===== - - ddb8eaa9c85a549c50034d280539d54d # FR WEB Tier 01 - - a4c51febd4d8b2a0db10a3c974f21d92 # FR WEB Tier 02 - - dbfc0a4b5cb4cbd693311c4482ae9683 # FR WEB Tier 03 + - 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 + - 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 + # - d0c516558625b04b363fa6c5c2c7cfd4 # WEB Scene + # - e6258996055b9fbab7e9cb2f75819294 # WEB Tier 01 + # - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02 + # - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03 quality_profiles: - name: FR-MULTi-WEB-1080p reset_unmatched_scores: true - + - trash_ids: - - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 + - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 quality_profiles: - name: FR-MULTi-WEB-1080p 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 ou non obtenir un certain @@ -84,41 +84,41 @@ sonarr: # 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 + - 2c29a39a4fdfd6d258799bc4c09731b9 # VFF quality_profiles: - name: FR-MULTi-WEB-1080p # score: -10000 - trash_ids: - - 7ae924ee9b2f39df3283c6c0beb8a2aa # VOF + - 7ae924ee9b2f39df3283c6c0beb8a2aa # VOF quality_profiles: - name: FR-MULTi-WEB-1080p # score: -10000 - trash_ids: - - b6816a0e1d4b64bf3550ad3b74b009b6 # VFI + - b6816a0e1d4b64bf3550ad3b74b009b6 # VFI quality_profiles: - name: FR-MULTi-WEB-1080p # score: -10000 - trash_ids: - - 7a7f4e4f58bd1058440236d033a90b67 # VFQ + - 7a7f4e4f58bd1058440236d033a90b67 # VFQ quality_profiles: - name: FR-MULTi-WEB-1080p # score: -10000 - trash_ids: - - 82085412d9a53ba8d8e46fc624eb701d # VQ + - 82085412d9a53ba8d8e46fc624eb701d # VQ quality_profiles: - name: FR-MULTi-WEB-1080p # score: -10000 - trash_ids: - - 0ce1e39a4676c6692ce47935278dac76 # VFB + - 0ce1e39a4676c6692ce47935278dac76 # VFB quality_profiles: - name: FR-MULTi-WEB-1080p # score: -10000 - trash_ids: - - 07a32f77690263bb9fda1842db7e273f # VOSTFR + - 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 diff --git a/docs/Sonarr/recyclarr-config/french_web_1080p_vostfr_v4.yml b/docs/Sonarr/recyclarr-config/french_web_1080p_vostfr_v4.yml index 5da089367..cf1383317 100644 --- a/docs/Sonarr/recyclarr-config/french_web_1080p_vostfr_v4.yml +++ b/docs/Sonarr/recyclarr-config/french_web_1080p_vostfr_v4.yml @@ -17,54 +17,54 @@ sonarr: custom_formats: - trash_ids: # ===== Indésirables ===== - - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK - - 3ba797e5dc13af4b8d9bb25e83d90de2 # FR LQ - - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ - - 47435ece6b99a0b477caf360e79ba0bb # x265 (HD) - - ea0bb4b6ba388992fad1092703b5ff7b # FastSUB + - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK + - 3ba797e5dc13af4b8d9bb25e83d90de2 # FR LQ + - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ + - 47435ece6b99a0b477caf360e79ba0bb # x265 (HD) + - ea0bb4b6ba388992fad1092703b5ff7b # FastSUB # ===== Misc ===== - - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper - - eb3d5cc0a2be0db205fb823640db6a3c # Repack2 - - 44e7c4de10ae50265753082e5dc76047 # Repack3 + - 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 + - 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 # 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 + - f27d46a831e6b16fa3fee2c4e5d10984 # Canal+ + - 0455d6519a550dbf648c97b56e7231d2 # SALTO + - b0d6195c23ae254932da00512db7e8a8 # RTBF # ===== HQ Source Groups ===== - - ddb8eaa9c85a549c50034d280539d54d # FR WEB Tier 01 - - a4c51febd4d8b2a0db10a3c974f21d92 # FR WEB Tier 02 - - dbfc0a4b5cb4cbd693311c4482ae9683 # FR WEB Tier 03 + - 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 + - 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 + - d0c516558625b04b363fa6c5c2c7cfd4 # WEB Scene + - e6258996055b9fbab7e9cb2f75819294 # WEB Tier 01 + - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02 + - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03 quality_profiles: - name: FR-VOSTFR-WEB-1080p reset_unmatched_scores: true - + - trash_ids: - - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 + - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1 quality_profiles: - name: FR-VOSTFR-WEB-1080p score: -10000 @@ -72,26 +72,26 @@ sonarr: # ===== MULTi Audio ===== # Nécessaire vu qu'on ne souhaite pas de MULTi - trash_ids: - - 2f6e84efc47246ec9071e311e71c4953 # Multi-Audio + - 2f6e84efc47246ec9071e311e71c4953 # Multi-Audio quality_profiles: - name: FR-VOSTFR-WEB-1080p 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 + - 07a32f77690263bb9fda1842db7e273f # VOSTFR quality_profiles: - name: FR-VOSTFR-WEB-1080p 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 + - 84f0acbda9c0c9de783894fb66df25aa # FanSUB quality_profiles: - name: FR-VOSTFR-WEB-1080p # score: -10000 From f94c326fab1beb835d9cdf4a07cc8b56d41f8a11 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Tue, 31 Jan 2023 10:18:10 +0100 Subject: [PATCH 14/17] Last one --- docs/Sonarr/recyclarr-config/french_web_1080p_multi_v4.yml | 2 +- docs/Sonarr/recyclarr-config/french_web_1080p_vostfr_v4.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Sonarr/recyclarr-config/french_web_1080p_multi_v4.yml b/docs/Sonarr/recyclarr-config/french_web_1080p_multi_v4.yml index 11ccd2755..5a691a3e1 100644 --- a/docs/Sonarr/recyclarr-config/french_web_1080p_multi_v4.yml +++ b/docs/Sonarr/recyclarr-config/french_web_1080p_multi_v4.yml @@ -124,7 +124,7 @@ sonarr: # Si vous ne voulez pas non-plus de FanSUB. - trash_ids: - - 84f0acbda9c0c9de783894fb66df25aa # FanSUB + - 84f0acbda9c0c9de783894fb66df25aa # FanSUB quality_profiles: - name: FR-MULTi-WEB-1080p # score: -10000 diff --git a/docs/Sonarr/recyclarr-config/french_web_1080p_vostfr_v4.yml b/docs/Sonarr/recyclarr-config/french_web_1080p_vostfr_v4.yml index cf1383317..02df892ea 100644 --- a/docs/Sonarr/recyclarr-config/french_web_1080p_vostfr_v4.yml +++ b/docs/Sonarr/recyclarr-config/french_web_1080p_vostfr_v4.yml @@ -53,7 +53,7 @@ sonarr: - 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 + - 2f3422339d185eb227a324644a2fbfca # FR Scene Groups # Les tiers suivant sont les tiers originaux du guide (groupes anglophones) - d0c516558625b04b363fa6c5c2c7cfd4 # WEB Scene - e6258996055b9fbab7e9cb2f75819294 # WEB Tier 01 From 6e5db3da7c57e2925c325b1baf607a2f670d3b37 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Tue, 31 Jan 2023 10:33:11 +0100 Subject: [PATCH 15/17] Moved the FR Streaming Services under right column in Guide --- .../french_anime_vostfr_v4.yml | 3 - .../sonarr-collection-of-custom-formats.md | 78 ++++++++++--------- 2 files changed, 40 insertions(+), 41 deletions(-) diff --git a/docs/Sonarr/recyclarr-config/french_anime_vostfr_v4.yml b/docs/Sonarr/recyclarr-config/french_anime_vostfr_v4.yml index dad1ddae3..b5ffed35b 100644 --- a/docs/Sonarr/recyclarr-config/french_anime_vostfr_v4.yml +++ b/docs/Sonarr/recyclarr-config/french_anime_vostfr_v4.yml @@ -33,14 +33,11 @@ sonarr: - 4fc15eeb8f2f9a749f918217d4234ad8 # v4 # ===== Streaming Service ===== - d54cd2bf1326287275b56bccedb72ee2 # ADN - - d660701077794679fd59e8bdf4ce3a29 # AMZN - 7dd31f3dee6d2ef8eeaa156e23c3857e # B-Global - 4c67ff059210182b59cdd41697b8cb08 # Bilibili - 3e0b26604165f463f3e8e192261e7284 # CR - - 89358767a60cc28783cdc3d0be9388a4 # DSNP - 1284d18e693de8efe0fe7d6b3e0b9170 # FUNi - 570b03b3145a25011bf073274a407259 # HIDIVE - - d34870697c9db575f17700212167be23 # NF - 44a8ee6403071dd7b8a3a8dd3fe8cb20 # VRV - e5e6405d439dcd1af90962538acd4fe0 # WKN # ===== Autres ===== diff --git a/docs/Sonarr/sonarr-collection-of-custom-formats.md b/docs/Sonarr/sonarr-collection-of-custom-formats.md index 7583c9fe2..6da3c3371 100644 --- a/docs/Sonarr/sonarr-collection-of-custom-formats.md +++ b/docs/Sonarr/sonarr-collection-of-custom-formats.md @@ -82,8 +82,8 @@ I also made 3 guides related to this one. | | [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) | [ADN](#adn) | -| | [DV (FEL)](#dv-fel) | [FastSUB](#fastsub) | [WKN](#wkn) | +| | [SDR](#sdr) | [FanSUB](#fansub) | | +| | [DV (FEL)](#dv-fel) | [FastSUB](#fastsub) | | ------ @@ -100,6 +100,8 @@ I also made 3 guides related to this one. | | | [Funimation](#funi) | | | | | [HIDIVE](#hidive) | | | | | [VRV](#vrv) | | +| | | [ADN](#adn) | | +| | | [WKN](#wkn) | | ## Audio Advanced @@ -2072,6 +2074,42 @@ I also made 3 guides related to this one. ------ +### ADN + +ADN = Animation Digital Network + +??? question "ADN - [CLICK TO EXPAND]" + + [From Wikipedia, the free encyclopedia](https://fr.wikipedia.org/wiki/Animation_Digital_Network){:target="_blank" rel="noopener noreferrer"} + +??? example "JSON - [CLICK TO EXPAND]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/french-adn.json' %]][[% endfilter %]] + ``` + +[TOP](#index) + +------ + +### WKN + +WKN = Wakanim + +??? question "WKN - [CLICK TO EXPAND]" + + [From Wikipedia, the free encyclopedia](https://fr.wikipedia.org/wiki/Wakanim){:target="_blank" rel="noopener noreferrer"} + +??? example "JSON - [CLICK TO EXPAND]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/french-wkn.json' %]][[% endfilter %]] + ``` + +[TOP](#index) + +------ + ### 10bit ??? question "10bit - [CLICK TO EXPAND]" @@ -2497,39 +2535,3 @@ I also made 3 guides related to this one. ``` [TOP](#index) - ------- - -### ADN - -ADN = Animation Digital Network - -??? question "ADN - [CLICK TO EXPAND]" - - [From Wikipedia, the free encyclopedia](https://fr.wikipedia.org/wiki/Animation_Digital_Network){:target="_blank" rel="noopener noreferrer"} - -??? example "JSON - [CLICK TO EXPAND]" - - ```json - [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/french-adn.json' %]][[% endfilter %]] - ``` - -[TOP](#index) - ------- - -### WKN - -WKN = Wakanim - -??? question "WKN - [CLICK TO EXPAND]" - - [From Wikipedia, the free encyclopedia](https://fr.wikipedia.org/wiki/Wakanim){:target="_blank" rel="noopener noreferrer"} - -??? example "JSON - [CLICK TO EXPAND]" - - ```json - [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/french-wkn.json' %]][[% endfilter %]] - ``` - -[TOP](#index) From 06a5a5f0afbf9ec4d85b679357333db3e4fad997 Mon Sep 17 00:00:00 2001 From: nuxen Date: Sat, 4 Feb 2023 11:59:21 +0100 Subject: [PATCH 16/17] fix(radarr): Add `MT` to `LQ` CF Adding `MT` to the `LQ` CF because it is just a shortened name of `MTeam` --- docs/json/radarr/cf/lq.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/json/radarr/cf/lq.json b/docs/json/radarr/cf/lq.json index a4f9cfa55..eaf0605bf 100644 --- a/docs/json/radarr/cf/lq.json +++ b/docs/json/radarr/cf/lq.json @@ -352,7 +352,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(MTeam)\\b" + "value": "\\b(MTeam|MT)\\b" } }, { From 2f9074bc543dff4a8398542069f293dd461fdca0 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Sat, 4 Feb 2023 20:33:40 +0100 Subject: [PATCH 17/17] Fixed: minor markdown issue --- .../sonarr-collection-of-custom-formats.md | 50 +++++++++---------- ...rench-canal.json => french-canalplus.json} | 0 .../sonarr-french-streaming-services-en.md | 10 ++-- .../sonarr-french-streaming-services-fr.md | 10 ++-- 4 files changed, 35 insertions(+), 35 deletions(-) rename docs/json/sonarr/cf/{french-canal.json => french-canalplus.json} (100%) diff --git a/docs/Sonarr/sonarr-collection-of-custom-formats.md b/docs/Sonarr/sonarr-collection-of-custom-formats.md index 6da3c3371..820708dce 100644 --- a/docs/Sonarr/sonarr-collection-of-custom-formats.md +++ b/docs/Sonarr/sonarr-collection-of-custom-formats.md @@ -45,28 +45,28 @@ I also made 3 guides related to this one. ------ -| Series Versions | Unwanted | HQ Source Groups | Streaming Services | -| --------------------- | --------------------- | --------------------------------------- | ------------------- | -| [Hybrid](#hybrid) | [BR-DISK](#br-disk) | [Remux Tier 01](#remux-tier-01) | [Amazon](#amzn) | -| [Remaster](#remaster) | [LQ](#lq) | [Remux Tier 02](#remux-tier-02) | [Apple TV+](#atvp) | -| | [x265 (HD)](#x265-hd) | [HD Bluray Tier 01](#hd-bluray-tier-01) | [DC Universe](#dcu) | -| | | [HD Bluray Tier 02](#hd-bluray-tier-02) | [Disney+](#dsnp) | -| | | [WEB Tier 01](#web-tier-01) | [HBO Max](#hmax) | -| | | [WEB Tier 02](#web-tier-02) | [HBO](#hbo) | -| | | [WEB Tier 03](#web-tier-03) | [Hulu](#hulu) | -| | | [WEB Scene](#web-scene) | [NLZiet](#nlz) | -| | | | [Netflix](#nf) | -| | | | [Paramount+](#pmtp) | -| | | | [Peacock TV](#pcok) | -| | | | [Quibi](#qibi) | -| | | | [SHOWTIME](#sho) | -| | | | [Stan](#stan) | -| | | | [Videoland](#vdl) | -| | | | [YouTube Red](#red) | -| | | | [iTunes](#it) | -| | | | [CANAL+](#canal) | -| | | | [SALTO](#salto) | -| | | | [RTBF](#rtbf) | +| Series Versions | Unwanted | HQ Source Groups | Streaming Services | +| --------------------- | --------------------- | --------------------------------------- | -------------------- | +| [Hybrid](#hybrid) | [BR-DISK](#br-disk) | [Remux Tier 01](#remux-tier-01) | [Amazon](#amzn) | +| [Remaster](#remaster) | [LQ](#lq) | [Remux Tier 02](#remux-tier-02) | [Apple TV+](#atvp) | +| | [x265 (HD)](#x265-hd) | [HD Bluray Tier 01](#hd-bluray-tier-01) | [DC Universe](#dcu) | +| | | [HD Bluray Tier 02](#hd-bluray-tier-02) | [Disney+](#dsnp) | +| | | [WEB Tier 01](#web-tier-01) | [HBO Max](#hmax) | +| | | [WEB Tier 02](#web-tier-02) | [HBO](#hbo) | +| | | [WEB Tier 03](#web-tier-03) | [Hulu](#hulu) | +| | | [WEB Scene](#web-scene) | [NLZiet](#nlz) | +| | | | [Netflix](#nf) | +| | | | [Paramount+](#pmtp) | +| | | | [Peacock TV](#pcok) | +| | | | [Quibi](#qibi) | +| | | | [SHOWTIME](#sho) | +| | | | [Stan](#stan) | +| | | | [Videoland](#vdl) | +| | | | [YouTube Red](#red) | +| | | | [iTunes](#it) | +| | | | [CANAL+](#canalplus) | +| | | | [SALTO](#salto) | +| | | | [RTBF](#rtbf) | ------ @@ -1592,9 +1592,9 @@ I also made 3 guides related to this one. ------ -### CANAL +### CANALPlus -CANAL = CANAL+/MyCANAL +CANALPlus = CANAL+/MyCANAL ??? question "Canal+ - [CLICK TO EXPAND]" @@ -1603,7 +1603,7 @@ I also made 3 guides related to this one. ??? example "JSON - [CLICK TO EXPAND]" ```json - [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/french-canal.json' %]][[% endfilter %]] + [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/french-canalplus.json' %]][[% endfilter %]] ``` [TOP](#index) diff --git a/docs/json/sonarr/cf/french-canal.json b/docs/json/sonarr/cf/french-canalplus.json similarity index 100% rename from docs/json/sonarr/cf/french-canal.json rename to docs/json/sonarr/cf/french-canalplus.json diff --git a/includes/french-guide/sonarr-french-streaming-services-en.md b/includes/french-guide/sonarr-french-streaming-services-en.md index 06f99283a..beff64c63 100644 --- a/includes/french-guide/sonarr-french-streaming-services-en.md +++ b/includes/french-guide/sonarr-french-streaming-services-en.md @@ -1,9 +1,9 @@ ??? abstract "French Streaming Services - [CLICK TO EXPAND]" - | Custom Format | Trash ID | - | ------------------------------------------------------------------------------------------------ | ---------------------------------------------- | - | [{{ sonarr['cf']['french-canal']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#canal) | {{ sonarr['cf']['french-canal']['trash_id'] }} | - | [{{ sonarr['cf']['french-salto']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#salto) | {{ sonarr['cf']['french-salto']['trash_id'] }} | - | [{{ sonarr['cf']['french-rtbf']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#rtbf) | {{ sonarr['cf']['french-rtbf']['trash_id'] }} | + | Custom Format | Trash ID | + | -------------------------------------------------------------------------------------------------------- | -------------------------------------------------- | + | [{{ sonarr['cf']['french-canalplus']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#canalplus) | {{ sonarr['cf']['french-canalplus']['trash_id'] }} | + | [{{ sonarr['cf']['french-salto']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#salto) | {{ sonarr['cf']['french-salto']['trash_id'] }} | + | [{{ sonarr['cf']['french-rtbf']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#rtbf) | {{ sonarr['cf']['french-rtbf']['trash_id'] }} | ??? info "Info - [CLICK TO EXPAND]" diff --git a/includes/french-guide/sonarr-french-streaming-services-fr.md b/includes/french-guide/sonarr-french-streaming-services-fr.md index f4fc5fd81..c0990997f 100644 --- a/includes/french-guide/sonarr-french-streaming-services-fr.md +++ b/includes/french-guide/sonarr-french-streaming-services-fr.md @@ -1,9 +1,9 @@ ??? abstract "Services de streaming en français - [CLIQUEZ POUR AFFICHER]" - | Formats Personnalisés | Trash ID | - | ------------------------------------------------------------------------------------------------ | ---------------------------------------------- | - | [{{ sonarr['cf']['french-canal']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#canal) | {{ sonarr['cf']['french-canal']['trash_id'] }} | - | [{{ sonarr['cf']['french-salto']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#salto) | {{ sonarr['cf']['french-salto']['trash_id'] }} | - | [{{ sonarr['cf']['french-rtbf']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#rtbf) | {{ sonarr['cf']['french-rtbf']['trash_id'] }} | + | Formats Personnalisés | Trash ID | + | -------------------------------------------------------------------------------------------------------- | -------------------------------------------------- | + | [{{ sonarr['cf']['french-canalplus']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#canalplus) | {{ sonarr['cf']['french-canalplus']['trash_id'] }} | + | [{{ sonarr['cf']['french-salto']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#salto) | {{ sonarr['cf']['french-salto']['trash_id'] }} | + | [{{ sonarr['cf']['french-rtbf']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#rtbf) | {{ sonarr['cf']['french-rtbf']['trash_id'] }} | ??? info "Info - [CLICK TO EXPAND]"