Skip to content

Commit

Permalink
Merge branch 'master' into fix/add-varyg-anime-dual-audio
Browse files Browse the repository at this point in the history
  • Loading branch information
adapowers committed Jun 23, 2024
2 parents a6bafde + 801b4b5 commit 5783172
Show file tree
Hide file tree
Showing 15 changed files with 49 additions and 23 deletions.
14 changes: 7 additions & 7 deletions docs/Radarr/Tips/Sync-2-radarr-sonarr.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions docs/Radarr/radarr-setup-quality-profiles.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ At the bottom, in your chosen profile, you will see the added Custom Formats whe
<center>If you're unsure or have questions do not hesitate to ask for help on Discord</center>

<center>[ Click For Support ](https://trash-guides.info/discord){ .md-button .md-button--primary }</center>
<center>[![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"}</center>

---

Expand Down
4 changes: 3 additions & 1 deletion docs/Sonarr/Tips/How-to-setup-language-custom-formats.md
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
{! include-markdown '../../Radarr/Tips/How-to-setup-language-custom-formats.md' rewrite_relative_urls=true !}
<!-- markdownlint-disable MD041-->
{! include-markdown '../../Radarr/Tips/How-to-setup-language-custom-formats.md' !}
<!-- markdownlint-enable MD041-->
4 changes: 3 additions & 1 deletion docs/Sonarr/Tips/Merge-quality.md
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
{! include-markdown '../../Radarr/Tips/Merge-quality.md' rewrite_relative_urls=true !}
<!-- markdownlint-disable MD041-->
{! include-markdown '../../Radarr/Tips/Merge-quality.md' !}
<!-- markdownlint-enable MD041-->
4 changes: 3 additions & 1 deletion docs/Sonarr/Tips/Sync-2-radarr-sonarr.md
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
{! include-markdown '../../Radarr/Tips/Sync-2-radarr-sonarr.md' rewrite_relative_urls=true !}
<!-- markdownlint-disable MD041-->
{! include-markdown '../../Radarr/Tips/Sync-2-radarr-sonarr.md' !}
<!-- markdownlint-enable MD041-->
2 changes: 1 addition & 1 deletion docs/Sonarr/sonarr-setup-quality-profiles-anime.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]"
Expand Down
1 change: 1 addition & 0 deletions docs/Sonarr/sonarr-setup-quality-profiles.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ At the bottom, in your chosen profile, you will see the added Custom Formats whe
<center>If you're unsure or have questions do not hesitate to ask for help on Discord</center>

<center>[ Click For Support ](https://trash-guides.info/discord){ .md-button .md-button--primary }</center>
<center>[![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"}</center>

---

Expand Down
5 changes: 3 additions & 2 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand All @@ -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"}.

<center>[ Click For Support ](https://trash-guides.info/discord){ .md-button .md-button--primary }</center>
<center>[ Click For Support ](https://trash-guides.info/discord){ .md-button .md-button--primary .custom_width }</center>
<center>[![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"}</center>

---

Expand Down
8 changes: 1 addition & 7 deletions docs/json/sonarr/naming/sonarr-naming.json
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}
}
}
4 changes: 2 additions & 2 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ 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
mkdocs-include-markdown-plugin==6.2.0
mkdocs-markdownextradata-plugin==0.2.5
17 changes: 17 additions & 0 deletions docs/stylesheets/extra.css
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,20 @@ 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);
}
.md-typeset .md-button.custom_width {
border-radius:0rem;
padding:.625em .91em;
}
.md-typeset .md-button {
border-radius:0rem;
padding:.625em 2.2em;
}
1 change: 1 addition & 0 deletions includes/cf/score-attention.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
If you're unsure or have questions do not hesitate to ask for help on Discord

<center>[ Click For Support ](https://trash-guides.info/discord){ .md-button .md-button--primary }</center>
<center>[![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"}</center>
<!-- markdownlint-enable MD041-->
1 change: 1 addition & 0 deletions includes/support.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
<center>If you have questions or suggestions, click the button below to join our Discord server.</center>

<center>[ Click For Support ](https://trash-guides.info/discord){ .md-button .md-button--primary }</center>
<center>[![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"}</center>
<!-- markdownlint-enable MD041-->
5 changes: 4 additions & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -161,4 +164,4 @@ theme:
favicon: img/favicon.png
logo: img/logo.png
icon:
annotation: material/arrow-right-circle
annotation: circle-question
1 change: 1 addition & 0 deletions overrides/.icons/circle-question.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 5783172

Please sign in to comment.