From db26a04819646008856d27f12603af51de5fc2b1 Mon Sep 17 00:00:00 2001 From: userdocs <16525024+userdocs@users.noreply.github.com> Date: Sun, 31 Jul 2022 00:38:16 +0100 Subject: [PATCH 1/2] fix: no symlinks 1: add `include-markdown` plugin 2: change `.pages` `How-to-setup-for` to `- How-to-setup-for: Hardlinks/How-to-setup-for` 3: remove `How-to-setup-for` symlink 4: remove `Sonarr/Tips/images` and `Sonarr/Tips/Sync-2-radarr-sonarr.md` symlinks 5: include `../../Radarr/Tips/Sync-2-radarr-sonarr.md` into `Sonarr/Tips/Sync-2-radarr-sonarr.md` 6: include `../../Radarr/Tips/Merge-quality.md` into `Sonarr/Tips/Merge-quality.md` Delete Sync-2-radarr-sonarr.md Create Sync-2-radarr-sonarr.md Create super-lint.yml Update super-lint.yml fix md lint Update requirements.txt Delete super-lint.yml --- docs/.pages | 2 +- docs/How-to-setup-for | 1 - docs/Sonarr/Tips/Merge-quality.md | 79 ++---------------------- docs/Sonarr/Tips/Sync-2-radarr-sonarr.md | 5 +- docs/Sonarr/Tips/images | 1 - docs/requirements.txt | 2 +- mkdocs.yml | 2 +- 7 files changed, 11 insertions(+), 81 deletions(-) delete mode 120000 docs/How-to-setup-for mode change 120000 => 100644 docs/Sonarr/Tips/Sync-2-radarr-sonarr.md delete mode 120000 docs/Sonarr/Tips/images diff --git a/docs/.pages b/docs/.pages index 268f9a936..bbac73a44 100644 --- a/docs/.pages +++ b/docs/.pages @@ -7,4 +7,4 @@ nav: - Plex - Misc - Hardlinks - - How-to-setup-for + - How-to-setup-for: Hardlinks/How-to-setup-for diff --git a/docs/How-to-setup-for b/docs/How-to-setup-for deleted file mode 120000 index bd391fd4f..000000000 --- a/docs/How-to-setup-for +++ /dev/null @@ -1 +0,0 @@ -Hardlinks/How-to-setup-for \ No newline at end of file diff --git a/docs/Sonarr/Tips/Merge-quality.md b/docs/Sonarr/Tips/Merge-quality.md index e9037242a..6b96ad510 100644 --- a/docs/Sonarr/Tips/Merge-quality.md +++ b/docs/Sonarr/Tips/Merge-quality.md @@ -1,75 +1,4 @@ -# How to Merge Quality - -The current logic on how downloads are compared is **Quality Trumps All** :bangbang: - -In some cases it might be preferred to not have Quality Trump All, and let it be handled via Preferred Words / Custom Formats. - -To accomplish this you will need to merge the qualities with each other. - -## Current Logic - -Here you will see the current logic so you understand how the possible downloads are compared. - -As of 2021-11-06 the logic is as follows: - -### Radarr current logic - -??? summary "Radarr current logic- [CLICK TO EXPAND]" - - 1. Quality - 1. Custom Format Score - 1. Protocol - 1. Indexer Priority - 1. Indexer Flags - 1. Seeds/Peers (If Torrent) - 1. Age (If Usenet) - 1. Size - - [Source: Wiki Servarr](https://wiki.servarr.com/radarr/faq#how-are-possible-downloads-compared){:target="_blank" rel="noopener noreferrer"} - - !!! attention "" - REPACKS and PROPERs are v2 of Qualities and thus rank above a non-repack of the same quality. - - `Settings` => `Media Management` => `File Management` => `Proper & Repacks` Change to `Do Not Prefer` and use the [Repack/Proper Custom Format](/Radarr/Radarr-collection-of-custom-formats/#repack-proper){:target="_blank" rel="noopener noreferrer"} - -### Sonarr current logic - -??? summary "Sonarr current logic- [CLICK TO EXPAND]" - - 1. Quality - 1. Language - 1. Preferred Word Score - 1. Protocol - 1. Episode Count - 1. Episode Number - 1. Indexer Priority - 1. Seeds/Peers (If Torrent) - 1. Age (If Usenet) - 1. Size - - [Source: Wiki Servarr](https://wiki.servarr.com/sonarr/faq#how-are-possible-downloads-compared){:target="_blank" rel="noopener noreferrer"} - - !!! attention "" - REPACKS and PROPERs are v2 of Qualities and thus rank above a non-repack of the same quality. - - `Settings` => `Media Management` => `File Management` => `Proper & Repacks` Change to `Do Not Prefer` and use a preferred word regex of `/\b(repack|proper)\b/i` - -## Merge the Qualities - -Go to your preferred Quality Profile or create a new one. - -`Settings` => `Profiles` - -In this example we will merge the following qualities together: - -- Bluray-720p -- Bluray-1080p -- WEBDL/WEBRip-1080p - -To merge them you need to click on Edit Groups. - -![!Merge Qualities](images/merge.gif) - -When done Sonarr/Radarr upgrades will be handled via Preferred Words / Custom Formats. - ---8<-- "includes/support.md" +{% + include-markdown '../../Radarr/Tips/Merge-quality.md' + rewrite_relative_urls=true +%} \ No newline at end of file diff --git a/docs/Sonarr/Tips/Sync-2-radarr-sonarr.md b/docs/Sonarr/Tips/Sync-2-radarr-sonarr.md deleted file mode 120000 index c37b10baf..000000000 --- a/docs/Sonarr/Tips/Sync-2-radarr-sonarr.md +++ /dev/null @@ -1 +0,0 @@ -../../Radarr/Tips/Sync-2-radarr-sonarr.md \ No newline at end of file diff --git a/docs/Sonarr/Tips/Sync-2-radarr-sonarr.md b/docs/Sonarr/Tips/Sync-2-radarr-sonarr.md new file mode 100644 index 000000000..0be5e3faa --- /dev/null +++ b/docs/Sonarr/Tips/Sync-2-radarr-sonarr.md @@ -0,0 +1,4 @@ +{% + include-markdown '../../Radarr/Tips/Sync-2-radarr-sonarr.md' + rewrite_relative_urls=true +%} \ No newline at end of file diff --git a/docs/Sonarr/Tips/images b/docs/Sonarr/Tips/images deleted file mode 120000 index d67819f89..000000000 --- a/docs/Sonarr/Tips/images +++ /dev/null @@ -1 +0,0 @@ -../../Radarr/Tips/images \ No newline at end of file diff --git a/docs/requirements.txt b/docs/requirements.txt index a93cfaaaf..185c256c9 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -5,4 +5,4 @@ mkdocs-macros-plugin==0.7.0 mkdocs-material==8.3.9 mkdocs-minify-plugin==0.5.0 mkdocs-redirects==1.0.4 - +mkdocs-include-markdown-plugin==3.6.1 diff --git a/mkdocs.yml b/mkdocs.yml index 8a0410b4e..5be685c6f 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -42,8 +42,8 @@ markdown_extensions: emoji_index: !!python/name:materialx.emoji.twemoji emoji_generator: !!python/name:materialx.emoji.to_svg - plugins: + - include-markdown: - search - git-revision-date-localized: type: datetime From 55be9ec9db5231b81e0e3e131a0f68df7926a25e Mon Sep 17 00:00:00 2001 From: Userdocs <16525024+userdocs@users.noreply.github.com> Date: Sat, 13 Aug 2022 19:04:57 +0100 Subject: [PATCH 2/2] Update requirements.txt --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 185c256c9..685399f5c 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -4,5 +4,5 @@ mkdocs-git-revision-date-localized-plugin==1.1.0 mkdocs-macros-plugin==0.7.0 mkdocs-material==8.3.9 mkdocs-minify-plugin==0.5.0 -mkdocs-redirects==1.0.4 +mkdocs-redirects==1.0.5 mkdocs-include-markdown-plugin==3.6.1