diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 404ceac4f..22d3e72b8 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -10,17 +10,19 @@ These are mostly guidelines, not rules. Use your best judgment, and feel free to - Make sure you're editing the latest version. - If you propose changes make sure it doesn't break anything else in the Guides. - Make sure that after the changes you don't get any [markdownlint](https://github.com/markdownlint/markdownlint/blob/master/docs/RULES.md) errors +- If the `metadata.json` and `metadata.schema.json` needs changes, announce it first in the Discord `#development` channel and ping`voidpointer` and `nitsua` so the 3rd party apps don't break :bangbang: ## Radarr/Sonarr Custom Format (JSON) - Custom Format name needs to match json name :bangbang: -- No hashcode can exisist multiple times :bangbang: +- No hashcode can exists multiple times :bangbang: - JSON file names are always written in small letters, spaces are replaced by a dash, no spaces or special characters except a dash :bangbang: - When adding the hashcode for Radarr use the following naming `CF_name` on the following [link+example](https://md5.gromweb.com/?string=BR-DISK). - When adding the hashcode for Radarr Anime use the following naming `Radarr Anime CF_name` on the following [link+example](https://md5.gromweb.com/?string=Radarr+Anime+BR-DISK). - When adding the hashcode for Sonarr use the following naming `Sonarr CF_name` on the following [link+example](https://md5.gromweb.com/?string=Sonarr+BR-DISK). - When adding the hashcode for Sonarr Anime use the following naming `Sonarr Anime CF_name` on the following [link+example](https://md5.gromweb.com/?string=Sonarr+Anime+BR-DISK). - Provide a link to your regex example of your Custom Format using the following [Template](https://regex101.com/r/fXmQQm/1). +- When adding a RlsGRp to a Custom Format for what ever reason, please add in the PR why it's added/removed/moved. When adding a regex test case @@ -39,6 +41,11 @@ When updating or adding a new CF the test case url needs to be added to the json "name": "CF_name", ``` +## YAML file naming + +- If a hashcode is needed **No** hashcode can exist multiple times :bangbang: +- YAML file names are always written in small letters, spaces are replaced by a dash, no spaces or special characters except a dash :bangbang: + ## Recommendations - use [VSCode](https://code.visualstudio.com/) for editing with the following extension [markdownlint](https://marketplace.visualstudio.com/items?itemName=DavidAnson.vscode-markdownlint) diff --git a/docs/Radarr/radarr-setup-quality-profiles.md b/docs/Radarr/radarr-setup-quality-profiles.md index e00aa39f3..3aaa34a07 100644 --- a/docs/Radarr/radarr-setup-quality-profiles.md +++ b/docs/Radarr/radarr-setup-quality-profiles.md @@ -89,7 +89,7 @@ If you prefer High Quality HD Encodes (Bluray-720p/1080p) {! include-markdown "../../includes/cf/radarr-suggest-attention.md" !} -{! include-markdown "../../includes/cf/radarr-movie-versions.md" !} +{! include-markdown "../../includes/cf/radarr-movie-versions-imaxe.md" !} {! include-markdown "../../includes/cf/radarr-cf-hd-bluray-web-scoring.md" !} @@ -135,7 +135,7 @@ If you prefer High Quality UHD Encodes (Bluray-2160p) {! include-markdown "../../includes/cf/radarr-hdr-formats.md" !} -{! include-markdown "../../includes/cf/radarr-movie-versions.md" !} +{! include-markdown "../../includes/cf/radarr-movie-versions-imaxe.md" !} {! include-markdown "../../includes/cf/radarr-cf-uhd-bluray-web-scoring.md" !} @@ -179,7 +179,7 @@ If you prefer 1080p Remuxes (Remux-1080p) {! include-markdown "../../includes/cf/radarr-audio.md" !} -{! include-markdown "../../includes/cf/radarr-movie-versions.md" !} +{! include-markdown "../../includes/cf/radarr-movie-versions-imaxe.md" !} {! include-markdown "../../includes/cf/radarr-cf-remux-web-scoring.md" !} @@ -223,7 +223,7 @@ If you prefer 2160p Remuxes (Remux-2160p) {! include-markdown "../../includes/cf/radarr-hdr-formats.md" !} -{! include-markdown "../../includes/cf/radarr-movie-versions.md" !} +{! include-markdown "../../includes/cf/radarr-movie-versions-imaxe.md" !} {! include-markdown "../../includes/cf/radarr-cf-remux-web-scoring.md" !} diff --git a/docs/json/radarr/cf/sdr.json b/docs/json/radarr/cf/sdr.json index 6032b4198..aefccd030 100644 --- a/docs/json/radarr/cf/sdr.json +++ b/docs/json/radarr/cf/sdr.json @@ -19,7 +19,7 @@ "negate": true, "required": false, "fields": { - "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX|SiCFoI)\\b|\\b(PQ)\\b" + "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX|SICFoI)\\b|\\b(PQ)\\b|\\bHLG(\\b|\\d)" } }, { diff --git a/docs/json/sonarr/cf/sdr.json b/docs/json/sonarr/cf/sdr.json index 117259d1a..8a4231bc5 100644 --- a/docs/json/sonarr/cf/sdr.json +++ b/docs/json/sonarr/cf/sdr.json @@ -19,7 +19,7 @@ "negate": true, "required": false, "fields": { - "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX|SiCFoI)\\b|\\b(PQ)\\b" + "value": "\\bHDR(\\b|\\d)|\\b(dv|dovi|dolby[ .]?vision)\\b|\\b(FraMeSToR|HQMUX|SICFoI)\\b|\\b(PQ)\\b|\\bHLG(\\b|\\d)" } }, { diff --git a/docs/recyclarr-configs/radarr/hd_bluray_web.yml b/docs/recyclarr-configs/radarr/hd-bluray-web.yml similarity index 97% rename from docs/recyclarr-configs/radarr/hd_bluray_web.yml rename to docs/recyclarr-configs/radarr/hd-bluray-web.yml index 51388d4ba..a428fac46 100644 --- a/docs/recyclarr-configs/radarr/hd_bluray_web.yml +++ b/docs/recyclarr-configs/radarr/hd-bluray-web.yml @@ -17,6 +17,7 @@ radarr: - 9d27d9d2181838f76dee150882bdc58c # Masters of Cinema - 957d0f44b592285f26449575e8b1167e # Special Edition - eecf3a857724171f968a66cb5719e152 # IMAX + - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced # HQ Release Groups - ed27ebfef2f323e964fb1f61391bcb35 # HD Bluray Tier 01 - c20c8647f2746a1f4c4262b0fbbeeeae # HD Bluray Tier 02 diff --git a/docs/recyclarr-configs/radarr/remux_web_1080p.yml b/docs/recyclarr-configs/radarr/remux-web-1080p.yml similarity index 98% rename from docs/recyclarr-configs/radarr/remux_web_1080p.yml rename to docs/recyclarr-configs/radarr/remux-web-1080p.yml index 7c60dc762..17d20eaf7 100644 --- a/docs/recyclarr-configs/radarr/remux_web_1080p.yml +++ b/docs/recyclarr-configs/radarr/remux-web-1080p.yml @@ -32,6 +32,7 @@ radarr: - 9d27d9d2181838f76dee150882bdc58c # Masters of Cinema - 957d0f44b592285f26449575e8b1167e # Special Edition - eecf3a857724171f968a66cb5719e152 # IMAX + - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced # HQ Release Groups - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01 - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02 diff --git a/docs/recyclarr-configs/radarr/remux_web_2160p.yml b/docs/recyclarr-configs/radarr/remux-web-2160p.yml similarity index 98% rename from docs/recyclarr-configs/radarr/remux_web_2160p.yml rename to docs/recyclarr-configs/radarr/remux-web-2160p.yml index 09763a1e8..7e74ed7cb 100644 --- a/docs/recyclarr-configs/radarr/remux_web_2160p.yml +++ b/docs/recyclarr-configs/radarr/remux-web-2160p.yml @@ -47,6 +47,7 @@ radarr: - 9d27d9d2181838f76dee150882bdc58c # Masters of Cinema - 957d0f44b592285f26449575e8b1167e # Special Edition - eecf3a857724171f968a66cb5719e152 # IMAX + - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced # HQ Release Groups - 3a3ff47579026e76d6504ebea39390de # Remux Tier 01 - 9f98181fe5a3fbeb0cc29340da2a468a # Remux Tier 02 diff --git a/docs/recyclarr-configs/radarr/uhd_bluray_web.yml b/docs/recyclarr-configs/radarr/uhd-bluray-web.yml similarity index 98% rename from docs/recyclarr-configs/radarr/uhd_bluray_web.yml rename to docs/recyclarr-configs/radarr/uhd-bluray-web.yml index 3698c0c25..4f761ec3d 100644 --- a/docs/recyclarr-configs/radarr/uhd_bluray_web.yml +++ b/docs/recyclarr-configs/radarr/uhd-bluray-web.yml @@ -47,6 +47,7 @@ radarr: - 9d27d9d2181838f76dee150882bdc58c # Masters of Cinema - 957d0f44b592285f26449575e8b1167e # Special Edition - eecf3a857724171f968a66cb5719e152 # IMAX + - 9f6cbff8cfe4ebbc1bde14c7b7bec0de # IMAX Enhanced # HQ Release Groups - 4d74ac4c4db0b64bff6ce0cffef99bf0 # UHD Bluray Tier 01 - a58f517a70193f8e578056642178419d # UHD Bluray Tier 02 diff --git a/docs/recyclarr-configs/sonarr/french_anime_multi_v4.yml b/docs/recyclarr-configs/sonarr/french-anime-multi-v4.yml similarity index 100% rename from docs/recyclarr-configs/sonarr/french_anime_multi_v4.yml rename to docs/recyclarr-configs/sonarr/french-anime-multi-v4.yml diff --git a/docs/recyclarr-configs/sonarr/french_anime_vostfr_v4.yml b/docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml similarity index 100% rename from docs/recyclarr-configs/sonarr/french_anime_vostfr_v4.yml rename to docs/recyclarr-configs/sonarr/french-anime-vostfr-v4.yml diff --git a/docs/recyclarr-configs/sonarr/french_web_1080p_multi_v4.yml b/docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml similarity index 100% rename from docs/recyclarr-configs/sonarr/french_web_1080p_multi_v4.yml rename to docs/recyclarr-configs/sonarr/french-web-1080p-multi-v4.yml diff --git a/docs/recyclarr-configs/sonarr/french_web_1080p_vostfr_v4.yml b/docs/recyclarr-configs/sonarr/french-web-1080p-vostfr-v4.yml similarity index 100% rename from docs/recyclarr-configs/sonarr/french_web_1080p_vostfr_v4.yml rename to docs/recyclarr-configs/sonarr/french-web-1080p-vostfr-v4.yml diff --git a/docs/recyclarr-configs/sonarr/web_1080p_v4.yml b/docs/recyclarr-configs/sonarr/web-1080p-v4.yml similarity index 100% rename from docs/recyclarr-configs/sonarr/web_1080p_v4.yml rename to docs/recyclarr-configs/sonarr/web-1080p-v4.yml diff --git a/docs/recyclarr-configs/sonarr/web_2160p_v4.yml b/docs/recyclarr-configs/sonarr/web-2160p-v4.yml similarity index 100% rename from docs/recyclarr-configs/sonarr/web_2160p_v4.yml rename to docs/recyclarr-configs/sonarr/web-2160p-v4.yml diff --git a/docs/recyclarr-configs/templates.json b/docs/recyclarr-configs/templates.json index 8b89af476..faada2f3e 100644 --- a/docs/recyclarr-configs/templates.json +++ b/docs/recyclarr-configs/templates.json @@ -1,19 +1,19 @@ { "radarr": [ { - "template": "radarr/hd_bluray_web.yml", + "template": "radarr/hd-bluray-web.yml", "id": "hd-bluray-web" }, { - "template": "radarr/uhd_bluray_web.yml", + "template": "radarr/uhd-bluray-web.yml", "id": "uhd-bluray-web" }, { - "template": "radarr/remux_web_1080p.yml", + "template": "radarr/remux-web-1080p.yml", "id": "remux-web-1080p" }, { - "template": "radarr/remux_web_2160p.yml", + "template": "radarr/remux-web-2160p.yml", "id": "remux-web-2160p" }, { @@ -39,27 +39,27 @@ ], "sonarr": [ { - "template": "sonarr/french_anime_multi_v4.yml", + "template": "sonarr/french-anime-multi-v4.yml", "id": "french-anime-multi-v4" }, { - "template": "sonarr/french_anime_vostfr_v4.yml", + "template": "sonarr/french-anime-vostfr-v4.yml", "id": "french-anime-vostfr-v4" }, { - "template": "sonarr/french_web_1080p_multi_v4.yml", + "template": "sonarr/french-web-1080p-multi-v4.yml", "id": "french-web-1080p-multi-v4" }, { - "template": "sonarr/french_web_1080p_vostfr_v4.yml", + "template": "sonarr/french-web-1080p-vostfr-v4.yml", "id": "french-web-1080p-vostfr-v4" }, { - "template": "sonarr/web_1080p_v4.yml", + "template": "sonarr/web-1080p-v4.yml", "id": "web-1080p-v4" }, { - "template": "sonarr/web_2160p_v4.yml", + "template": "sonarr/web-2160p-v4.yml", "id": "web-2160p-v4" } ] diff --git a/docs/updates.txt b/docs/updates.txt index 10bdf4709..f4759ade0 100644 --- a/docs/updates.txt +++ b/docs/updates.txt @@ -1,3 +1,24 @@ +# 2023-02-17 22:40 +**[New]** +- None + +**[Updated]** +- None + +**[Fixed]** +- [Starr] Added `HLG(10)` to CF `SDR` - For proper scoring + +# 2023-02-17 14:50 +**[New]** +- [Sonarr] Added Comedy Central streaming service to the Sonarr custom formats and release propfile. + +**[Updated]** +- [Radarr] Added RlsGrp `PiRaTeS` to CF 'LQ' - We have been seeing releases from this group lately and their releases seem pretty low quality (artifacting in dark scenes). +- [Radarr] Added RlsGrp `TvR` to CF `Bad Dual Audio` - Because first audio is always german despite not being labeled as such. + +**[Fixed]** +- None + # 2023-02-07 20:45 **[New]** - None diff --git a/metadata.json b/metadata.json index c9720ba8e..fb53e56c3 100644 --- a/metadata.json +++ b/metadata.json @@ -11,9 +11,9 @@ "custom_formats": ["docs/json/sonarr/cf"], "qualities": ["docs/json/sonarr/quality-size"], "naming": ["docs/json/sonarr/naming"] - }, - "recyclarr": { - "templates": "docs/recyclarr-configs" } + }, + "recyclarr": { + "templates": "docs/recyclarr-configs" } } diff --git a/metadata.schema.json b/metadata.schema.json index a0d7cc636..6c050c516 100644 --- a/metadata.schema.json +++ b/metadata.schema.json @@ -10,10 +10,10 @@ "additionalProperties": false, "properties": { "radarr": { "$ref": "#/$defs/radarr" }, - "sonarr": { "$ref": "#/$defs/sonarr" }, - "recyclarr": { "$ref": "#/$defs/recyclarr" } + "sonarr": { "$ref": "#/$defs/sonarr" } } - } + }, + "recyclarr": { "$ref": "#/$defs/recyclarr" } }, "$defs": { "paths_object": {