diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 36e02ab6a..87addf31c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,12 +1,27 @@ -name: Deploy docs to GitHub Pages via mkdocs +name: Build mkdocs and deploy to GitHub Pages -on: - push: - branches: - - master +on: [push, pull_request] jobs: + + build: + name: Build docs + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: 3.x + - uses: actions/cache@v3 + with: + key: ${{ github.ref }} + path: .cache + - run: pip install -r docs/requirements.txt + - run: mkdocs build + deploy: + if: github.event_name == 'push' && contains(fromJson('["refs/heads/master", "refs/heads/main"]'), github.ref) + needs: build name: Deploy docs runs-on: ubuntu-latest steps: @@ -16,5 +31,9 @@ jobs: - uses: actions/setup-python@v4 with: python-version: 3.x + - uses: actions/cache@v3 + with: + key: ${{ github.ref }} + path: .cache - run: pip install -r docs/requirements.txt - run: mkdocs gh-deploy --force diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9f2de53c5..8567269ab 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -3,13 +3,16 @@ name: Lint on: [push, pull_request] jobs: + editorconfig-checker: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: editorconfig-checker run: | - docker run --rm -v ${GITHUB_WORKSPACE}:/check mstruebing/editorconfig-checker + docker run --rm \ + -v "${GITHUB_WORKSPACE}":/check \ + mstruebing/editorconfig-checker markdownlint: runs-on: ubuntu-latest @@ -17,7 +20,12 @@ jobs: - uses: actions/checkout@v3 - name: markdownlint run: | - find ~+ ${github_workspace} -name '*.md' | xargs docker run --rm -v ${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE} markdownlint/markdownlint -r ~MD013,~MD033,~MD034,~MD046,~MD002,~MD041 + find "${GITHUB_WORKSPACE}" -name '*.md' -exec \ + docker run --rm \ + -v "${GITHUB_WORKSPACE}":"${GITHUB_WORKSPACE}" \ + markdownlint/markdownlint \ + -r ~MD013,~MD033,~MD034,~MD046,~MD002,~MD041 \ + {} + yamllint: runs-on: ubuntu-latest @@ -25,4 +33,9 @@ jobs: - uses: actions/checkout@v3 - name: yamllint run: | - find ~+ ${github_workspace} -name '*.yaml' -o -name '*.yml' | xargs docker run --rm -v ${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE} peterdavehello/yamllint yamllint -d '{extends: default, rules: {document-start: {present: false}, line-length: disable}}' + find "${GITHUB_WORKSPACE}" -name '*.yaml' -o -name '*.yml' -exec \ + docker run --rm \ + -v "${GITHUB_WORKSPACE}":"${GITHUB_WORKSPACE}" \ + peterdavehello/yamllint \ + yamllint -d '{"extends":"default","rules":{"document-start":{"present":false},"line-length":"disable","truthy":{"check-keys":false}}}' \ + {} + diff --git a/.gitignore b/.gitignore index 6cab88bd4..6a3666d23 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -venv/ +.cache +venv/ mkdocs-dev-server.bat /docs/Notifiarr/preview.bat /docs/Notifiarr/Integrations/_TEMPLATE.md diff --git a/docs/Hardlinks/How-to-setup-for/Synology.md b/docs/Hardlinks/How-to-setup-for/Synology.md index cf7517c85..3b5c51f99 100644 --- a/docs/Hardlinks/How-to-setup-for/Synology.md +++ b/docs/Hardlinks/How-to-setup-for/Synology.md @@ -25,7 +25,9 @@ This page will provide you with guidance on how to install several Docker images **:bangbang: We are not held reliable if anything breaks on your system. Use at your own risk :bangbang:** - To get this working you will need to enable terminal access (SSH) and home folders + To get this working you will need to enable terminal access (SSH) and home folders. + + Be sure to delete current running Docker containers related to this guide (ie. *arr apps, download clients), backup settings before you do. To enable SSH on your Synology take a look [HERE](#ssh){:target="_blank" rel="noopener noreferrer"}. diff --git a/docs/Misc/trash-sync.md b/docs/Misc/trash-sync.md index 8a0cbcb00..75ea88ade 100644 --- a/docs/Misc/trash-sync.md +++ b/docs/Misc/trash-sync.md @@ -29,7 +29,7 @@ Just enable the Custom Formats/Release Profiles you want. ![!Notifiarr Custom Formats Audio](images/sync/notifiarr-cf-audio.png) Radarr Custom Formats (Multiple Instances possible) - ![!Notifiarr Custom Formats HDR Metadata](images/sync/notifiarr-cf-audio.png) + ![!Notifiarr Custom Formats HDR Formats](images/sync/notifiarr-cf-hdr.png) Radarr scoring (Multiple profiles possible) ![!Notifiarr Scores](images/sync/notifiarr-scores.png) diff --git a/docs/Radarr/Radarr-collection-of-custom-formats.md b/docs/Radarr/Radarr-collection-of-custom-formats.md index a004fef19..ced7f9c49 100644 --- a/docs/Radarr/Radarr-collection-of-custom-formats.md +++ b/docs/Radarr/Radarr-collection-of-custom-formats.md @@ -33,7 +33,7 @@ I also made 3 guides related to this one. ------ -| Audio Advanced #1 | Audio Advanced #2 | Audio Channels | HDR Metadata | +| Audio Advanced #1 | Audio Advanced #2 | Audio Channels | HDR Formats | | ------------------------------------- | ------------------------- | ---------------------------- | --------------------------------- | | [TrueHD ATMOS](#truehd-atmos) | [FLAC](#flac) | [1.0 Mono](#10-mono) | [DV HDR10](#dv-hdr10) | | [DTS X](#dts-x) | [PCM](#pcm) | [2.0 Stereo](#20-stereo) | [DV](#dv) | @@ -456,7 +456,7 @@ I also made 3 guides related to this one. ------ -## HDR metadata +## HDR Formats ------ @@ -888,14 +888,14 @@ I also made 3 guides related to this one. ??? faq "x265 (HD) - [CLICK TO EXPAND]" - This blocks/ignores 720/1080p(HD) releases that are encoded in x265. + This blocks 720/1080p (HD) releases that are encoded in x265. In your quality profile use the following score for this Custom Format: `{{ radarr['cf']['x265-hd']['trash_score'] }}` !!! fail "" --8<-- "includes/docker/x265.md" - !!! Danger "Don't use this together with the following Custom Format [{{ radarr['cf']['x265-no-hdrdv']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-no-hdrdv) :warning:" + !!! Danger "Don't use this together with [{{ radarr['cf']['x265-no-hdrdv']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-no-hdrdv), Only ever include one of them :warning:" ??? example "JSON - [CLICK TO EXPAND]" @@ -911,15 +911,15 @@ I also made 3 guides related to this one. ??? faq "x265 (no HDR/DV) - [CLICK TO EXPAND]" - This blocks/ignores 720/1080p (HD) releases that are encoded in x265. + This blocks 720/1080p (HD) releases that are encoded in x265. - **but it will allow to exclude/bypass if it has HDR and/or DV** + **But it will allow x265 releases if they have HDR and/or DV** *Being that some NF releases won't be released as 4k, but you want to have DV/HDR releases.* In your quality profile use the following score for this Custom Format: `{{ radarr['cf']['x265-no-hdrdv']['trash_score'] }}` - !!! Danger "Don't use this together with the following Custom Format [{{ radarr['cf']['x265-hd']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-hd) :warning:" + !!! Danger "Don't use this together with [{{ radarr['cf']['x265-hd']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-hd), Only ever include one of them :warning:" ??? example "JSON - [CLICK TO EXPAND]" diff --git a/docs/Radarr/Radarr-import-custom-formats.md b/docs/Radarr/Radarr-import-custom-formats.md index 8b9b5ea14..ab144f1f9 100644 --- a/docs/Radarr/Radarr-import-custom-formats.md +++ b/docs/Radarr/Radarr-import-custom-formats.md @@ -51,6 +51,11 @@ all you need to do now is click on the `Save` button and you're done. ![cf-import-done](images/cf-import-done.png) +### Setup the scores in your Quality Profile + +After you've added the Custom Formats, You will need to set it up in the Quality Profile you want to use/prefer to make use of the Custom Formats. +How this is done is explained [HERE](/Radarr/Radarr-setup-custom-formats/#basics){:target="_blank" rel="noopener noreferrer"} + ------ ## Start adding other Custom Formats wisely diff --git a/docs/Radarr/Radarr-setup-custom-formats.md b/docs/Radarr/Radarr-setup-custom-formats.md index 23d9bc070..f69756353 100644 --- a/docs/Radarr/Radarr-setup-custom-formats.md +++ b/docs/Radarr/Radarr-setup-custom-formats.md @@ -88,13 +88,13 @@ In this example I have lossy Atmos over lossless DTS because the object metadata ------ -#### Prefer HDR Metadata +#### Prefer HDR Formats -Lets say you prefer HDR metadata (HDR or Dolby Vision or Both) +Lets say you prefer HDR Formats (HDR or Dolby Vision or Both) Then we would use the following order: -{! include-markdown "../../includes/cf/radarr-hdr-metadata.md" !} +{! include-markdown "../../includes/cf/radarr-hdr-formats.md" !} ------ @@ -151,7 +151,7 @@ The reason why I didn't select the WEB-DL 720p is because you will hardly find a If you prefer 2160/4K encodes you might consider to change `Upgrade Until Quality` to Bluray-2160p and enable: - {! include-markdown "../../includes/cf/radarr-hdr-metadata.md" !} + {! include-markdown "../../includes/cf/radarr-hdr-formats.md" !} ------ @@ -210,7 +210,7 @@ For this Quality Profile we're going to make use of the following Custom Formats {! include-markdown "../../includes/cf/radarr-audio.md" !} -{! include-markdown "../../includes/cf/radarr-hdr-metadata.md" !} +{! include-markdown "../../includes/cf/radarr-hdr-formats.md" !} {! include-markdown "../../includes/cf/radarr-movie-versions.md" !} diff --git a/docs/Sonarr/Sonarr-setup-custom-formats-Anime.md b/docs/Sonarr/Sonarr-setup-custom-formats-Anime.md deleted file mode 100644 index ac4ac1f44..000000000 --- a/docs/Sonarr/Sonarr-setup-custom-formats-Anime.md +++ /dev/null @@ -1,83 +0,0 @@ -# How to setup Custom Formats (Anime) - -!!! attention - You must be running Sonarr V4 to be able to use this setup - -!!! note - This guide is created and maintained by [FonduemangVI](https://github.com/FonduemangVI) and [rg9400](https://github.com/rg9400) - - It's recommended to run two Sonarr instances. One for Anime and one for normal tv shows, or you can make use of Quality Profiles and score different CFs as required - -## Media Management - -### Recommended naming scheme - -For the Recommended naming scheme please go [HERE](/Sonarr/Sonarr-recommended-naming-scheme/#anime-episode-format){:target="_blank" rel="noopener noreferrer"} - ---- - -## Quality Settings - -For quality settings please refer to [Sonarr Quality Definitions - Anime](/Sonarr/Sonarr-quality-settings-file-size/#sonarr-quality-definitions-anime-work-in-progress){:target="_blank" rel="noopener noreferrer"} - ---- - -## Quality Profile - -We need to create a new profile called `Remux-1080p - Anime` due to the way anime can be named we will need to merge a few qualities together see [here](/Sonarr/Tips/Merge-quality/){:target="_blank" rel="noopener noreferrer"} for an example. We need to add `Bluray-1080p Remux` and `Bluray-1080p` into a group together, and `HDTV-1080p` into the same group as `WEBDL-1080p` and `WEBRip-1080p` so that scoring will work correctly. - -Go to `Settings` => `Profiles` - -??? check "example - [CLICK TO EXPAND]" - ![!cf-settings-profiles](images/cf-settings-profiles.png) - -![!cfa-mergedqualities](images/cfa-mergedqualities.png) - -We then need to select and organise qualities as below - -![!cfa-qualityorder](images/cfa-qualityorder.png) - -Make sure Upgrades Allowed is ticked then set the Upgrade Until section to `Bluray-1080p` and the Upgrade Until Custom Format Score to `10000` - -After this has been done your profile should look like below - -![!cfa-qualityprofile](images/cfa-qualityprofile.png) - ---- - -## Custom Formats - -!!! note - We're going to make use of the below custom formats. See [How to import Custom Formats](/Sonarr/Sonarr-import-custom-formats/){:target="_blank" rel="noopener noreferrer"} for how to import the custom formats - -{! include-markdown "../../includes/cf/sonarr-anime.md" !} - - -The scoring that has been set is the recommended scoring however some of the CFs are optional depending on what you prefer. -`Anime Dual Audio`, `Uncensored` and `10bit` can be given scores if you want to prefer content with these attributes - -Once the custom formats have been imported you can set the scores as above. To do this go to `Settings` => `Profiles` and select the Remux-1080p - Anime profile that was setup before - -??? check "example - [CLICK TO EXPAND]" - ![!cf-settings-profiles](images/cfa-settings-profiles.png) - -In the profile enter the scores as per the above table in this section. - -![!cfa-scoring](images/cfa-scoring.png) - -After you are done it should look like the image above - -### Acknowledgements - -Most of my information and knowledge came from: - -- rg9400 (Building the regex, anime groups and general knowledge share.) - -- Drazzilb (Guidance on anime groups, testing and general knowledge share.) - -- [TRaSH](https://trash-guides.info/) (For allowing me to utilize his website for our guide and general knowledge share.) - -Thanks a bunch!! - -{! include-markdown "../../includes/support.md" !} - diff --git a/docs/Sonarr/images/cfa-mergedqualities.png b/docs/Sonarr/images/cfa-mergedqualities.png index 93d4567de..c6aa13f31 100644 Binary files a/docs/Sonarr/images/cfa-mergedqualities.png and b/docs/Sonarr/images/cfa-mergedqualities.png differ diff --git a/docs/Sonarr/images/cfa-prefixedrange.png b/docs/Sonarr/images/cfa-prefixedrange.png new file mode 100644 index 000000000..463e1ea43 Binary files /dev/null and b/docs/Sonarr/images/cfa-prefixedrange.png differ diff --git a/docs/Sonarr/images/cfa-qualityorder.png b/docs/Sonarr/images/cfa-qualityorder.png index 1377f6b38..0812aa12a 100644 Binary files a/docs/Sonarr/images/cfa-qualityorder.png and b/docs/Sonarr/images/cfa-qualityorder.png differ diff --git a/docs/Sonarr/images/cfa-qualityprofile.png b/docs/Sonarr/images/cfa-qualityprofile.png index 958f5b270..ee18b7d11 100644 Binary files a/docs/Sonarr/images/cfa-qualityprofile.png and b/docs/Sonarr/images/cfa-qualityprofile.png differ diff --git a/docs/Sonarr/Sonarr-collection-of-custom-formats.md b/docs/Sonarr/sonarr-collection-of-custom-formats.md similarity index 98% rename from docs/Sonarr/Sonarr-collection-of-custom-formats.md rename to docs/Sonarr/sonarr-collection-of-custom-formats.md index 690fff2b6..7e4534d26 100644 --- a/docs/Sonarr/Sonarr-collection-of-custom-formats.md +++ b/docs/Sonarr/sonarr-collection-of-custom-formats.md @@ -8,9 +8,9 @@ With Sonarr V4+, Custom Formats are much more advanced/powerful than with the re I also made 3 guides related to this one. -- [How to import Custom Formats](/Sonarr/Sonarr-import-custom-formats){:target="_blank" rel="noopener noreferrer"}. Where I will try to explain how to import the Custom Formats. -- [How to upgrade Custom Formats](/Sonarr/Sonarr-how-to-update-custom-formats){:target="_blank" rel="noopener noreferrer"}. Where I will try to explain how to upgrade your existing Custom Formats. -- [How to setup Custom Formats](/Sonarr/Sonarr-setup-custom-formats){:target="_blank" rel="noopener noreferrer"}. Where I will try to explain how to make the most use of Custom Formats and show some personal examples that I'm using. You can use these to get an idea on how to setup your own. +- [How to import Custom Formats](/Sonarr/sonarr-import-custom-formats){:target="_blank" rel="noopener noreferrer"}. Where I will try to explain how to import the Custom Formats. +- [How to upgrade Custom Formats](/Sonarr/sonarr-how-to-update-custom-formats){:target="_blank" rel="noopener noreferrer"}. Where I will try to explain how to upgrade your existing Custom Formats. +- [How to setup Custom Formats](/Sonarr/sonarr-setup-custom-formats){:target="_blank" rel="noopener noreferrer"}. Where I will try to explain how to make the most use of Custom Formats and show some personal examples that I'm using. You can use these to get an idea on how to setup your own. !!! tip @@ -30,7 +30,7 @@ I also made 3 guides related to this one. ------ -| Audio Advanced #1 | Audio Advanced #2 | Audio Channels | HDR Metadata | +| Audio Advanced #1 | Audio Advanced #2 | Audio Channels | HDR Formats | | ------------------------------------- | ------------------------- | ---------------------------- | --------------------------------- | | [TrueHD ATMOS](#truehd-atmos) | [FLAC](#flac) | [1.0 Mono](#10-mono) | [DV HDR10](#dv-hdr10) | | [DTS X](#dts-x) | [PCM](#pcm) | [2.0 Stereo](#20-stereo) | [DV](#dv) | @@ -473,7 +473,7 @@ I also made 3 guides related to this one. ------ -## HDR metadata +## HDR Formats ------ @@ -806,7 +806,7 @@ I also made 3 guides related to this one. !!! fail "" --8<-- "includes/docker/x265.md" - !!! Danger "Don't use this together with the following Custom Format [{{ sonarr['cf']['x265-no-hdrdv']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#x265-no-hdrdv) :warning:" + !!! Danger "Don't use this together with [{{ sonarr['cf']['x265-no-hdrdv']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#x265-no-hdrdv), Only ever include one of them :warning:" ??? example "JSON - [CLICK TO EXPAND]" @@ -824,13 +824,13 @@ I also made 3 guides related to this one. This blocks/ignores 720/1080p (HD) releases that are encoded in x265. - **but it will allow to exclude/bypass if it has HDR and/or DV** + **But it will allow x265 releases if they have HDR and/or DV** *Being that some NF releases won't be released as 4k, but you want to have DV/HDR releases.* In your quality profile use the following score for this Custom Format: `{{ sonarr['cf']['x265-no-hdrdv']['trash_score'] }}` - !!! Danger "Don't use this together with the following Custom Format [{{ sonarr['cf']['x265-hd']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#x265-hd) :warning:" + !!! Danger "Don't use this together with [{{ sonarr['cf']['x265-hd']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#x265-hd), Only ever include one of them :warning:" ??? example "JSON - [CLICK TO EXPAND]" diff --git a/docs/Sonarr/Sonarr-how-to-update-custom-formats.md b/docs/Sonarr/sonarr-how-to-update-custom-formats.md similarity index 92% rename from docs/Sonarr/Sonarr-how-to-update-custom-formats.md rename to docs/Sonarr/sonarr-how-to-update-custom-formats.md index 2c27590c8..427c8483e 100644 --- a/docs/Sonarr/Sonarr-how-to-update-custom-formats.md +++ b/docs/Sonarr/sonarr-how-to-update-custom-formats.md @@ -6,7 +6,7 @@ Here I will try to explain how you can manually update Custom Formats for Sonarr ## How to Copy/Paste the JSON -The manual way is almost the same as the Import Custom Format way found [HERE](/Sonarr/Sonarr-import-custom-formats/){:target="_blank" rel="noopener noreferrer"} +The manual way is almost the same as the Import Custom Format way found [HERE](/Sonarr/sonarr-import-custom-formats/){:target="_blank" rel="noopener noreferrer"} ### In Sonarr @@ -20,7 +20,7 @@ The manual way is almost the same as the Import Custom Format way found [HERE](/ ### Paste the Custom Format -In the empty `Custom Format JSON` box (1) you just paste the `JSON` that you got from the [Custom Format Collection](/Sonarr/Sonarr-collection-of-custom-formats/){:target="_blank" rel="noopener noreferrer"} or provided to you from other sources followed by the `Import` button (2). +In the empty `Custom Format JSON` box (1) you just paste the `JSON` that you got from the [Custom Format Collection](/Sonarr/sonarr-collection-of-custom-formats/){:target="_blank" rel="noopener noreferrer"} or provided to you from other sources followed by the `Import` button (2). ![cf-import-cf](images/cf-import-cf.png) diff --git a/docs/Sonarr/Sonarr-import-custom-formats.md b/docs/Sonarr/sonarr-import-custom-formats.md similarity index 79% rename from docs/Sonarr/Sonarr-import-custom-formats.md rename to docs/Sonarr/sonarr-import-custom-formats.md index 95a5f7157..28be45c8d 100644 --- a/docs/Sonarr/Sonarr-import-custom-formats.md +++ b/docs/Sonarr/sonarr-import-custom-formats.md @@ -6,9 +6,9 @@ Here I will try to explain how you can manually import Custom Formats for Sonarr ## How to Copy/Paste the JSON from the site -In this example I will use the [{{ sonarr['cf']['br-disk']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#br-disk){:target="_blank" rel="noopener noreferrer"} Custom Format, the one most people don't want to download anyway. And if you do, then you probably don't use any of the Starr apps or Plex, being both don't support it. +In this example I will use the [{{ sonarr['cf']['br-disk']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#br-disk){:target="_blank" rel="noopener noreferrer"} Custom Format, the one most people don't want to download anyway. And if you do, then you probably don't use any of the Starr apps or Plex, being both don't support it. -Visit the [Collection of Custom Formats](/Sonarr/Sonarr-collection-of-custom-formats/){:target="_blank" rel="noopener noreferrer"} and select [{{ sonarr['cf']['br-disk']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#br-disk){:target="_blank" rel="noopener noreferrer"} from the table. +Visit the [Collection of Custom Formats](/Sonarr/sonarr-collection-of-custom-formats/){:target="_blank" rel="noopener noreferrer"} and select [{{ sonarr['cf']['br-disk']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#br-disk){:target="_blank" rel="noopener noreferrer"} from the table. ![cf-table-select-brdisk](images/cf-table-select-brdisk.png) @@ -40,7 +40,7 @@ Followed by the `Import` in the lower left. ### Paste the Custom Format -Paste the `JSON` in the empty `Custom Format JSON` box (1) that you got from the [Custom Format Collection](/Sonarr/Sonarr-collection-of-custom-formats/){:target="_blank" rel="noopener noreferrer"} followed by the `Import` button (2). +Paste the `JSON` in the empty `Custom Format JSON` box (1) that you got from the [Custom Format Collection](/Sonarr/sonarr-collection-of-custom-formats/){:target="_blank" rel="noopener noreferrer"} followed by the `Import` button (2). ![cf-import-cf](images/cf-import-cf.png) @@ -51,6 +51,11 @@ all you need to do now is click on the `Save` button and you're done. ![cf-import-done](images/cf-import-done.png) +### Setup the scores in your Quality Profile + +After you've added the Custom Formats, You will need to set it up in the Quality Profile you want to use/prefer to make use of the Custom Formats. +How this is done is explained [HERE](/Sonarr/sonarr-setup-custom-formats/#basics){:target="_blank" rel="noopener noreferrer"} + ------ ## Start adding other Custom Formats wisely @@ -59,7 +64,7 @@ all you need to do now is click on the `Save` button and you're done. Start adding more Custom Formats wisely, **Don't add all the available Custom Formats!!!** - Check out the [How to setup Custom Formats](/Sonarr/Sonarr-setup-custom-formats/) where I will explain how to make the most use of custom formats and show some personal examples that I'm using. You can use these examples to get an idea on how to setup yours. + Check out the [How to setup Custom Formats](/Sonarr/sonarr-setup-custom-formats/) where I will explain how to make the most use of custom formats and show some personal examples that I'm using. You can use these examples to get an idea on how to setup yours. ### TRaSH Sync diff --git a/docs/Sonarr/sonarr-setup-custom-formats-anime.md b/docs/Sonarr/sonarr-setup-custom-formats-anime.md new file mode 100644 index 000000000..62043c154 --- /dev/null +++ b/docs/Sonarr/sonarr-setup-custom-formats-anime.md @@ -0,0 +1,139 @@ +# How to setup Custom Formats (Anime) + +!!! attention + You must be running Sonarr V4 to be able to use this setup + +![V4](https://img.shields.io/badge/dynamic/json?query=%24.version&url=https://raw.githubusercontent.com/hotio/sonarr/v4/VERSION.json&label=Current%20V4%20Version&style=for-the-badge&color=4051B5) + +!!! note + This guide is created and maintained by [FonduemangVI](https://github.com/FonduemangVI) and [rg9400](https://github.com/rg9400) + + It's recommended to run two Sonarr instances. One for Anime and one for normal TV shows, or you can make use of Quality Profiles and score different Custom Formats (CFs) as required. + +The aim of this guide is to grab the best release overall (as per [SeaDex](https://sneedex.moe/){:target="_blank" rel="noopener noreferrer"}) and not necessarily just dual audio. +The vast majority of releases can be found on [Nyaa](https://nyaa.si/){:target="_blank" rel="noopener noreferrer"} or [AB](https://animebytes.tv/){:target="_blank" rel="noopener noreferrer"} + +!!! note + Nyaa is a public tracker while AB is an invite only tracker. + +--- + +## Media Management + +### Recommended naming scheme + +```bash +{Series TitleYear} - S{season:00}E{episode:00} - {absolute:000} - {Episode CleanTitle} [{Custom Formats }{Quality Full}]{[MediaInfo VideoDynamicRangeType]}[{MediaInfo VideoBitDepth}bit]{[MediaInfo VideoCodec]}[{Mediainfo AudioCodec} { Mediainfo AudioChannels}]{MediaInfo AudioLanguages}{-Release Group} +``` + +??? summary "Results: - [Click to Expand]" + + Single Episode: + + `The Series Title! (2010) - S01E01 - 001 - Episode Title 1 [Surround Sound x264 HDTV-720p v2][10bit][AVC][DTS 5.1][JA]-RlsGrp` + + Multi Episode: + + `The Series Title! (2010) - S01E01-E03 - 001-003 - Episode Title [Surround Sound x264 HDTV-720p v2][10bit][AVC][DTS 5.1][JA]-RlsGrp` + +#### Series Folder Format + +```bash +{Series TitleYear} +``` + +Result: + +`The Series Title! (2010)` + +#### Season Folder Format + +```bash +Season {season:00} +``` + +Result: + +`Season 01` + +#### Multi-Episode Style + +```bash +Prefixed Range +``` + +Result: + +![result](images/cfa-prefixedrange.png) + +--- + +## Quality Settings + +For quality settings please refer to [Sonarr Quality Definitions - Anime](/Sonarr/Sonarr-Quality-Settings-File-Size/#sonarr-quality-definitions-anime-work-in-progress){:target="_blank" rel="noopener noreferrer"} + +--- + +## Quality Profile + +We need to create a new profile called `Remux-1080p - Anime` due to the way anime can be named we will need to merge a few qualities together see [here](/Sonarr/Tips/Merge-quality/){:target="_blank" rel="noopener noreferrer"} for an example. + +We need to add `Bluray-1080p Remux` and `Bluray-1080p` into a group together, and `HDTV-1080p` into the same group as `WEBDL-1080p` and `WEBRip-1080p` so that scoring will work correctly. + +Go to `Settings` => `Profiles` + +??? check "example - [Click to Expand]" + ![!cf-settings-profiles](images/cfa-settings-profiles.png) + +![!cfa-mergedqualities](images/cfa-mergedqualities.png) + +We then need to select and organise qualities as below. + +![!cfa-qualityorder](images/cfa-qualityorder.png) + +Make sure `Upgrades Allowed` is ticked then set the `Upgrade Until` section to `Bluray-1080p` and the `Upgrade Until Custom Format Score` to `10000` + +After this has been done your profile should look like below. + +![!cfa-qualityprofile](images/cfa-qualityprofile.png) + +--- + +## Anime CF/Scoring + +!!! note + We're going to make use of the below custom formats. See [How to import Custom Formats](/Sonarr/sonarr-import-custom-formats/){:target="_blank" rel="noopener noreferrer"} for how to import them. + +{! include-markdown "../../includes/cf/sonarr-anime.md" !} + + +The scoring that has been set is the recommended scoring, however some of the CFs are optional depending on what you prefer. +`Anime Dual Audio`, `Uncensored` and `10bit` can be given postive scores if you want to prefer content with these attributes. + +`Anime Raws` and `Dubs Only` are optional negative scores, if you prefer these attributes you can give them a positive score. + +Once the custom formats have been imported you can set the scores as above. To do this go to `Settings` => `Profiles` and select the `Remux-1080p - Anime` profile that was setup before. + +??? check "example - [Click to Expand]" + ![!cf-settings-profiles](images/cfa-settings-profiles.png) + +In the profile enter the scores as per the above table in this section. + +![!cfa-scoring](images/cfa-scoring.png) + +After you are done it should look like the image above. + +### Acknowledgements + +Most of my information and knowledge came from: + +- rg9400 (Building the Custom Formats, Guidance on anime groups and general knowledge share.) + +- V01 from SeaDex (Guidance on anime groups and general knowledge share.) + +- Drazzilb (Guidance on anime groups, testing and general knowledge share.) + +- [TRaSH](https://trash-guides.info/) (For allowing me to utilize his website for our guide and general knowledge share.) + +{! include-markdown "../../includes/support.md" !} + diff --git a/docs/Sonarr/Sonarr-setup-custom-formats.md b/docs/Sonarr/sonarr-setup-custom-formats.md similarity index 93% rename from docs/Sonarr/Sonarr-setup-custom-formats.md rename to docs/Sonarr/sonarr-setup-custom-formats.md index e187fcb55..40bb37c4e 100644 --- a/docs/Sonarr/Sonarr-setup-custom-formats.md +++ b/docs/Sonarr/sonarr-setup-custom-formats.md @@ -12,7 +12,7 @@ Here I will try to explain with some personal used examples how to make the most ## Basics -After you've added the Custom Formats, as explained in [How to import Custom Formats](/Sonarr/Sonarr-import-custom-formats/){:target="_blank" rel="noopener noreferrer"}. +After you've added the Custom Formats, as explained in [How to import Custom Formats](/Sonarr/sonarr-import-custom-formats/){:target="_blank" rel="noopener noreferrer"}. You will need to set it up in the quality Profile you want to use/prefer to make use of the Custom Formats. `Settings` => `Profiles` @@ -63,7 +63,7 @@ At the bottom in your chosen profile you will see the added Custom Formats where Here I will explain how to make the most use of Custom Formats and show you some personal examples that I'm using. You can use these to get an idea on how to setup your own. -All these examples make use of the [Collection of Custom Formats](/Sonarr/Sonarr-collection-of-custom-formats/){:target="_blank" rel="noopener noreferrer"} +All these examples make use of the [Collection of Custom Formats](/Sonarr/sonarr-collection-of-custom-formats/){:target="_blank" rel="noopener noreferrer"} --8<-- "includes/cf/score-attention.md" @@ -77,13 +77,13 @@ This is a must have for every Quality Profile you use in my opinion. All these C ------ -#### Prefer HDR Metadata +#### Prefer HDR Formats -Lets say you prefer HDR metadata (HDR or Dolby Vision or Both) +Lets say you prefer HDR Formats (HDR or Dolby Vision or Both) Then we would use the following order: -{! include-markdown "../../includes/cf/sonarr-hdr-metadata.md" !} +{! include-markdown "../../includes/cf/sonarr-hdr-formats.md" !} ------ @@ -140,7 +140,7 @@ If you think the sizes are too big to your preference then stop reading and see For this Quality Profile we're going to make use of the following Custom Formats -{! include-markdown "../../includes/cf/sonarr-hdr-metadata.md" !} +{! include-markdown "../../includes/cf/sonarr-hdr-formats.md" !} {! include-markdown "../../includes/cf/sonarr-unwanted.md" !} @@ -157,7 +157,7 @@ Use the following main settings in your profile. !!! info "" The reason why I have WEB 1080p merged with the 2160p is because some NF releases won't be released as 4k, but I still want to have DV/HDR releases. - If you want to do the same make sure you replace [x265 (HD)](/Sonarr/Sonarr-collection-of-custom-formats/#x265-hd){:target="_blank" rel="noopener noreferrer"} with [x265 (no HDR/DV)](/Sonarr/Sonarr-collection-of-custom-formats/#x265-no-hdrdv){:target="_blank" rel="noopener noreferrer"}. + If you want to do the same make sure you replace [x265 (HD)](/Sonarr/sonarr-collection-of-custom-formats/#x265-hd){:target="_blank" rel="noopener noreferrer"} with [x265 (no HDR/DV)](/Sonarr/sonarr-collection-of-custom-formats/#x265-no-hdrdv){:target="_blank" rel="noopener noreferrer"}. !!! example "The following workflow will be applied:" @@ -179,7 +179,7 @@ Use the following main settings in your profile. I also suggest to change the Propers and Repacks settings in Sonarr - `Media Management` => `File Management` to `Do Not Prefer` and use the [Repack/Proper](/Sonarr/Sonarr-collection-of-custom-formats/#repack-proper) Custom Format. + `Media Management` => `File Management` to `Do Not Prefer` and use the [Repack/Proper](/Sonarr/sonarr-collection-of-custom-formats/#repack-proper) Custom Format. ![!cf-mm-propers-repacks-disable](images/cf-mm-propers-repacks-disable.png) @@ -220,11 +220,11 @@ Use the following main settings in your profile. ??? tip "Avoid using the x264/x265 Custom Format - [CLICK TO EXPAND]" - Avoid using the x264/x265 Custom Format with a score if possible, it's smarter to use the [{{ sonarr['cf']['x265-hd']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#x265-hd){:target="_blank" rel="noopener noreferrer"} Custom Format. + Avoid using the x264/x265 Custom Format with a score if possible, it's smarter to use the [{{ sonarr['cf']['x265-hd']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#x265-hd){:target="_blank" rel="noopener noreferrer"} Custom Format. Something like 95% of video files are x264 and have much better direct play support. If you have more than a of couple users, you will notice much more transcoding. - Use x265 only for 4k releases and the [{{ sonarr['cf']['x265-hd']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#x265-hd){:target="_blank" rel="noopener noreferrer"} makes sure you still get the x265 releases. + Use x265 only for 4k releases and the [{{ sonarr['cf']['x265-hd']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#x265-hd){:target="_blank" rel="noopener noreferrer"} makes sure you still get the x265 releases. ## Thanks diff --git a/docs/json/radarr/cf/ddplus.json b/docs/json/radarr/cf/ddplus.json index f7ccf9db0..d96fcaa23 100644 --- a/docs/json/radarr/cf/ddplus.json +++ b/docs/json/radarr/cf/ddplus.json @@ -30,15 +30,6 @@ "value": "\\bDTS(\\b|\\d)" } }, - { - "name": "Not Basic Dolby Digital", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "\\bDD[^a-z+]|(? `File Management` to `Do Not Prefer` and use the [Repack/Proper](/Sonarr/Sonarr-collection-of-custom-formats/#repack-proper) Custom Format. + `Media Management` => `File Management` to `Do Not Prefer` and use the [Repack/Proper](/Sonarr/sonarr-collection-of-custom-formats/#repack-proper) Custom Format. ![!cf-mm-propers-repacks-disable](/Sonarr/images/cf-mm-propers-repacks-disable.png) diff --git a/includes/cf/sonarr-streaming-services.md b/includes/cf/sonarr-streaming-services.md index ea695f9d2..f9fac6faa 100644 --- a/includes/cf/sonarr-streaming-services.md +++ b/includes/cf/sonarr-streaming-services.md @@ -1,17 +1,17 @@ ??? summary "Streaming Services - [CLICK TO EXPAND]" | Custom Format | Score | Trash ID | | --------------------------------------------------------------------------------------- | ----------------------------------------- | -------------------------------------- | - | [{{ sonarr['cf']['amzn']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#amzn) | {{ sonarr['cf']['amzn']['trash_score'] }} | {{ sonarr['cf']['amzn']['trash_id'] }} | - | [{{ sonarr['cf']['aptv']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#aptv) | {{ sonarr['cf']['aptv']['trash_score'] }} | {{ sonarr['cf']['aptv']['trash_id'] }} | - | [{{ sonarr['cf']['sho']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#sho) | {{ sonarr['cf']['sho']['trash_score'] }} | {{ sonarr['cf']['sho']['trash_id'] }} | - | [{{ sonarr['cf']['dsnp']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#dsnp) | {{ sonarr['cf']['dsnp']['trash_score'] }} | {{ sonarr['cf']['dsnp']['trash_id'] }} | - | [{{ sonarr['cf']['nf']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#nf) | {{ sonarr['cf']['nf']['trash_score'] }} | {{ sonarr['cf']['nf']['trash_id'] }} | - | [{{ sonarr['cf']['qibi']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#qibi) | {{ sonarr['cf']['qibi']['trash_score'] }} | {{ sonarr['cf']['qibi']['trash_id'] }} | - | [{{ sonarr['cf']['hmax']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#hmax) | {{ sonarr['cf']['hmax']['trash_score'] }} | {{ sonarr['cf']['hmax']['trash_id'] }} | - | [{{ sonarr['cf']['hulu']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#hulu) | {{ sonarr['cf']['hulu']['trash_score'] }} | {{ sonarr['cf']['hulu']['trash_id'] }} | - | [{{ sonarr['cf']['pcok']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#pcok) | {{ sonarr['cf']['pcok']['trash_score'] }} | {{ sonarr['cf']['pcok']['trash_id'] }} | - | [{{ sonarr['cf']['dcu']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#dcu) | {{ sonarr['cf']['dcu']['trash_score'] }} | {{ sonarr['cf']['dcu']['trash_id'] }} | - | [{{ sonarr['cf']['hbo']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#hbo) | {{ sonarr['cf']['hbo']['trash_score'] }} | {{ sonarr['cf']['hbo']['trash_id'] }} | - | [{{ sonarr['cf']['red']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#red) | {{ sonarr['cf']['red']['trash_score'] }} | {{ sonarr['cf']['red']['trash_id'] }} | - | [{{ sonarr['cf']['it']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#it) | {{ sonarr['cf']['it']['trash_score'] }} | {{ sonarr['cf']['it']['trash_id'] }} | - | [{{ sonarr['cf']['pmtp']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#pmtp) | {{ sonarr['cf']['pmtp']['trash_score'] }} | {{ sonarr['cf']['pmtp']['trash_id'] }} | + | [{{ sonarr['cf']['amzn']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#amzn) | {{ sonarr['cf']['amzn']['trash_score'] }} | {{ sonarr['cf']['amzn']['trash_id'] }} | + | [{{ sonarr['cf']['aptv']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#aptv) | {{ sonarr['cf']['aptv']['trash_score'] }} | {{ sonarr['cf']['aptv']['trash_id'] }} | + | [{{ sonarr['cf']['sho']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#sho) | {{ sonarr['cf']['sho']['trash_score'] }} | {{ sonarr['cf']['sho']['trash_id'] }} | + | [{{ sonarr['cf']['dsnp']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#dsnp) | {{ sonarr['cf']['dsnp']['trash_score'] }} | {{ sonarr['cf']['dsnp']['trash_id'] }} | + | [{{ sonarr['cf']['nf']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#nf) | {{ sonarr['cf']['nf']['trash_score'] }} | {{ sonarr['cf']['nf']['trash_id'] }} | + | [{{ sonarr['cf']['qibi']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#qibi) | {{ sonarr['cf']['qibi']['trash_score'] }} | {{ sonarr['cf']['qibi']['trash_id'] }} | + | [{{ sonarr['cf']['hmax']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#hmax) | {{ sonarr['cf']['hmax']['trash_score'] }} | {{ sonarr['cf']['hmax']['trash_id'] }} | + | [{{ sonarr['cf']['hulu']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#hulu) | {{ sonarr['cf']['hulu']['trash_score'] }} | {{ sonarr['cf']['hulu']['trash_id'] }} | + | [{{ sonarr['cf']['pcok']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#pcok) | {{ sonarr['cf']['pcok']['trash_score'] }} | {{ sonarr['cf']['pcok']['trash_id'] }} | + | [{{ sonarr['cf']['dcu']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#dcu) | {{ sonarr['cf']['dcu']['trash_score'] }} | {{ sonarr['cf']['dcu']['trash_id'] }} | + | [{{ sonarr['cf']['hbo']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#hbo) | {{ sonarr['cf']['hbo']['trash_score'] }} | {{ sonarr['cf']['hbo']['trash_id'] }} | + | [{{ sonarr['cf']['red']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#red) | {{ sonarr['cf']['red']['trash_score'] }} | {{ sonarr['cf']['red']['trash_id'] }} | + | [{{ sonarr['cf']['it']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#it) | {{ sonarr['cf']['it']['trash_score'] }} | {{ sonarr['cf']['it']['trash_id'] }} | + | [{{ sonarr['cf']['pmtp']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#pmtp) | {{ sonarr['cf']['pmtp']['trash_score'] }} | {{ sonarr['cf']['pmtp']['trash_id'] }} | diff --git a/includes/cf/sonarr-unwanted.md b/includes/cf/sonarr-unwanted.md index 66c27e721..a215c1188 100644 --- a/includes/cf/sonarr-unwanted.md +++ b/includes/cf/sonarr-unwanted.md @@ -1,15 +1,15 @@ ??? summary "Unwanted - [CLICK TO EXPAND]" | Custom Format | Score | Trash ID | | ------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------- | ------------------------------------------------- | - | [{{ sonarr['cf']['br-disk']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#br-disk) | {{ sonarr['cf']['br-disk']['trash_score'] }} | {{ sonarr['cf']['br-disk']['trash_id'] }} | - | [{{ sonarr['cf']['lq']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#lq) | {{ sonarr['cf']['lq']['trash_score'] }} | {{ sonarr['cf']['lq']['trash_id'] }} | - | [{{ sonarr['cf']['x265-hd']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#x265-hd) :warning: | {{ sonarr['cf']['x265-hd']['trash_score'] }} | {{ sonarr['cf']['x265-hd']['trash_id'] }} | - | [{{ sonarr['cf']['x265-no-hdrdv']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#x265-no-hdrdv) :warning: | {{ sonarr['cf']['x265-no-hdrdv']['trash_score'] }} | {{ sonarr['cf']['x265-no-hdrdv']['trash_id'] }} | - | [{{ sonarr['cf']['no-rlsgroup']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#no-rlsgroup) | {{ sonarr['cf']['no-rlsgroup']['trash_score'] }} | {{ sonarr['cf']['no-rlsgroup']['trash_id'] }} | - | [{{ sonarr['cf']['obfuscated']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#obfuscated) | {{ sonarr['cf']['obfuscated']['trash_score'] }} | {{ sonarr['cf']['obfuscated']['trash_id'] }} | - | [{{ sonarr['cf']['retags']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#retags) | {{ sonarr['cf']['retags']['trash_score'] }} | {{ sonarr['cf']['retags']['trash_id'] }} | - | [{{ sonarr['cf']['bad-dual-groups']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#bad-dual-groups) | {{ sonarr['cf']['bad-dual-groups']['trash_score'] }} | {{ sonarr['cf']['bad-dual-groups']['trash_id'] }} | - | [{{ sonarr['cf']['dv-webdl']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#dv-webdl) | ?????? | {{ sonarr['cf']['dv-webdl']['trash_id'] }} | + | [{{ sonarr['cf']['br-disk']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#br-disk) | {{ sonarr['cf']['br-disk']['trash_score'] }} | {{ sonarr['cf']['br-disk']['trash_id'] }} | + | [{{ sonarr['cf']['lq']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#lq) | {{ sonarr['cf']['lq']['trash_score'] }} | {{ sonarr['cf']['lq']['trash_id'] }} | + | [{{ sonarr['cf']['x265-hd']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#x265-hd) :warning: | {{ sonarr['cf']['x265-hd']['trash_score'] }} | {{ sonarr['cf']['x265-hd']['trash_id'] }} | + | [{{ sonarr['cf']['x265-no-hdrdv']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#x265-no-hdrdv) :warning: | {{ sonarr['cf']['x265-no-hdrdv']['trash_score'] }} | {{ sonarr['cf']['x265-no-hdrdv']['trash_id'] }} | + | [{{ sonarr['cf']['no-rlsgroup']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#no-rlsgroup) | {{ sonarr['cf']['no-rlsgroup']['trash_score'] }} | {{ sonarr['cf']['no-rlsgroup']['trash_id'] }} | + | [{{ sonarr['cf']['obfuscated']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#obfuscated) | {{ sonarr['cf']['obfuscated']['trash_score'] }} | {{ sonarr['cf']['obfuscated']['trash_id'] }} | + | [{{ sonarr['cf']['retags']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#retags) | {{ sonarr['cf']['retags']['trash_score'] }} | {{ sonarr['cf']['retags']['trash_id'] }} | + | [{{ sonarr['cf']['bad-dual-groups']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#bad-dual-groups) | {{ sonarr['cf']['bad-dual-groups']['trash_score'] }} | {{ sonarr['cf']['bad-dual-groups']['trash_id'] }} | + | [{{ sonarr['cf']['dv-webdl']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#dv-webdl) | ?????? | {{ sonarr['cf']['dv-webdl']['trash_id'] }} | ------ @@ -17,19 +17,19 @@ - **{{ sonarr['cf']['br-disk']['name'] }} :** This is a custom format to help Sonarr recognize & ignore BR-DISK (ISO's and Blu-ray folder structure) in addition to the standard BR-DISK quality. - **{{ sonarr['cf']['lq']['name'] }}:** A collection of known Low Quality groups that are often banned from the the top trackers because the lack of quality or other reasons. - - **{{ sonarr['cf']['x265-hd']['name'] }}:** This blocks/ignores 720/1080p (HD) releases that are encoded in x265. - More info [HERE](/Misc/x265-4k/){:target="_blank" rel="noopener noreferrer"}. + - **{{ sonarr['cf']['x265-hd']['name'] }}:** This blocks 720/1080p (HD) releases that are encoded in x265. - More info [HERE](/Misc/x265-4k/){:target="_blank" rel="noopener noreferrer"}. - !!! Danger "Don't use this together with the following Custom Format [{{ sonarr['cf']['x265-no-hdrdv']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#x265-no-hdrdv) :warning:" + !!! Danger "Don't use this together with [{{ sonarr['cf']['x265-no-hdrdv']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#x265-no-hdrdv), Only ever include one of them :warning:" - - **{{ sonarr['cf']['x265-no-hdrdv']['name'] }}:** This blocks/ignores 720/1080p (HD) releases that are encoded in x265. - More info [HERE](/Misc/x265-4k/){:target="_blank" rel="noopener noreferrer"}. + - **{{ sonarr['cf']['x265-no-hdrdv']['name'] }}:** This blocks 720/1080p (HD) releases that are encoded in x265. - More info [HERE](/Misc/x265-4k/){:target="_blank" rel="noopener noreferrer"}. - **but it will allow to exclude/bypass if it has HDR and/or DV** + **But it will allow x265 releases if they have HDR and/or DV** *Being that some NF releases won't be released as 4k, but you want to have DV/HDR releases.* In your quality profile use the following score for this Custom Format: `{{ sonarr['cf']['x265-no-hdrdv']['trash_score'] }}` - !!! Danger "Don't use this together with the following Custom Format [{{ sonarr['cf']['x265-hd']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#x265-hd) :warning:" + !!! Danger "Don't use this together with [{{ sonarr['cf']['x265-hd']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#x265-hd), Only ever include one of them :warning:" - **{{ sonarr['cf']['no-rlsgroup']['name'] }}:** [*Optional*] Some indexers strip out the release group what could result in LQ groups getting a higher score. For example a lot of EVO releases end up stripping the group name, so they appear as "upgrades", and they end up getting a decent score if other things match. - **{{ sonarr['cf']['obfuscated']['name'] }}:** [*Optional*] (use these only if you dislike renamed releases) diff --git a/includes/cf/unwanted.md b/includes/cf/unwanted.md deleted file mode 100644 index c30cca6ef..000000000 --- a/includes/cf/unwanted.md +++ /dev/null @@ -1,53 +0,0 @@ -??? summary "Unwanted - [CLICK TO EXPAND]" - | Custom Format | Score | Trash ID | - | -------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------- | ------------------------------------------------- | - | [{{ radarr['cf']['br-disk']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#br-disk) | {{ radarr['cf']['br-disk']['trash_score'] }} | {{ radarr['cf']['br-disk']['trash_id'] }} | - | [{{ radarr['cf']['evo-no-webdl']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#evo-no-webdl) | {{ radarr['cf']['evo-no-webdl']['trash_score'] }} | {{ radarr['cf']['evo-no-webdl']['trash_id'] }} | - | [{{ radarr['cf']['lq']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#lq) | {{ radarr['cf']['lq']['trash_score'] }} | {{ radarr['cf']['lq']['trash_id'] }} | - | [{{ radarr['cf']['x265-hd']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-hd) :bangbang: | {{ radarr['cf']['x265-hd']['trash_score'] }} | {{ radarr['cf']['x265-hd']['trash_id'] }} | - | [{{ radarr['cf']['x265-no-hdrdv']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-no-hdrdv) :bangbang: | {{ radarr['cf']['x265-no-hdrdv']['trash_score'] }} | {{ radarr['cf']['x265-no-hdrdv']['trash_id'] }} | - | [{{ radarr['cf']['3d']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#3d) | {{ radarr['cf']['3d']['trash_score'] }} | {{ radarr['cf']['3d']['trash_id'] }} | - | [{{ radarr['cf']['no-rlsgroup']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#no-rlsgroup) | {{ radarr['cf']['no-rlsgroup']['trash_score'] }} | {{ radarr['cf']['no-rlsgroup']['trash_id'] }} | - | [{{ radarr['cf']['obfuscated']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#obfuscated) | {{ radarr['cf']['obfuscated']['trash_score'] }} | {{ radarr['cf']['obfuscated']['trash_id'] }} | - | [{{ radarr['cf']['retags']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#retags) | {{ radarr['cf']['retags']['trash_score'] }} | {{ radarr['cf']['retags']['trash_id'] }} | - | [{{ radarr['cf']['bad-dual-groups']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#bad-dual-groups) | {{ radarr['cf']['bad-dual-groups']['trash_score'] }} | {{ radarr['cf']['bad-dual-groups']['trash_id'] }} | - | [{{ radarr['cf']['dv-webdl']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#dv-webdl) | ?????? | {{ radarr['cf']['dv-webdl']['trash_id'] }} | - - !!! example "Breakdown and Why" - - - **{{ radarr['cf']['br-disk']['name'] }} :** This is a custom format to help Radarr recognize & ignore BR-DISK (ISO's and Blu-ray folder structure) in addition to the standard BR-DISK quality. - - **{{ radarr['cf']['evo-no-webdl']['name'] }}:** This group is often banned for the low quality Blu-ray releases, but their WEB-DL are okay. - - **{{ radarr['cf']['lq']['name'] }}:** A collection of known Low Quality groups that are often banned from the the top trackers because the lack of quality or other reasons. - - **{{ radarr['cf']['x265-hd']['name'] }}:** This blocks/ignores 720/1080p releases that are encoded in x265 - More info [HERE](/Misc/x265-4k/){:target="_blank" rel="noopener noreferrer"}. - - !!! Danger "Don't use this together with the following Custom Format [{{ radarr['cf']['x265-no-hdrdv']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-no-hdrdv) :bangbang:" - - - **{{ radarr['cf']['x265-no-hdrdv']['name'] }}:** This blocks/ignores 720/1080p (HD) releases that are encoded in x265. - More info [HERE](/Misc/x265-4k/){:target="_blank" rel="noopener noreferrer"}. - - **but it will allow to exclude/bypass if it has HDR and/or DV** - - *Being that some NF releases won't be released as 4k, but you want to have DV/HDR releases.* - - In your quality profile use the following score for this Custom Format: `{{ radarr['cf']['x265-no-hdrdv']['trash_score'] }}` - - !!! Danger "Don't use this together with the following Custom Format [{{ radarr['cf']['x265-hd']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-hd) :bangbang:" - - - **{{ radarr['cf']['3d']['name'] }}:** Is 3D still a thing for home use ? - - **{{ radarr['cf']['no-rlsgroup']['name'] }}:** [*Optional*] Some indexers strip out the release group what could result in LQ groups getting a higher score. For example a lot of EVO releases end up stripping the group name, so they appear as "upgrades", and they end up getting a decent score if other things match. - - **{{ radarr['cf']['obfuscated']['name'] }}:** [*Optional*] (use these only if you dislike renamed releases) - - **{{ radarr['cf']['retags']['name'] }}:** [*Optional*] (use these only if you dislike retagged releases) - - **{{ radarr['cf']['bad-dual-groups']['name'] }}:** [*Optional*] These groups take the original release, then they add their own preferred language (ex. Portuguese) as the main audio track (AAC 2.0), What results after renaming and FFprobe that the media file will be recognized as Portuguese AAC audio. It's a common rule that you add the best audio as first. - Also they often even rename the release name in to Portuguese. - - **{{ radarr['cf']['dv-webdl']['name'] }}:** This is a special Custom Format that Block WEBDL with Dolby Vision but without HDR10 fallback. - - This Custom Format works together with the normal DV Custom Format that you can use to prefer Dolby Vision. - - Most WEBDL from Streaming Services don't have the fallback to HDR10, What can results in playback issues like weird colors if you want to play it on a not Dolby Vision compatible setup. - - Remuxes and Bluray have a fallback to HDR10. - - !!! hint - `[DV WEBDL]` = This custom format you need to score depending of your personal use and setup. - - - If you only watch your movies on a setup that completely supports Dolby Vision from start to end then give it a score of `0` or just don't add it. - - If you (or family members you share your collection with) have a setup that doesn't support Dolby Vision then you should add this with a score of `{{ radarr['cf']['dv-webdl']['trash_score'] }}`. \ No newline at end of file diff --git a/includes/sqp/1-2-cf-scoring.md b/includes/sqp/1-2-cf-scoring.md index 5bcb8d46e..88c7341e5 100644 --- a/includes/sqp/1-2-cf-scoring.md +++ b/includes/sqp/1-2-cf-scoring.md @@ -2,7 +2,7 @@ {! include-markdown "../../includes/cf/radarr-audio.md" !} -{! include-markdown "../../includes/cf/radarr-hdr-metadata.md" !} +{! include-markdown "../../includes/cf/radarr-hdr-formats.md" !} {! include-markdown "../../includes/cf/radarr-movie-versions-imaxe.md" !}