From 76ffb37763134e0c4c513e7fba52ee1ef34d7afb Mon Sep 17 00:00:00 2001 From: meisnate12 Date: Wed, 15 Mar 2023 09:19:08 -0400 Subject: [PATCH] [133] update playlist and universe defaults --- VERSION | 2 +- defaults/both/universe.yml | 8 +++++++- defaults/playlist.yml | 22 +++++++++++----------- modules/config.py | 2 +- modules/meta.py | 6 ++++++ 5 files changed, 26 insertions(+), 14 deletions(-) diff --git a/VERSION b/VERSION index e4c9a060..68be1be5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.18.3-develop132 +1.18.3-develop133 diff --git a/defaults/both/universe.yml b/defaults/both/universe.yml index 59b38c95..489f3d39 100644 --- a/defaults/both/universe.yml +++ b/defaults/both/universe.yml @@ -15,6 +15,12 @@ translations: templates: universe: + conditionals: + mdblist_list: + conditions: + - trakt_list.exists: false + imdb_list.exists: false + value: <> default: mdblist_list_<>: <> name_mapping_<>: <> @@ -72,7 +78,7 @@ dynamic_collections: rocky: movie mummy: movie middle: movie - mdblist_list: + mdblist_url: avp: https://mdblist.com/lists/plexmetamanager/external/9243 arrow: https://mdblist.com/lists/plexmetamanager/external/15113 dca: https://mdblist.com/lists/plexmetamanager/external/15405 diff --git a/defaults/playlist.yml b/defaults/playlist.yml index b72a14fb..19ec7090 100644 --- a/defaults/playlist.yml +++ b/defaults/playlist.yml @@ -17,7 +17,7 @@ templates: libraries: Movies, TV Shows item_radarr_tag_<>: <> item_sonarr_tag_<>: <> - trakt_url_<>: <> + trakt_list_<>: <> url_poster_<>: https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Images/master/playlist/<>.jpg name_<>: <> sync_to_users_<>: <> @@ -38,7 +38,7 @@ templates: ignore_imdb_ids: <> item_radarr_tag: <>>> item_sonarr_tag: <>>> - trakt_list: <>>> + trakt_list: <>>> cache_builders: 1 sync_to_users: <>>> exclude_users: <>>> @@ -55,7 +55,7 @@ playlists: key: arrow template: - name: playlist - trakt_url: https://trakt.tv/users/donxy/lists/arrowverse + trakt_list: https://trakt.tv/users/donxy/lists/arrowverse summary_arrow: The Arrowverse is an American superhero media franchise and a shared universe that is centered on various interconnected television series based on DC Comics superhero characters, primarily airing on The CW as well as web series on CW Seed. - name: arr @@ -64,7 +64,7 @@ playlists: key: mcu template: - name: playlist - trakt_url: https://trakt.tv/users/donxy/lists/marvel-cinematic-universe + trakt_list: https://trakt.tv/users/donxy/lists/marvel-cinematic-universe summary_mcu: The Marvel Cinematic Universe (MCU) is a collection of movies and television series that tell a singular narrative related to Marvel characters, settings and stories. The MCU is a product from Disney and Marvel that brings us heroes from Black Panther and Doctor Strange to Spider-Man and Iron Man. - name: arr @@ -73,7 +73,7 @@ playlists: key: dcau template: - name: playlist - trakt_url: https://trakt.tv/users/donxy/lists/dc-animated-series-universe + trakt_list: https://trakt.tv/users/donxy/lists/dc-animated-series-universe summary_dcau: "The DC Animated Universe (DCAU) is a shared universe consisting primarily of superhero-based animated television series, produced by Warner Bros. Animation and based on characters that appear in American comic books published by DC Comics. The first TV series set in the DCAU was Batman: The Animated Series, which premiered in 1992; the last TV series was Justice League Unlimited, which ended its run in 2006." - name: arr @@ -82,7 +82,7 @@ playlists: key: pokemon template: - name: playlist - trakt_url: https://trakt.tv/users/munch54/lists/pokemon-watching-order + trakt_list: https://trakt.tv/users/munch54/lists/pokemon-watching-order summary_pokemon: Ash Ketchum, his yellow pet Pikachu, and his human friends explore a world of powerful creatures. Ten-year-old Ash aspires to be the greatest Pokémon (pocket monster) trainer in the world. To do this, he enlists the help of many friends, and his own Pokémon, Pikachu. - name: arr @@ -91,7 +91,7 @@ playlists: key: startrek template: - name: playlist - trakt_url: https://trakt.tv/users/username57/lists/star-trek-prime-canon-timeline + trakt_list: https://trakt.tv/users/username57/lists/star-trek-prime-canon-timeline summary_startrek: Few film franchises have lasted as long as Star Trek. Through five decades and three different crews, the Star Trek films have saved more than a few worlds (and the whales), traveling through time more than once to do it. With them being set in so many different time periods, their actual chronological order might get a little confusing. No need to fret as this is the proper order… in linear time, anyway. On a quantum level is a whole other thing. - name: arr @@ -100,7 +100,7 @@ playlists: key: starwars template: - name: playlist - trakt_url: https://trakt.tv/users/xrayblaster/lists/star-wars-chronological-order + trakt_list: https://trakt.tv/users/xrayblaster/lists/star-wars-chronological-order summary_starwars: A long time ago in a galaxy far, far away, a farm boy on a desert planet dreamed of joining a rebellion and saving a princess from a dark lord, and thus, one of the most successful cinematic sagas of all time was born. What began with one space opera in 1977 quickly grew into a media empire that included toys, comic books, video games, TV series, and memorabilia in every possible form. Today, more than 40 years after it first arrived, Star Wars remains a global pop culture phenomenon, and the story still isn't over. - name: arr @@ -110,7 +110,7 @@ playlists: key: clonewars template: - name: playlist - trakt_url: https://trakt.tv/users/tomfin46/lists/star-wars-the-clone-wars-chronological-episode-order + trakt_list: https://trakt.tv/users/tomfin46/lists/star-wars-the-clone-wars-chronological-episode-order summary_clonewars: As more star systems get swept into the Clone Wars, the valiant Jedi knights struggle to maintain order. Anakin Skywalker and his Padawan learner Ahsoka Tano embark on a mission that brings them face-to-face with Jabba the Hutt. Plotting against them is evil Count Dooku and his agent, Asajj Ventress, who would ensure that the Jedis fail. Meanwhile, Yoda and Obi-Wan Kenobi lead the clone army against the forces of the Dark Side. - name: arr @@ -120,7 +120,7 @@ playlists: key: xmen template: - name: playlist - trakt_url: https://trakt.tv/users/heyitsbea/lists/x-men + trakt_list: https://trakt.tv/users/heyitsbea/lists/x-men summary_xmen: The X-Men are a fictional team of superheroes appearing in American comic books published by Marvel Comics, first appearing in The X-Men Issue 1. Although initially cancelled in 1970, following its 1975 revival and subsequent direction under writer Chris Claremont, it became one of the most recognizable and successful franchises of Marvel Comics. - name: arr @@ -129,6 +129,6 @@ playlists: key: dragonball template: - name: playlist - trakt_url: https://trakt.tv/users/qamazi/lists/dragon-ball-binged-out + trakt_list: https://trakt.tv/users/qamazi/lists/dragon-ball-binged-out summary_dragonball: Dragon Ball follows the adventures of an extraordinarily strong young boy named Goku as he searches for the seven dragon balls. These balls, when combined, can grant the owner any one wish he desires. Along the way he makes many new friends, and enemies, and he trains to become the strongest fighter in the world. - name: arr diff --git a/modules/config.py b/modules/config.py index d82010ce..9ddb7f12 100644 --- a/modules/config.py +++ b/modules/config.py @@ -141,7 +141,7 @@ class ConfigFile: self.requested_metadata_files = None if "metadata_files" in attrs and attrs["metadata_files"]: self.requested_metadata_files = [] - for s in attrs["libraries"].split("|"): + for s in attrs["metadata_files"].split("|"): s = s.stripe() if s: if s.endswith(".yml"): diff --git a/modules/meta.py b/modules/meta.py index c83ea7ca..507b8b79 100644 --- a/modules/meta.py +++ b/modules/meta.py @@ -1753,6 +1753,12 @@ class MetadataFile(DataFile): episodes[episode.title] = episode if episode.index: episodes[int(episode.index)] = episode + elif episode.originallyAvailableAt: + available = episode.originallyAvailableAt + episodes[f"{available.month:02}/{available.day:02}"] = episode + episodes[f"{available.month}/{available.day}"] = episode + episodes[f"{available.month:02}-{available.day:02}"] = episode + episodes[f"{available.month}-{available.day}"] = episode for episode_id, episode_dict in season_dict[season_methods["episodes"]].items(): updated = False logger.info("")