From 74175687c40dae8266a875dfa028002a91732c7e Mon Sep 17 00:00:00 2001 From: meisnate12 Date: Mon, 17 Oct 2022 02:48:08 -0400 Subject: [PATCH] [119] update overlay defaults yaml and wiki --- CHANGELOG | 2 +- README.md | 2 +- VERSION | 2 +- defaults/chart/flixpatrol.yml | 4 +- defaults/movie/universe.yml | 2 +- defaults/overlays/audio_codec.yml | 244 ++++---- defaults/overlays/audio_language.yml | 85 +-- defaults/overlays/commonsense.yml | 193 +++---- defaults/overlays/direct_play.yml | 71 +-- defaults/overlays/edition.yml | 195 ------- defaults/overlays/episode_info.yml | 85 +-- defaults/overlays/flixpatrol.yml | 109 ++-- defaults/overlays/mediastinger.yml | 73 +-- defaults/overlays/ratings.yml | 168 +++--- defaults/overlays/resolution.yml | 445 ++++++++++----- defaults/overlays/ribbon.yml | 78 +-- defaults/overlays/runtimes.yml | 90 +-- defaults/overlays/special_release.yml | 208 ------- defaults/overlays/status.yml | 121 ++-- defaults/overlays/streaming.yml | 124 ++--- defaults/overlays/templates.yml | 76 +++ defaults/overlays/versions.yml | 77 +-- defaults/overlays/video_format.yml | 140 ++--- docs/_templates/navbar.html | 17 +- docs/conf.py | 351 ++++++++---- docs/config/operations.md | 302 +++++++++- docs/defaults/award/bafta.md | 2 +- docs/defaults/award/cannes.md | 2 +- docs/defaults/award/choice.md | 2 +- docs/defaults/award/emmy.md | 2 +- docs/defaults/award/golden.md | 2 +- docs/defaults/award/oscars.md | 2 +- docs/defaults/award/other.md | 2 +- docs/defaults/award/separator.md | 2 +- docs/defaults/award/spirit.md | 2 +- docs/defaults/award/sundance.md | 2 +- docs/defaults/both/actor.md | 2 +- docs/defaults/both/audio_language.md | 2 +- docs/defaults/both/content_rating_cs.md | 4 +- docs/defaults/both/content_rating_uk.md | 2 +- docs/defaults/both/genre.md | 2 +- docs/defaults/both/resolution.md | 2 +- docs/defaults/both/resolution_standards.md | 2 +- docs/defaults/both/streaming.md | 2 +- docs/defaults/both/studio.md | 2 +- docs/defaults/both/subtitle_language.md | 2 +- docs/defaults/both/year.md | 2 +- docs/defaults/chart/anilist.md | 2 +- docs/defaults/chart/basic.md | 2 +- docs/defaults/chart/flixpatrol.md | 18 +- docs/defaults/chart/imdb.md | 2 +- docs/defaults/chart/myanimelist.md | 2 +- docs/defaults/chart/other.md | 2 +- docs/defaults/chart/separator.md | 2 +- docs/defaults/chart/tautulli.md | 2 +- docs/defaults/chart/tmdb.md | 2 +- docs/defaults/chart/trakt.md | 2 +- docs/defaults/defaults.md | 0 docs/defaults/files.md | 140 ++--- docs/defaults/guide.md | 0 .../images}/movie-overlays2-annotated.png | Bin docs/defaults/movie/content_rating_us.md | 2 +- docs/defaults/movie/country.md | 2 +- docs/defaults/movie/decade.md | 2 +- docs/defaults/movie/director.md | 2 +- docs/defaults/movie/franchise.md | 2 +- docs/defaults/movie/producer.md | 2 +- docs/defaults/movie/seasonal.md | 2 +- docs/defaults/movie/universe.md | 4 +- docs/defaults/movie/writer.md | 2 +- docs/defaults/overlays/audio_codec.md | 102 +++- docs/defaults/overlays/audio_language.md | 67 ++- docs/defaults/overlays/commonsense.md | 92 +++- docs/defaults/overlays/defaults.md | 0 docs/defaults/overlays/direct_play.md | 50 +- docs/defaults/overlays/edition.md | 74 ++- docs/defaults/overlays/episode_info.md | 49 +- docs/defaults/overlays/flixpatrol.md | 84 +++ docs/defaults/overlays/flixpatrol.yml | 104 ---- .../images/audio_codec.png} | Bin .../images/audio_language.png} | Bin .../images/commonsense.png} | Bin .../images/direct_play.png} | Bin .../images/episode_info.png} | Bin docs/defaults/overlays/mediastinger.md | 48 ++ docs/defaults/overlays/mediastinger.yml | 63 --- docs/defaults/overlays/ratings.md | 144 +++++ docs/defaults/overlays/ratings.yml | 520 ------------------ docs/defaults/overlays/resolution.md | 103 ++++ docs/defaults/overlays/resolution.yml | 192 ------- docs/defaults/overlays/ribbon.md | 62 +++ docs/defaults/overlays/ribbon.yml | 70 --- docs/defaults/overlays/runtimes.md | 59 ++ docs/defaults/overlays/runtimes.yml | 72 --- docs/defaults/overlays/special_release.yml | 208 ------- docs/defaults/overlays/status.md | 71 +++ docs/defaults/overlays/streaming.md | 71 +++ docs/defaults/overlays/streaming.yml | 109 ---- docs/defaults/overlays/variables.md | 30 + docs/defaults/overlays/versions.md | 61 ++ docs/defaults/overlays/versions.yml | 69 --- docs/defaults/overlays/video_format.md | 84 +++ docs/defaults/overlays/video_format.yml | 112 ---- .../defaults.md => defaults/readme2.md} | 20 +- docs/defaults/separators.md | 2 +- docs/defaults/show/content_rating_us.md | 2 +- docs/defaults/show/country.md | 2 +- docs/defaults/show/decade.md | 2 +- docs/defaults/show/franchise.md | 4 +- docs/defaults/show/network.md | 2 +- docs/defaults/variables.md | 2 +- .../alternative-docker.md => docker.md} | 2 +- docs/home/guides/docker.md | 2 +- .../home/guides/movie-overlays1-annotated.png | Bin 1649736 -> 0 bytes docs/home/guides/ratings_operations.png | Bin 27722 -> 0 bytes docs/home/guides/ratings_overlay_path.png | Bin 37662 -> 0 bytes docs/home/guides/ratings_source.png | Bin 61045 -> 0 bytes docs/home/guides/ratings_spot.png | Bin 392503 -> 0 bytes docs/home/guides/tvshow-poster-annotated.png | Bin 1493706 -> 0 bytes .../tvshow-poster-episode-annotated.png | Bin 1540507 -> 0 bytes .../guides/tvshow-poster-season-annotated.png | Bin 1108957 -> 0 bytes docs/home/guides/unraid.md | 2 +- docs/home/installation.md | 8 +- docs/index.md | 2 +- docs/metadata/builders/anilist.md | 28 +- docs/metadata/builders/myanimelist.md | 56 +- docs/metadata/filters.md | 1 + modules/anidb.py | 3 +- modules/anilist.py | 3 +- modules/builder.py | 6 +- modules/imdb.py | 1 - modules/mal.py | 3 +- modules/meta.py | 193 +++---- modules/overlays.py | 8 +- modules/plex.py | 6 +- modules/tautulli.py | 2 - 136 files changed, 3002 insertions(+), 3634 deletions(-) delete mode 100644 defaults/overlays/edition.yml delete mode 100644 defaults/overlays/special_release.yml create mode 100644 defaults/overlays/templates.yml create mode 100644 docs/defaults/defaults.md create mode 100644 docs/defaults/guide.md rename docs/{home/guides => defaults/images}/movie-overlays2-annotated.png (100%) create mode 100644 docs/defaults/overlays/defaults.md create mode 100644 docs/defaults/overlays/flixpatrol.md delete mode 100644 docs/defaults/overlays/flixpatrol.yml rename docs/defaults/{images/audio_codec_ov.png => overlays/images/audio_codec.png} (100%) rename docs/defaults/{images/audio_language_ov.png => overlays/images/audio_language.png} (100%) rename docs/defaults/{images/commonsense_ov.png => overlays/images/commonsense.png} (100%) rename docs/defaults/{images/direct_play_ov.png => overlays/images/direct_play.png} (100%) rename docs/defaults/{images/episode_info_ov.png => overlays/images/episode_info.png} (100%) create mode 100644 docs/defaults/overlays/mediastinger.md delete mode 100644 docs/defaults/overlays/mediastinger.yml create mode 100644 docs/defaults/overlays/ratings.md delete mode 100644 docs/defaults/overlays/ratings.yml create mode 100644 docs/defaults/overlays/resolution.md delete mode 100644 docs/defaults/overlays/resolution.yml create mode 100644 docs/defaults/overlays/ribbon.md delete mode 100644 docs/defaults/overlays/ribbon.yml create mode 100644 docs/defaults/overlays/runtimes.md delete mode 100644 docs/defaults/overlays/runtimes.yml delete mode 100644 docs/defaults/overlays/special_release.yml create mode 100644 docs/defaults/overlays/status.md create mode 100644 docs/defaults/overlays/streaming.md delete mode 100644 docs/defaults/overlays/streaming.yml create mode 100644 docs/defaults/overlays/variables.md create mode 100644 docs/defaults/overlays/versions.md delete mode 100644 docs/defaults/overlays/versions.yml create mode 100644 docs/defaults/overlays/video_format.md delete mode 100644 docs/defaults/overlays/video_format.yml rename docs/{home/guides/defaults.md => defaults/readme2.md} (97%) rename docs/home/{guides/alternative-docker.md => docker.md} (95%) delete mode 100644 docs/home/guides/movie-overlays1-annotated.png delete mode 100644 docs/home/guides/ratings_operations.png delete mode 100644 docs/home/guides/ratings_overlay_path.png delete mode 100644 docs/home/guides/ratings_source.png delete mode 100644 docs/home/guides/ratings_spot.png delete mode 100644 docs/home/guides/tvshow-poster-annotated.png delete mode 100644 docs/home/guides/tvshow-poster-episode-annotated.png delete mode 100644 docs/home/guides/tvshow-poster-season-annotated.png diff --git a/CHANGELOG b/CHANGELOG index dbc81062..79713110 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,7 +6,7 @@ Updated pathvalidate requirement to 2.5.2 **New Site to request and vote for Features Requests on at [features.metamanager.wiki](https://features.metamanager.wiki/)** # New Features -Added support for editions in `plex_search`, `smart_filter`, special text overlays, and metadata editing. +Added support for editions in `plex_search`, `smart_filter`, `filters`, special text overlays, and metadata editing. Added `item_edition` [item metadata detail](https://metamanager.wiki/en/latest/metadata/details/metadata.html#item-metadata-details) to update the edition of items in a collection Added `edition` [dynamic collection type](https://metamanager.wiki/en/latest/metadata/dynamic.html#edition) Added `last_episode_aired_or_never` [date filter](https://metamanager.wiki/en/latest/metadata/filters.html#date-filters). thanks @axsuul#0591 diff --git a/README.md b/README.md index c4fed022..8e7f25a0 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ Below are some user-curated collections which have been created by Plex Meta Man ## Default and User Submitted Metadata/Overlay Files -The overlays and collection built in the images above can be easily added to any plex by using the [PMM Defaults](https://metamanager.wiki/en/latest/home/guides/defaults.html). These Files were created by the PMM team to make it easier than ever to have customized collections and overlays. +The overlays and collection built in the images above can be easily added to any plex by using the [PMM Defaults](https://metamanager.wiki/en/latest/defaults/defaults.html). These Files were created by the PMM team to make it easier than ever to have customized collections and overlays. To see user submitted Metadata configuration files, and you to even add your own, go to the [Plex Meta Manager Configs](https://github.com/meisnate12/Plex-Meta-Manager-Configs). diff --git a/VERSION b/VERSION index 9c188486..a4e51ae8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.17.3-develop118 +1.17.3-develop119 diff --git a/defaults/chart/flixpatrol.yml b/defaults/chart/flixpatrol.yml index f6e944eb..5eac322b 100644 --- a/defaults/chart/flixpatrol.yml +++ b/defaults/chart/flixpatrol.yml @@ -34,10 +34,10 @@ dynamic_collections: type: custom data: netflix: Netflix - disney: Disney + disney: Disney+ hbo: HBO hulu: Hulu - paramount: Paramount Plus + paramount: Paramount+ prime: Prime Video title_format: <> Top <> template: diff --git a/defaults/movie/universe.yml b/defaults/movie/universe.yml index bdaf13fa..3b216e47 100644 --- a/defaults/movie/universe.yml +++ b/defaults/movie/universe.yml @@ -60,7 +60,7 @@ dynamic_collections: - custom template_variables: trakt_list: - star: https://trakt.tv/users/donxy/lists/dc-animated-movie-universe + star: https://trakt.tv/users/zorge88/lists/star-wars dca: https://trakt.tv/users/donxy/lists/dc-animated-movie-universe dcu: https://trakt.tv/users/donxy/lists/dc-extended-universe mcu: https://trakt.tv/users/donxy/lists/marvel-cinematic-universe diff --git a/defaults/overlays/audio_codec.yml b/defaults/overlays/audio_codec.yml index 82eca857..0ff253a1 100644 --- a/defaults/overlays/audio_codec.yml +++ b/defaults/overlays/audio_codec.yml @@ -1,159 +1,137 @@ -############################################################# -# Audio Codec Overlays # -# Created by Yozora, Bullmoose20, & Sohjiro # -# Credit to Magic815 for base images # -############################################################# -# Designed for TRaSH Guides filename naming scheme # -# https://trash-guides.info/ # -# # -# Call this from your config.yml (Movie or Show): # -# If nothing is specified these are the defaults # -# # -# overlay_path: # -# - git: PMM/overlays/audio_codec # -# template_variables: # -# # Set episode or season to overlay # -# overlay_level: # -# # Set the horizontal offset for the overlay # -# horizontal_offset: 0 # -# # Set the horizontal align for the overlay # -# horizontal_align: center # -# # Set the vertical offset for the overlay # -# vertical_offset: 15 # -# # Set the vertical align for the overlay # -# vertical_align: top # -# # Set the back color for the overlay # -# back_color: "#00000099" # -# # Set the back radius for the overlay # -# back_radius: 30 # -# # Set the back width for the overlay # -# back_width: 305 # -# # Sets the style of overlay: standard or compact # -# style: compact # -# # -# # Use the Opus overlay # -# use_opus: true # -# # Use the MP3 overlay # -# use_mp3: true # -# # Use the Dolby-Digital overlay # -# use_digital: true # -# # Use the AAC overlay # -# use_aac: true # -# # Use the DTS overlay # -# use_dts: true # -# # Use the DTS-ES overlay # -# use_es: true # -# # Use the Dolby-Digital-Plus overlay # -# use_plus: true # -# # Use the DTS-HD-HRA overlay # -# use_hra: true # -# # Use the PCM overlay # -# use_pcm: true # -# # Use the FLAC overlay # -# use_flac: true # -# # Use the DTS-HD-MA overlay # -# use_hd: true # -# # Use the Dolby-TrueHD overlay # -# use_truehd: true # -# # Use the DD+/E-AC3 Atmos overlay # -# use_plus-atmos: true # -# # Use the Dolby-Atmos (undefined) overlay # -# use_atmos: true # -# # Use the DTS-X overlay # -# use_x: true # -# # Use the Dolby TrueHD Atmos overlay # -# use_truehd-atmos: true # -############################################################# - -templates: - AudioCodec: - optional: - - overlay_level - - use_<> - default: - overlay: <> - horizontal_offset: 0 - horizontal_align: center - vertical_offset: 15 - vertical_align: top - style: compact - standard_value: 105 - back_color: "#00000099" - back_radius: 30 - back_width: 305 +############################################################################## +# Audio Codec Overlay # +# Created by Yozora, Bullmoose20, & Sohjiro # +# Credit to Magic815 for base images # +# EDITING THIS FILE MAY CAUSE PULLING NEW UPDATES TO FAIL # +# https://metamanager.wiki/en/latest/defaults/overlays/audio_codec.html # +############################################################################## + +external_templates: + pmm: templates + template_variables: conditionals: - height: + back_height: default: 105 conditions: - style: standard value: <> - overlay_level: <> - allowed_library_types: <>>> + standard_value: 105 + style: compact + group: audio_codec + horizontal_offset: 0 + horizontal_align: center + vertical_offset: 15 + vertical_align: top + back_width: 305 + pmm: audio_codec/<