diff --git a/VERSION b/VERSION index 14ec7a36..29d3b9ee 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.17.0-develop43 +1.17.0-develop44 diff --git a/docs/conf.py b/docs/conf.py index bca6f40a..b1645872 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -45,7 +45,8 @@ extensions = [ 'sphinx.ext.todo', 'myst_parser', 'sphinx_inline_tabs', - 'sphinx_copybutton' + 'sphinx_copybutton', + 'sphinx_reredirects' ] source_suffix = ['.rst', '.md'] @@ -94,6 +95,12 @@ html_favicon = "_static/favicon.png" html_copy_source = False html_show_sourcelink = False +# Redirect URLs +# "": "" +redirects = { + "redact": "https://regex101.com/r/DMo1DQ/latest" +} + # Theme options are theme-specific and customize the look and feel of a # theme further. @@ -142,6 +149,7 @@ html_theme_options = { ]), ("_menu", "Config", [ ("Configuration File", "config/configuration"), + ("Redacting Your Config", "redact"), ("_divider", ), ("Libraries/Playlists", "config/libraries"), ("Path Types", "config/paths"), diff --git a/docs/metadata/filters.md b/docs/metadata/filters.md index 341d4825..41dd86ba 100644 --- a/docs/metadata/filters.md +++ b/docs/metadata/filters.md @@ -30,18 +30,21 @@ String filters can take multiple values **only as a list**. ### Attribute -| String Filter | Description | Movies | Shows | Seasons | Episodes | Artists | Albums | Track | -|:--------------------|:-----------------------------------------|:--------:|:-------------------:|:-------------------:|:--------:|:-------------------:|:-------------------:|:--------:| -| `title` | Uses the title attribute to match | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| `summary` | Uses the summary attribute to match | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| `studio` | Uses the studio attribute to match | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | -| `record_label` | Uses the record label attribute to match | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ❌ | -| `folder` | Uses the item's folder to match | ❌ | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | -| `filepath` | Uses the item's filepath to match | ✅ | ✅1 | ✅1 | ✅ | ✅1 | ✅1 | ✅ | -| `audio_track_title` | Uses the audio track titles to match | ✅ | ✅1 | ✅1 | ✅ | ✅1 | ✅1 | ✅ | +| String Filter | Description | Movies | Shows | Seasons | Episodes | Artists | Albums | Track | +|:-------------------------|:-----------------------------------------|:--------:|:-------------------:|:-------------------:|:--------:|:-------------------:|:-------------------:|:--------:| +| `title` | Uses the title attribute to match | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | +| `tmdb_title`2 | Uses the title from TMDb to match | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | +| `summary` | Uses the summary attribute to match | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | +| `studio` | Uses the studio attribute to match | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | +| `record_label` | Uses the record label attribute to match | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ❌ | +| `folder` | Uses the item's folder to match | ❌ | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | +| `filepath` | Uses the item's filepath to match | ✅ | ✅1 | ✅1 | ✅ | ✅1 | ✅1 | ✅ | +| `audio_track_title` | Uses the audio track titles to match | ✅ | ✅1 | ✅1 | ✅ | ✅1 | ✅1 | ✅ | 1 Filters using the special `episodes`/`tracks` [filter](#special-filters) with the [default percent](details/setting). +2 Also filters out missing movies/shows from being added to Radarr/Sonarr. These Values also cannot use the `count` modifiers. + ## Tag Filters Tag filters can be used with either no modifier or with `.not`. diff --git a/docs/requirements.txt b/docs/requirements.txt index bd57c2f0..b8b3fc8c 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,4 +1,5 @@ myst-parser sphinx_bootstrap_theme sphinx_inline_tabs -sphinx-copybutton \ No newline at end of file +sphinx-copybutton +sphinx-reredirects \ No newline at end of file diff --git a/modules/plex.py b/modules/plex.py index 4e2dc8de..dbd07c8f 100644 --- a/modules/plex.py +++ b/modules/plex.py @@ -948,12 +948,12 @@ class Plex(Library): self.upload_images(item, poster=poster, background=background) elif self.show_missing_assets and self.asset_folders: logger.warning(f"Asset Warning: No poster or background found in the assets folder '{item_dir}'") - else: + elif self.show_missing_assets: logger.warning(f"Asset Warning: {name} has an Overlay and will be updated when overlays are run") except Failed as e: if self.show_missing_assets: logger.warning(e) - if isinstance(item, Show): + if isinstance(item, Show) and ((self.asset_folders and item_dir) or not self.asset_folders): missing_seasons = "" missing_episodes = "" found_season = False