From 8545c6480469b077848f02361ec31059f00849c7 Mon Sep 17 00:00:00 2001 From: bakerboy448 <55419169+bakerboy448@users.noreply.github.com> Date: Tue, 18 Jun 2024 21:30:52 -0500 Subject: [PATCH 1/6] chore(sync_tools): Revert "fix(sync_tools): Hotfix to re-add `default:3` and `default:4` Sonarr episode naming options" (#1982) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Revert "fix(sync_tools): Hotfix to re-add `default:3` and `default:4` Sonarr …" This reverts commit 9f85db1b214a5d0c8c2d52cd332c789067fbfc52. --- docs/json/sonarr/naming/sonarr-naming.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docs/json/sonarr/naming/sonarr-naming.json b/docs/json/sonarr/naming/sonarr-naming.json index 236fbbed2e..a923a070c3 100644 --- a/docs/json/sonarr/naming/sonarr-naming.json +++ b/docs/json/sonarr/naming/sonarr-naming.json @@ -16,20 +16,14 @@ "episodes": { "standard": { "default": "{Series TitleYear} - S{season:00}E{episode:00} - {Episode CleanTitle} [{Custom Formats }{Quality Full}]{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels]}{[MediaInfo VideoCodec]}{-Release Group}", - "default:3": "{Series TitleYear} - S{season:00}E{episode:00} - {Episode CleanTitle} [{Preferred Words }{Quality Full}]{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels]}{[MediaInfo VideoCodec]}{-Release Group}", - "default:4": "{Series TitleYear} - S{season:00}E{episode:00} - {Episode CleanTitle} [{Custom Formats }{Quality Full}]{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels]}{[MediaInfo VideoCodec]}{-Release Group}", "original": "{Original Title}" }, "daily": { "default": "{Series TitleYear} - {Air-Date} - {Episode CleanTitle} [{Custom Formats }{Quality Full}]{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels]}{[MediaInfo VideoCodec]}{-Release Group}", - "default:3": "{Series TitleYear} - {Air-Date} - {Episode CleanTitle} [{Preferred Words }{Quality Full}]{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels]}{[MediaInfo VideoCodec]}{-Release Group}", - "default:4": "{Series TitleYear} - {Air-Date} - {Episode CleanTitle} [{Custom Formats }{Quality Full}]{[MediaInfo VideoDynamicRangeType]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels]}{[MediaInfo VideoCodec]}{-Release Group}", "original": "{Original Title}" }, "anime": { - "default": "{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}", - "default:3": "{Series TitleYear} - S{season:00}E{episode:00} - {absolute:000} - {Episode CleanTitle} [{Preferred Words }{Quality Full}]{[MediaInfo VideoDynamicRangeType]}[{MediaInfo VideoBitDepth}bit]{[MediaInfo VideoCodec]}[{Mediainfo AudioCodec} { Mediainfo AudioChannels}]{MediaInfo AudioLanguages}{-Release Group}", - "default:4": "{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}" + "default": "{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}" } } } From 087a7060296d32f103d5a2f8ca196457ee2c3183 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Jun 2024 18:17:48 +0200 Subject: [PATCH 2/6] build(deps): bump mkdocs-material from 9.5.26 to 9.5.27 (#1981) Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.5.26 to 9.5.27. - [Release notes](https://github.com/squidfunk/mkdocs-material/releases) - [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG) - [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.5.26...9.5.27) --- updated-dependencies: - dependency-name: mkdocs-material dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: TRaSH --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index e858df14ca..1626cd21fc 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -2,7 +2,7 @@ mkdocs-glightbox==0.4.0 mkdocs-awesome-pages-plugin==2.9.2 mkdocs-git-revision-date-localized-plugin==1.2.6 mkdocs-macros-plugin==1.0.5 -mkdocs-material==9.5.26 +mkdocs-material==9.5.27 mkdocs-minify-plugin==0.8.0 mkdocs-redirects==1.2.1 mkdocs-include-markdown-plugin==6.1.1 From df6489c152215c21671eb78249d83cf1a660fc1e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Jun 2024 19:30:57 +0200 Subject: [PATCH 3/6] build(deps): bump mkdocs-include-markdown-plugin from 6.1.1 to 6.2.0 (#1980) * build(deps): bump mkdocs-include-markdown-plugin from 6.1.1 to 6.2.0 Bumps [mkdocs-include-markdown-plugin](https://github.com/mondeja/mkdocs-include-markdown-plugin) from 6.1.1 to 6.2.0. - [Release notes](https://github.com/mondeja/mkdocs-include-markdown-plugin/releases) - [Commits](https://github.com/mondeja/mkdocs-include-markdown-plugin/compare/v6.1.1...v6.2.0) --- updated-dependencies: - dependency-name: mkdocs-include-markdown-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * fix: removed `rewrite_relative_urls=true` should be default setting and it errored during build --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: TRaSH Co-authored-by: TRaSH --- docs/Sonarr/Tips/How-to-setup-language-custom-formats.md | 4 +++- docs/Sonarr/Tips/Merge-quality.md | 4 +++- docs/Sonarr/Tips/Sync-2-radarr-sonarr.md | 4 +++- docs/requirements.txt | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docs/Sonarr/Tips/How-to-setup-language-custom-formats.md b/docs/Sonarr/Tips/How-to-setup-language-custom-formats.md index 03b98c1a31..b62c809f52 100644 --- a/docs/Sonarr/Tips/How-to-setup-language-custom-formats.md +++ b/docs/Sonarr/Tips/How-to-setup-language-custom-formats.md @@ -1 +1,3 @@ -{! include-markdown '../../Radarr/Tips/How-to-setup-language-custom-formats.md' rewrite_relative_urls=true !} + +{! include-markdown '../../Radarr/Tips/How-to-setup-language-custom-formats.md' !} + diff --git a/docs/Sonarr/Tips/Merge-quality.md b/docs/Sonarr/Tips/Merge-quality.md index 195691124e..a648834cc8 100644 --- a/docs/Sonarr/Tips/Merge-quality.md +++ b/docs/Sonarr/Tips/Merge-quality.md @@ -1 +1,3 @@ -{! include-markdown '../../Radarr/Tips/Merge-quality.md' rewrite_relative_urls=true !} + +{! include-markdown '../../Radarr/Tips/Merge-quality.md' !} + diff --git a/docs/Sonarr/Tips/Sync-2-radarr-sonarr.md b/docs/Sonarr/Tips/Sync-2-radarr-sonarr.md index e0fe5beb26..1f2e97eb8b 100644 --- a/docs/Sonarr/Tips/Sync-2-radarr-sonarr.md +++ b/docs/Sonarr/Tips/Sync-2-radarr-sonarr.md @@ -1 +1,3 @@ -{! include-markdown '../../Radarr/Tips/Sync-2-radarr-sonarr.md' rewrite_relative_urls=true !} + +{! include-markdown '../../Radarr/Tips/Sync-2-radarr-sonarr.md' !} + diff --git a/docs/requirements.txt b/docs/requirements.txt index 1626cd21fc..a10805aa51 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -5,5 +5,5 @@ mkdocs-macros-plugin==1.0.5 mkdocs-material==9.5.27 mkdocs-minify-plugin==0.8.0 mkdocs-redirects==1.2.1 -mkdocs-include-markdown-plugin==6.1.1 +mkdocs-include-markdown-plugin==6.2.0 mkdocs-markdownextradata-plugin==0.2.5 From cfd0c6981d6c38a0a19d47b8f62ee7d6726074a6 Mon Sep 17 00:00:00 2001 From: zakary Date: Thu, 20 Jun 2024 12:50:05 -0500 Subject: [PATCH 4/6] style(annotations): match and use question-mark svg (#1985) add(annotations): match and use question-mark svg --- docs/Radarr/Tips/Sync-2-radarr-sonarr.md | 14 +++++++------- docs/stylesheets/extra.css | 9 +++++++++ mkdocs.yml | 5 ++++- overrides/.icons/circle-question.svg | 1 + 4 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 overrides/.icons/circle-question.svg diff --git a/docs/Radarr/Tips/Sync-2-radarr-sonarr.md b/docs/Radarr/Tips/Sync-2-radarr-sonarr.md index 448b668f40..16f38f13b9 100644 --- a/docs/Radarr/Tips/Sync-2-radarr-sonarr.md +++ b/docs/Radarr/Tips/Sync-2-radarr-sonarr.md @@ -63,10 +63,10 @@ Then you get a screen with the following options: 1. Your {++Radarr 2++} root location for your media library. 1. Tags that will be added on import from this list (if you use multiple lists it makes it easier to determine from which list the movie was added) 1. The Full URL to ^^==Radarr 1==^^ (Use container name or local URL if they run on the same system). -1. Your API Key of ^^==Radarr 1==^^. :material-alert-circle:{ title="After adding your API key, click on the test button at the bottom to see if you have a successful connection." } -1. Which Profile of ^^==Radarr 1==^^ you want to Sync with {++Radarr 2++}. :material-alert-circle:{ title="The dropdown box is filled after you made a successful connection with Radarr 1" } -1. [_Optional_] Use tags from ^^==Radarr 1==^^ to add Movies to {++Radarr 2++}. :material-alert-circle:{ title="The dropdown box is filled after you made a successful connection with Radarr 1" } -1. [_Optional_] Add all movies from the chosen root folder from ^^==Radarr 1==^^. :material-alert-circle:{ title="The dropdown box is filled after you made a successful connection with Radarr 1" } +1. Your API Key of ^^==Radarr 1==^^. :circle-question:{ title="After adding your API key, click on the test button at the bottom to see if you have a successful connection." } +1. Which Profile of ^^==Radarr 1==^^ you want to Sync with {++Radarr 2++}. :circle-question:{ title="The dropdown box is filled after you made a successful connection with Radarr 1" } +1. [_Optional_] Use tags from ^^==Radarr 1==^^ to add Movies to {++Radarr 2++}. :circle-question:{ title="The dropdown box is filled after you made a successful connection with Radarr 1" } +1. [_Optional_] Add all movies from the chosen root folder from ^^==Radarr 1==^^. :circle-question:{ title="The dropdown box is filled after you made a successful connection with Radarr 1" } #### Radarr Download client setup @@ -138,11 +138,11 @@ Then you get a screen with the following options: 1. If you want to use Season Folders (**RECOMMENDED**). 1. Tags that will be added on import from this list (if you use multiple lists it makes it easier to determine from which list the TV Shows was added) 1. The Full URL to ^^==Sonarr 1==^^ (Use container name or local URL if they run on the same system). -1. Your API Key of ^^==Sonarr 1==^^. :material-alert-circle:{ title="After adding your API key, click on the test button at the bottom to see if you have a successful connection." } +1. Your API Key of ^^==Sonarr 1==^^. :circle-question:{ title="After adding your API key, click on the test button at the bottom to see if you have a successful connection." } 1. Sync season monitoring (**SUGGESTION: DISABLED**) 1. The Cloned Profile of ^^==Sonarr 1==^^ that we're going to use to sync with {++Sonarr 2++}. -1. [_Optional_] Use tags from ^^==Sonarr 1==^^ to add TV Shows to {++Sonarr 2++}. :material-alert-circle:{ title="The dropdown box is filled after you made a successful connection with Sonarr 1" } -1. [_Optional_] Add all TV Shows from the chosen root folder from ^^==Sonarr 1==^^. :material-alert-circle:{ title="The dropdown box is filled after you made a successful connection with Sonarr 1" } +1. [_Optional_] Use tags from ^^==Sonarr 1==^^ to add TV Shows to {++Sonarr 2++}. :circle-question:{ title="The dropdown box is filled after you made a successful connection with Sonarr 1" } +1. [_Optional_] Add all TV Shows from the chosen root folder from ^^==Sonarr 1==^^. :circle-question:{ title="The dropdown box is filled after you made a successful connection with Sonarr 1" } 1. This is a Deprecated option. #### Sonarr Download client setup diff --git a/docs/stylesheets/extra.css b/docs/stylesheets/extra.css index 9653d07ce7..8d85f94ec9 100644 --- a/docs/stylesheets/extra.css +++ b/docs/stylesheets/extra.css @@ -63,3 +63,12 @@ td { [data-md-color-scheme="slate"] .md-typeset__table tr:nth-child(2n) { color: #f8f8f8; } +.md-typeset .emojione svg, .md-typeset .gemoji svg, .md-typeset .twemoji svg { + fill: var(--md-default-fg-color--lighter); + max-height: 100%; + width: var(--md-icon-size); +} +.md-typeset .emojione svg, .md-typeset .gemoji svg, .md-typeset .twemoji svg:hover { + fill: var(--md-accent-fg-color); + transform:rotate(45deg); +} diff --git a/mkdocs.yml b/mkdocs.yml index a17eea1787..b0101f819e 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -42,6 +42,9 @@ markdown_extensions: - pymdownx.emoji: emoji_index: !!python/name:material.extensions.emoji.twemoji emoji_generator: !!python/name:material.extensions.emoji.to_svg + options: + custom_icons: + - overrides/.icons - pymdownx.extra - pymdownx.highlight: guess_lang: true @@ -161,4 +164,4 @@ theme: favicon: img/favicon.png logo: img/logo.png icon: - annotation: material/arrow-right-circle + annotation: circle-question diff --git a/overrides/.icons/circle-question.svg b/overrides/.icons/circle-question.svg new file mode 100644 index 0000000000..2a6650fe5b --- /dev/null +++ b/overrides/.icons/circle-question.svg @@ -0,0 +1 @@ + \ No newline at end of file From 6663b750eb98068d3989a02b9fef82a1ce3f62b5 Mon Sep 17 00:00:00 2001 From: zakary Date: Sat, 22 Jun 2024 10:14:14 -0500 Subject: [PATCH 5/6] style(discord-shields): restore discord shields (#1986) --- docs/Radarr/radarr-setup-quality-profiles.md | 1 + docs/Sonarr/sonarr-setup-quality-profiles.md | 1 + docs/index.md | 5 +++-- docs/stylesheets/extra.css | 8 ++++++++ includes/cf/score-attention.md | 1 + includes/support.md | 1 + 6 files changed, 15 insertions(+), 2 deletions(-) diff --git a/docs/Radarr/radarr-setup-quality-profiles.md b/docs/Radarr/radarr-setup-quality-profiles.md index fba168d7e1..146898c811 100644 --- a/docs/Radarr/radarr-setup-quality-profiles.md +++ b/docs/Radarr/radarr-setup-quality-profiles.md @@ -80,6 +80,7 @@ At the bottom, in your chosen profile, you will see the added Custom Formats whe
If you're unsure or have questions do not hesitate to ask for help on Discord
[ Click For Support ](https://trash-guides.info/discord){ .md-button .md-button--primary }
+
[![Discord chat](https://img.shields.io/discord/492590071455940612?style=for-the-badge&color=4051B5&logo=discord){ .off-glb }](https://trash-guides.info/discord){:target="\_blank" rel="noopener noreferrer"}
--- diff --git a/docs/Sonarr/sonarr-setup-quality-profiles.md b/docs/Sonarr/sonarr-setup-quality-profiles.md index b43f9443c4..d9b65a2c19 100644 --- a/docs/Sonarr/sonarr-setup-quality-profiles.md +++ b/docs/Sonarr/sonarr-setup-quality-profiles.md @@ -75,6 +75,7 @@ At the bottom, in your chosen profile, you will see the added Custom Formats whe
If you're unsure or have questions do not hesitate to ask for help on Discord
[ Click For Support ](https://trash-guides.info/discord){ .md-button .md-button--primary }
+
[![Discord chat](https://img.shields.io/discord/492590071455940612?style=for-the-badge&color=4051B5&logo=discord){ .off-glb }](https://trash-guides.info/discord){:target="\_blank" rel="noopener noreferrer"}
--- diff --git a/docs/index.md b/docs/index.md index b275229ea9..07202ce40d 100644 --- a/docs/index.md +++ b/docs/index.md @@ -4,7 +4,7 @@ # TRaSH-Guides -[![Discord chat](https://trash-guides.info/assets/discord.png){ .off-glb }](https://trash-guides.info/discord){:target="\_blank" rel="noopener noreferrer"} +[![Discord chat](https://img.shields.io/discord/492590071455940612?style=for-the-badge&color=4051B5&logo=discord){ .off-glb }](https://trash-guides.info/discord){:target="\_blank" rel="noopener noreferrer"} [![GitHub last commit](https://img.shields.io/github/last-commit/TRaSH-Guides/Guides?color=4051B5&label=Last%20Update&style=flat-square){ .off-glb }](https://github.com/TRaSH-Guides/Guides/commits/master){:target="\_blank" rel="noopener noreferrer"} [![GitHub contributors](https://img.shields.io/github/contributors/TRaSH-Guides/Guides?color=4051B5&style=flat-square){ .off-glb }](https://github.com/TRaSH-Guides/Guides/graphs/contributors){:target="\_blank" rel="noopener noreferrer"} [![GitHub pull requests](https://img.shields.io/github/issues-pr/TRaSH-Guides/Guides?color=4051B5&style=flat-square){ .off-glb }](https://github.com/TRaSH-Guides/Guides/pulls){:target="\_blank" rel="noopener noreferrer"} @@ -29,7 +29,8 @@ I try to make my guides as easy as possible for everyone to understand and, in m - If you want to contribute, feel free to create a PR (Pull Request). - If you found a actual issue related to the guide you can open a Github [issue](https://github.com/TRaSH-Guides/Guides/issues){:target="\_blank" rel="noopener noreferrer"}. -
[ Click For Support ](https://trash-guides.info/discord){ .md-button .md-button--primary }
+
[ Click For Support ](https://trash-guides.info/discord){ .md-button .md-button--primary .custom_width }
+
[![Discord chat](https://img.shields.io/discord/492590071455940612?style=for-the-badge&color=4051B5&logo=discord){ .off-glb }](https://trash-guides.info/discord){:target="\_blank" rel="noopener noreferrer"}
--- diff --git a/docs/stylesheets/extra.css b/docs/stylesheets/extra.css index 8d85f94ec9..7ff31f3b26 100644 --- a/docs/stylesheets/extra.css +++ b/docs/stylesheets/extra.css @@ -72,3 +72,11 @@ td { fill: var(--md-accent-fg-color); transform:rotate(45deg); } +.md-typeset .md-button.custom_width { + border-radius:0rem; + padding:.625em .91em; +} +.md-typeset .md-button { + border-radius:0rem; + padding:.625em 2.2em; +} diff --git a/includes/cf/score-attention.md b/includes/cf/score-attention.md index 68e8504ff4..8721a1bc7b 100644 --- a/includes/cf/score-attention.md +++ b/includes/cf/score-attention.md @@ -8,4 +8,5 @@ If you're unsure or have questions do not hesitate to ask for help on Discord
[ Click For Support ](https://trash-guides.info/discord){ .md-button .md-button--primary }
+
[![Discord chat](https://img.shields.io/discord/492590071455940612?style=for-the-badge&color=4051B5&logo=discord){ .off-glb }](https://trash-guides.info/discord){:target="\_blank" rel="noopener noreferrer"}
diff --git a/includes/support.md b/includes/support.md index d56b5f151a..3107e59dde 100644 --- a/includes/support.md +++ b/includes/support.md @@ -6,4 +6,5 @@
If you have questions or suggestions, click the button below to join our Discord server.
[ Click For Support ](https://trash-guides.info/discord){ .md-button .md-button--primary }
+
[![Discord chat](https://img.shields.io/discord/492590071455940612?style=for-the-badge&color=4051B5&logo=discord){ .off-glb }](https://trash-guides.info/discord){:target="\_blank" rel="noopener noreferrer"}
From 801b4b52bc622d119041a2e6a2eadc22c36f6a8f Mon Sep 17 00:00:00 2001 From: FonduemangVI <15520607+FonduemangVI@users.noreply.github.com> Date: Sun, 23 Jun 2024 09:48:55 +1000 Subject: [PATCH 6/6] fix(sonarr-adnime): fix broken naming scheme link --- docs/Sonarr/sonarr-setup-quality-profiles-anime.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Sonarr/sonarr-setup-quality-profiles-anime.md b/docs/Sonarr/sonarr-setup-quality-profiles-anime.md index 2a5757400a..235d55b133 100644 --- a/docs/Sonarr/sonarr-setup-quality-profiles-anime.md +++ b/docs/Sonarr/sonarr-setup-quality-profiles-anime.md @@ -36,7 +36,7 @@ When adding a new series make sure you set the series type to Anime ### Recommended naming scheme ```bash -{{ sonarr['naming']['sonarr-naming']['episodes']['anime']['default:4'] }} +{{ sonarr['naming']['sonarr-naming']['episodes']['anime']['default'] }} ``` ??? abstract "Results: - [Click to show/hide]"