diff --git a/VERSION b/VERSION index 969aa547..687ae762 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.17.3-develop62 +1.17.3-develop64 diff --git a/defaults/award/bafta.yml b/defaults/award/bafta.yml index 52afbfd9..5e028747 100644 --- a/defaults/award/bafta.yml +++ b/defaults/award/bafta.yml @@ -49,4 +49,5 @@ dynamic_collections: - arr - custom template_variables: - translation_key: bafta_year + translation_key: + default: bafta_year diff --git a/defaults/award/cannes.yml b/defaults/award/cannes.yml index bbb1cf86..10a62ddd 100644 --- a/defaults/award/cannes.yml +++ b/defaults/award/cannes.yml @@ -75,4 +75,5 @@ dynamic_collections: - arr - custom template_variables: - translation_key: cannes_year + translation_key: + default: cannes_year diff --git a/defaults/award/choice.yml b/defaults/award/choice.yml index 31c40f77..9a66c385 100644 --- a/defaults/award/choice.yml +++ b/defaults/award/choice.yml @@ -69,7 +69,8 @@ dynamic_collections: - arr - custom template_variables: - translation_key: choice_year + translation_key: + default: choice_year url: 2019: critics 2018: critics diff --git a/defaults/award/emmy.yml b/defaults/award/emmy.yml index b4bc5ea7..f587894b 100644 --- a/defaults/award/emmy.yml +++ b/defaults/award/emmy.yml @@ -66,4 +66,5 @@ dynamic_collections: - arr - custom template_variables: - translation_key: emmy_year + translation_key: + default: emmy_year diff --git a/defaults/award/golden.yml b/defaults/award/golden.yml index 83fc0e6a..657df4b5 100644 --- a/defaults/award/golden.yml +++ b/defaults/award/golden.yml @@ -81,4 +81,5 @@ dynamic_collections: - arr - custom template_variables: - translation_key: golden_year + translation_key: + default: golden_year diff --git a/defaults/award/oscars.yml b/defaults/award/oscars.yml index ffb5df4c..8214a87c 100644 --- a/defaults/award/oscars.yml +++ b/defaults/award/oscars.yml @@ -89,4 +89,5 @@ dynamic_collections: - arr - custom template_variables: - translation_key: oscars_year + translation_key: + default: oscars_year diff --git a/defaults/award/spirit.yml b/defaults/award/spirit.yml index 8b5a0eab..c48671a2 100644 --- a/defaults/award/spirit.yml +++ b/defaults/award/spirit.yml @@ -59,4 +59,5 @@ dynamic_collections: - arr - custom template_variables: - translation_key: spirit_year + translation_key: + default: spirit_year diff --git a/defaults/award/sundance.yml b/defaults/award/sundance.yml index ca0db6c2..e9ac2a69 100644 --- a/defaults/award/sundance.yml +++ b/defaults/award/sundance.yml @@ -75,4 +75,5 @@ dynamic_collections: - arr - custom template_variables: - translation_key: sundance_year + translation_key: + default: sundance_year diff --git a/defaults/both/actor.yml b/defaults/both/actor.yml index ec0954a7..6fd1d6ff 100644 --- a/defaults/both/actor.yml +++ b/defaults/both/actor.yml @@ -65,5 +65,6 @@ dynamic_collections: - translation - shared template_variables: - translation_key: actor + translation_key: + default: actor \ No newline at end of file diff --git a/defaults/both/audio_language.yml b/defaults/both/audio_language.yml index f3da456e..cd8eb58c 100644 --- a/defaults/both/audio_language.yml +++ b/defaults/both/audio_language.yml @@ -60,12 +60,14 @@ dynamic_collections: - audio_language_dynamic - translation - shared - template_variables: - translation_key: audio_language other_template: - other_collection - audio_language_dynamic - shared + template_variables: + translation_key: + default: audio_language + other: audio_language_other include: - ab # Abkhazian - aa # Afar diff --git a/defaults/both/content_rating_uk.yml b/defaults/both/content_rating_uk.yml index 3f0a6900..229d8eca 100644 --- a/defaults/both/content_rating_uk.yml +++ b/defaults/both/content_rating_uk.yml @@ -57,7 +57,7 @@ collections: dynamic_collections: UK Content Rating: type: content_rating - title_format: <> + title_format: <> <>s other_name: Other Ratings template: - content_rating_dynamic @@ -69,7 +69,9 @@ dynamic_collections: - content_rating_dynamic - shared template_variables: - translation_key: content_rating_uk + translation_key: + default: content_rating_uk + other: content_rating_uk_other include: - U - PG diff --git a/defaults/both/genre.yml b/defaults/both/genre.yml index 308817b7..ec0dfdd0 100644 --- a/defaults/both/genre.yml +++ b/defaults/both/genre.yml @@ -26,10 +26,13 @@ ############################################################# external_templates: - git: PMM/templates + pmm: templates template_variables: collection_section: "06" +translations: + pmm: translations + templates: genre_dynamic: default: @@ -49,10 +52,14 @@ collections: dynamic_collections: Genre: type: genre - title_format: <> + title_format: <> <>s template: - genre_dynamic + - translation - shared + template_variables: + translation_key: + default: genre title_override: Biography: Biopic addons: diff --git a/defaults/both/resolution.yml b/defaults/both/resolution.yml index 0d5f1cbb..2cab4635 100644 --- a/defaults/both/resolution.yml +++ b/defaults/both/resolution.yml @@ -26,10 +26,13 @@ ############################################################# external_templates: - git: PMM/templates + pmm: templates template_variables: collection_section: 15 +translations: + pmm: translations + templates: resolution_dynamic: default: @@ -52,7 +55,11 @@ dynamic_collections: title_format: <> <>s template: - resolution_dynamic + - translation - shared + template_variables: + translation_key: + default: resolution addons: 1080: - 2k diff --git a/defaults/both/resolution_standards.yml b/defaults/both/resolution_standards.yml index bacba364..15d66c59 100644 --- a/defaults/both/resolution_standards.yml +++ b/defaults/both/resolution_standards.yml @@ -28,10 +28,13 @@ ############################################################# external_templates: - git: PMM/templates + pmm: templates template_variables: collection_section: 15 +translations: + pmm: translations + templates: resolution_dynamic: default: @@ -55,11 +58,16 @@ dynamic_collections: other_name: Other Resolutions template: - resolution_dynamic + - translation - shared other_template: - other_collection - resolution_dynamic - shared + template_variables: + translation_key: + default: resolution_standards + other: resolution_standards_other include: - 480 - 720 diff --git a/defaults/both/streaming.yml b/defaults/both/streaming.yml index 4fbb1954..80eecfe3 100644 --- a/defaults/both/streaming.yml +++ b/defaults/both/streaming.yml @@ -72,10 +72,14 @@ ############################################################# external_templates: - git: PMM/templates + pmm: templates template_variables: collection_section: "03" +translations: + pmm: translations + + templates: streaming: default: @@ -112,9 +116,12 @@ dynamic_collections: amazon: Prime Video title_format: <> <>s template_variables: + translation_key: + default: streaming use: hayu: show template: - streaming + - translation - shared - arr diff --git a/defaults/both/studio.yml b/defaults/both/studio.yml index 57bf183e..606d43f1 100644 --- a/defaults/both/studio.yml +++ b/defaults/both/studio.yml @@ -26,10 +26,13 @@ ############################################################# external_templates: - git: PMM/templates + pmm: templates template_variables: collection_section: "07" +translations: + pmm: translations + templates: studio_dynamic: default: @@ -55,7 +58,13 @@ dynamic_collections: title_format: <> template: - studio_dynamic + - translation - shared + template_variables: + translation_key: + default: studio + contains: + 20th Century Studios: 20th Century include: - 20th Century Studios - Amazon Studios @@ -167,7 +176,4 @@ dynamic_collections: - Walt Disney Animation Studios Warner Bros. Pictures: - Warner - - Warner Animation Group - template_variables: - contains: - 20th Century Studios: 20th Century \ No newline at end of file + - Warner Animation Group \ No newline at end of file diff --git a/defaults/both/subtitle_language.yml b/defaults/both/subtitle_language.yml index 50baa486..5fdc2c9b 100644 --- a/defaults/both/subtitle_language.yml +++ b/defaults/both/subtitle_language.yml @@ -28,10 +28,13 @@ ############################################################# external_templates: - git: PMM/templates + pmm: templates template_variables: collection_section: 11 +translations: + pmm: translations + templates: subtitle_language_dynamic: default: @@ -55,11 +58,17 @@ dynamic_collections: other_name: Other Subtitles template: - subtitle_language_dynamic + - translation - shared other_template: - other_collection - subtitle_language_dynamic + - translation - shared + template_variables: + translation_key: + default: subtitle_language + other: subtitle_language_other include: - ab # Abkhazian - aa # Afar diff --git a/defaults/both/year.yml b/defaults/both/year.yml index 0afaa8f5..33b1ab81 100644 --- a/defaults/both/year.yml +++ b/defaults/both/year.yml @@ -30,10 +30,13 @@ ############################################################# external_templates: - git: PMM/templates + pmm: templates template_variables: collection_section: 13 +translations: + pmm: translations + templates: year_dynamic: default: @@ -62,4 +65,8 @@ dynamic_collections: ending: current_year template: - year_dynamic + - translation - shared + template_variables: + translation_key: + default: year diff --git a/defaults/chart/anilist.yml b/defaults/chart/anilist.yml index 905ea164..11b60e2e 100644 --- a/defaults/chart/anilist.yml +++ b/defaults/chart/anilist.yml @@ -60,42 +60,28 @@ ############################################################# external_templates: - git: PMM/templates + pmm: templates template_variables: collection_section: "01" -templates: - - popular: - default: - limit_popular: 100 - summary_popular: A collection of the most popular Anime according to AniList. - anilist_popular: <> - summary: <>>> +translations: + pmm: translations - top: - default: - limit_top: 100 - summary_top: A collection of the top rated Anime according to AniList. - anilist_top_rated: <> - summary: <>>> +templates: - trending: + anilist: default: - limit_trending: 100 - summary_trending: A collection of trending Anime according to AniList. - anilist_trending: <> - summary: <>>> + limit_<>: 100 + chart: <> + anilist_<>: <>>> season: default: limit_trending: 100 - summary_season: A collection of Anime from the Current Season according to AniList. anilist_search: season: current year: sort_by: popular - summary: <>>> collections: @@ -103,28 +89,35 @@ collections: variables: key: popular template: - - name: popular + - name: anilist - name: shared - name: arr - name: custom + - name: translation + translation_key: anilist_popular AniList Top Rated: variables: key: top template: - - name: top + - name: anilist + chart: top_rated - name: shared - name: arr - name: custom + - name: translation + translation_key: anilist_top_rated AniList Trending: variables: key: trending template: - - name: trending + - name: anilist - name: shared - name: arr - name: custom + - name: translation + translation_key: anilist_trending AniList Season: variables: @@ -134,3 +127,5 @@ collections: - name: shared - name: arr - name: custom + - name: translation + translation_key: anilist_season diff --git a/defaults/chart/basic.yml b/defaults/chart/basic.yml index 64b4baa9..427ebfea 100644 --- a/defaults/chart/basic.yml +++ b/defaults/chart/basic.yml @@ -47,16 +47,17 @@ ############################################################# external_templates: - git: PMM/templates + pmm: templates template_variables: collection_section: "01" +translations: + pmm: translations + templates: released: default: in_the_last_released: 90 - summary_released: A collection of newly-released <>s - summary: <>>> smart_filter: all: release: <> @@ -64,8 +65,6 @@ templates: episodes: default: in_the_last_episodes: 7 - summary_episodes: A collection of newly-released <>s - summary: <>>> smart_filter: type: episodes all: @@ -84,6 +83,8 @@ collections: template: - name: released - name: shared + - name: translation + translation_key: basic_released New Episodes: variables: @@ -92,3 +93,5 @@ collections: - name: episodes - name: shared allowed_libraries: show + - name: translation + translation_key: basic_episodes diff --git a/defaults/chart/imdb.yml b/defaults/chart/imdb.yml index 0b04e000..f6bcebe6 100644 --- a/defaults/chart/imdb.yml +++ b/defaults/chart/imdb.yml @@ -57,17 +57,17 @@ ############################################################# external_templates: - git: PMM/templates + pmm: templates template_variables: collection_section: "01" +translations: + pmm: translations + templates: imdb: - default: - summary_<>: "List of <> <>s" imdb_chart: <>_<>s - summary: <>>> collections: @@ -80,6 +80,8 @@ collections: - name: shared - name: arr - name: custom + - name: translation + translation_key: imdb_popular IMDb Top 250: variables: @@ -90,6 +92,8 @@ collections: - name: shared - name: arr - name: custom + - name: translation + translation_key: imdb_top IMDb Lowest Rated: variables: @@ -100,3 +104,5 @@ collections: allowed_libraries: movie - name: arr - name: custom + - name: translation + translation_key: imdb_lowest diff --git a/defaults/chart/myanimelist.yml b/defaults/chart/myanimelist.yml index d7a6e425..2f3f2553 100644 --- a/defaults/chart/myanimelist.yml +++ b/defaults/chart/myanimelist.yml @@ -61,48 +61,28 @@ ############################################################# external_templates: - git: PMM/templates + pmm: templates template_variables: collection_section: "01" -templates: - - popular: - default: - limit_popular: 100 - summary_popular: A collection of the most popular Anime according to MyAnimeList. - mal_popular: <> - summary: <>>> +translations: + pmm: translations - favorited: - default: - limit_favorited: 100 - summary_favorited: A collection of the Most Favorited Anime according to MyAnimeList. - mal_favorite: <> - summary: <>>> - - top: - default: - limit_top: 100 - summary_top: A collection of the Top Rated Anime according to MyAnimeList. - mal_all: <> - summary: <>>> +templates: - airing: + mal: default: - limit_airing: 100 - summary_airing: A collection of the Top Rated Anime Currently Airing according to MyAnimeList. - mal_airing: <> - summary: <>>> + limit_<>: 100 + chart: <> + mal_<>: <>>> season: default: - limit_airing: 100 - summary_season: A collection of Anime from the Current Season according to MyAnimeList. + limit_season: 100 mal_season: season: current sort_by: score - summary: <>>> + limit: <> collections: @@ -110,37 +90,47 @@ collections: variables: key: popular template: - - name: popular + - name: mal - name: shared - name: arr - name: custom + - name: translation + translation_key: mal_popular MyAnimeList Favorited: variables: key: favorited template: - - name: favorited + - name: mal + chart: favorite - name: shared - name: arr - name: custom + - name: translation + translation_key: mal_favorited MyAnimeList Top Rated: variables: key: top template: - - name: top + - name: mal + chart: all - name: shared - name: arr - name: custom + - name: translation + translation_key: mal_top MyAnimeList Top Airing: variables: key: airing template: - - name: airing + - name: mal - name: shared - name: arr - name: custom + - name: translation + translation_key: mal_airing MyAnimeList Season: variables: @@ -150,3 +140,5 @@ collections: - name: shared - name: arr - name: custom + - name: translation + translation_key: mal_season diff --git a/defaults/chart/other.yml b/defaults/chart/other.yml index df2e7d13..ff250aa2 100644 --- a/defaults/chart/other.yml +++ b/defaults/chart/other.yml @@ -58,33 +58,21 @@ ############################################################# external_templates: - git: PMM/templates + pmm: templates template_variables: collection_section: "01" +translations: + pmm: translations + templates: anidb: default: limit_anidb: 30 - summary_anidb: A collection of Popular Anime on AniDB - summary: <>>> anidb_popular: <> commonsense: - default: - summary_commonsense: A collection of Common Sense <>s. Common Sense recognizes outstanding entertainment with an official seal for quality and impact. Common Sense Selections include age-appropriate media with the potential to spark family conversations, entertain families of all kinds, and have a positive, lasting effect on society. mdblist_list: https://mdblist.com/lists/plexmetamanager/cssfamilies<>s - summary: <>>> - - stevenlu: - default: - summary_stevenlu: A collection of StevenLu's Most Popular Movies - summary: <>>> - - pirated: - default: - summary_pirated: TorrentFreak.com's Weekly Top Ten Pirated Movies - summary: <>>> collections: AniDB Popular: @@ -95,6 +83,8 @@ collections: - name: shared - name: arr - name: custom + - name: translation + translation_key: anidb_popular Common Sense Selection: variables: @@ -104,25 +94,29 @@ collections: - name: shared - name: arr - name: custom + - name: translation + translation_key: commonsense_selection StevenLu's Popular Movies: variables: key: stevenlu stevenlu_popular: true template: - - name: stevenlu - name: shared allowed_libraries: movie - name: arr - name: custom + - name: translation + translation_key: stevenlu_popular Top 10 Pirated Movies of the Week: variables: key: pirated mdblist_list: https://mdblist.com/lists/hdlists/top-ten-pirated-movies-of-the-week-torrent-freak-com/ template: - - name: pirated - name: shared allowed_libraries: movie - name: arr - name: custom + - name: translation + translation_key: pirated_popular diff --git a/defaults/chart/tautulli.yml b/defaults/chart/tautulli.yml index 78ab0303..335d8618 100644 --- a/defaults/chart/tautulli.yml +++ b/defaults/chart/tautulli.yml @@ -50,27 +50,27 @@ ############################################################# external_templates: - git: PMM/templates + pmm: templates template_variables: collection_section: "01" +translations: + pmm: translations + templates: tautulli_popular: default: list_days_popular: 30 list_size_popular: 20 - summary_popular: A collection of <>s Popular on Plex - summary: <>>> tautulli_popular: list_days: <> list_size: <> list_buffer: 20 + tautulli_watched: default: list_days_watched: 30 list_size_watched: 20 - summary_watched: A collection of Top <>s Watched on Plex - summary: <>>> tautulli_watched: list_days: <> list_size: <> @@ -85,6 +85,8 @@ collections: - name: shared - name: arr - name: custom + - name: translation + translation_key: tautulli_popular Plex Watched: variables: @@ -94,3 +96,5 @@ collections: - name: shared - name: arr - name: custom + - name: translation + translation_key: tautulli_watched diff --git a/defaults/chart/tmdb.yml b/defaults/chart/tmdb.yml index dc89728d..9d7cdd60 100644 --- a/defaults/chart/tmdb.yml +++ b/defaults/chart/tmdb.yml @@ -61,46 +61,20 @@ ############################################################# external_templates: - git: PMM/templates + pmm: templates template_variables: collection_section: "01" -templates: - - airing: - default: - limit_airing: 100 - summary_airing: A collection of shows with episodes airing today - tmdb_airing_today: <> - summary: <>>> - - air: - default: - limit_air: 100 - summary_air: A collection of shows that are still activaly airing episodes. - tmdb_on_the_air: <> - summary: <>>> +translations: + pmm: translations - popular: - default: - limit_popular: 100 - summary_popular: A collection of the most watched <>s according to TMDb. - tmdb_popular: <> - summary: <>>> - - top: - default: - limit_top: 100 - summary_top: A collection of the top rated <>s according to TMDb. - tmdb_top_rated: <> - summary: <>>> +templates: - trending: + tmdb: default: - limit_trending: 100 - summary_trending: A collection of <>s trending on TMDb - tmdb_trending_weekly: <> - summary: <>>> + limit_<>: 100 + chart: <> + tmdb_<>: <>>> collections: @@ -108,45 +82,59 @@ collections: variables: key: airing template: - - name: airing + - name: tmdb + chart: airing_today - name: shared allowed_libraries: show - name: arr - name: custom + - name: translation + translation_key: tmdb_airing TMDb On The Air: variables: key: air template: - - name: air + - name: tmdb + chart: on_the_air - name: shared allowed_libraries: show - name: arr - name: custom + - name: translation + translation_key: tmdb_air TMDb Popular: variables: key: popular template: - - name: popular + - name: tmdb - name: shared - name: arr - name: custom + - name: translation + translation_key: tmdb_popular TMDb Top Rated: variables: key: top template: - - name: top + - name: tmdb + chart: top_rated - name: shared - name: arr - name: custom + - name: translation + translation_key: tmdb_top TMDb Trending: variables: key: trending template: - - name: trending + - name: tmdb + chart: trending_weekly - name: shared - name: arr - - name: custom \ No newline at end of file + - name: custom + - name: translation + translation_key: tmdb_trending \ No newline at end of file diff --git a/defaults/chart/trakt.yml b/defaults/chart/trakt.yml index c6aa7ceb..b7ea4a5f 100644 --- a/defaults/chart/trakt.yml +++ b/defaults/chart/trakt.yml @@ -64,10 +64,13 @@ ############################################################# external_templates: - git: PMM/templates + pmm: templates template_variables: collection_section: "01" +translations: + pmm: translations + templates: trakt: default: diff --git a/defaults/translations/default.yml b/defaults/translations/default.yml index 1a03a3ee..787443d7 100644 --- a/defaults/translations/default.yml +++ b/defaults/translations/default.yml @@ -1,27 +1,27 @@ translations: bafta_best_name: BAFTA Best Films - bafta_best_summary: British Academy of Film and Television Arts Best Film Winners + bafta_best_summary: British Academy of Film and Television Arts Best Film Winners. bafta_year_name: BAFTA <> - bafta_year_summary: <> BAFTA Awards + bafta_year_summary: <> BAFTA Awards. cannes_best_name: Cannes Golden Palm Winners - cannes_best_summary: Cannes Golden Palm Winners + cannes_best_summary: Cannes Golden Palm Winners. cannes_year_name: Cannes <> - cannes_year_summary: <> Cannes Awards + cannes_year_summary: <> Cannes Awards. choice_year_name: Critics Choice Awards <> - choice_year_summary: <> Critics Choice Awards + choice_year_summary: <> Critics Choice Awards. emmy_year_name: Emmys <> - emmy_year_summary: <> Emmy Winners + emmy_year_summary: <> Emmy Winners. golden_best_name: Golden Globe Best Motion Pictures - golden_best_summary: Golden Globe Best Motion Pictures + golden_best_summary: Golden Globe Best Motion Pictures. golden_year_name: Golden Globe <> - golden_year_summary: <> Golden Globe Winners + golden_year_summary: <> Golden Globe Winners. oscars_picture_name: Oscars Best Picture Winners oscars_picture_summary: The Academy Award for Best Picture is one of the Academy Awards presented annually by the Academy of Motion Picture Arts and Sciences since the awards debuted in 1929. @@ -30,7 +30,7 @@ translations: oscars_director_summary: The Academy Award for Best Director is one of the Academy Awards presented annually by the Academy of Motion Picture Arts and Sciences since the awards debuted in 1929. oscars_year_name: Oscars Winners <> - oscars_year_summary: Academy Awards (Oscars) Winners for <> + oscars_year_summary: Academy Awards (Oscars) Winners for <>. berlinale_best_name: Berlinale Golden Bears berlinale_best_summary: Up to 400 films are shown every year as part of the Berlinale's (Berlin International Film Festival) public programme, the vast majority of which are world or European premieres. Films of every genre, length and format can be submitted for consideration. The Golden Bear (German Goldener Bär) is the highest prize awarded for the best film shown during this festival. @@ -45,18 +45,127 @@ translations: venice_best_summary: The Venice Film Festival is the oldest film festival in the world. Founded 1932, the festival has since taken place every year in Venice, Italy. It is part of the Venice Biennale, a major biennial exhibition and festival for contemporary art. The festival's Leone d'Oro (Golden Lion) prize is awarded to the best film screened at the festival. spirit_year_name: Independent Spirit Awards <> - spirit_year_summary: <> Independent Spirit Awards + spirit_year_summary: <> Independent Spirit Awards. sundance_best_name: Sundance Grand Jury Winners sundance_best_summary: The Sundance Film Festival is a film festival that takes place annually in the state of Utah, in the United States. It is the largest independent cinema festival in the U.S. Held in January, the festival is the premier showcase for new work from American and international independent filmmakers. The festival comprises competitive sections for American and international dramatic and documentary films, both feature-length films and short films, and a group of non-competitive showcase sections. sundance_year_name: Sundance Film Festival <> - sundance_year_summary: Sundance Film Festival of <> + sundance_year_summary: Sundance Film Festival of <>. - actor_summary: <>s with <> + actor_name: <> + actor_summary: <>s with <>. audio_language_name: <> Audio - audio_language_summary: <>s filmed in <> + audio_language_summary: <>s filmed in the <> Language. - content_rating_uk_summary: <>s that are rated <> + audio_language_other_name: Other Audio + audio_language_other_summary: <>s filmed in other uncommon Languages. + content_rating_uk: <> <>s + content_rating_uk_summary: <>s that are rated <>. + + content_rating_uk_other_name: Other Ratings + content_rating_uk_other_summary: <>s with other uncommon Ratings. + + genre_name: <> <>s + genre_summary: <>s that have the genre <>. + + resolution_name: <> <>s + resolution_summary: <>s that have the resolution <>. + + resolution_standards_name: <> <>s + resolution_standards_summary: <>s that have the resolution <>. + + resolution_standards_other_name: Other Resolutions + resolution_standards_other_summary: <>s that have other uncommon resolutions. + + streaming_name: <> <>s + streaming_summary: <>s streaming on <>. + + studio_name: <> + studio_summary: <>s produced by <>. + + subtitle_language_name: <> Subtitles + subtitle_language_summary: <>s with <> Subtitles. + + subtitle_language_other_name: Other Subtitles + subtitle_language_other_summary: <>s with other uncommon Subtitles. + + year_name: Best of <> + year_summary: <>s released in <>. + + anilist_popular_name: AniList Popular + anilist_popular_summary: A collection of the most popular Anime according to AniList. + + anilist_top_rated_name: AniList Top Rated + anilist_top_rated_summary: A collection of the top rated Anime according to AniList. + + anilist_trending_name: AniList Trending + anilist_trending_summary: A collection of trending Anime according to AniList. + + anilist_season_name: AniList Season + anilist_season_summary: A collection of Anime from the Current Season according to AniList. + + basic_released_name: Newly Released + basic_released_summary: A collection of newly-released <>s. + + basic_episodes_name: New Episodes + basic_episodes_summary: A collection of newly-released <>s. + + imdb_popular_name: IMDb Popular + imdb_popular_summary: List of <> <>s. + + imdb_top_name: IMDb Top 250 + imdb_top_summary: List of <> <>s. + + imdb_lowest_name: IMDb Lowest Rated + imdb_lowest_summary: List of <> <>s. + + mal_popular_name: MyAnimeList Popular + mal_popular_summary: A collection of the most popular Anime according to MyAnimeList. + + mal_favorited_name: MyAnimeList Favorited + mal_favorited_summary: A collection of the Most Favorited Anime according to MyAnimeList. + + mal_top_name: MyAnimeList Top Rated + mal_top_summary: A collection of the Top Rated Anime according to MyAnimeList. + + mal_airing_name: MyAnimeList Top Airing + mal_airing_summary: A collection of the Top Rated Anime Currently Airing according to MyAnimeList. + + mal_season_name: MyAnimeList Season + mal_season_summary: A collection of Anime from the Current Season according to MyAnimeList. + + anidb_popular_name: AniDB Popular + anidb_popular_summary: A collection of Popular Anime on AniDB. + + commonsense_selection_name: Common Sense Selection + commonsense_selection_summary: A collection of Common Sense <>s. Common Sense recognizes outstanding entertainment with an official seal for quality and impact. Common Sense Selections include age-appropriate media with the potential to spark family conversations, entertain families of all kinds, and have a positive, lasting effect on society. + + stevenlu_popular_name: StevenLu's Popular Movies + stevenlu_popular_summary: A collection of StevenLu's Most Popular Movies. + + pirated_popular_name: Top 10 Pirated Movies of the Week + pirated_popular_summary: TorrentFreak.com's Weekly Top Ten Pirated Movies. + + tautulli_popular_name: Plex Popular + tautulli_popular_summary: A collection of <>s Popular on Plex. + + tautulli_watched_name: Plex Watched + tautulli_watched_summary: A collection of Top <>s Watched on Plex. + + tmdb_airing_name: TMDb Airing Today + tmdb_airing_summary: A collection of shows with episodes airing today. + + tmdb_air_name: TMDb On The Air + tmdb_air_summary: A collection of shows that are still activaly airing episodes. + + tmdb_popular_name: TMDb Popular + tmdb_popular_summary: A collection of the most watched <>s according to TMDb. + + tmdb_top_name: TMDb Top Rated + tmdb_top_summary: A collection of the top rated <>s according to TMDb. + + tmdb_trending_name: TMDb Trending + tmdb_trending_summary: A collection of <>s trending on TMDb. \ No newline at end of file diff --git a/modules/meta.py b/modules/meta.py index 1cb372f2..4dc8cf1f 100644 --- a/modules/meta.py +++ b/modules/meta.py @@ -129,10 +129,12 @@ class DataFile: raise Failed(f"File Error: File does not exist {content_path}") yaml = YAML(path=content_path, check_empty=True) if not translation: + logger.debug(f"File Loaded From: {content_path}") return yaml.data if "translations" not in yaml.data: raise Failed(f"URL Error: Top Level translations attribute not found in {content_path}") translations = {k: {"default": v} for k, v in yaml.data["translations"]} + logger.debug(f"Translations Loaded From: {dir_path}") def add_translation(yaml_path, yaml_key, data=None): yaml_content = YAML(input_data=data, path=yaml_path if data is None else None, check_empty=True) @@ -818,10 +820,10 @@ class MetadataFile(DataFile): used_keys.extend(key_value) og_call = {"value": key_value, auto_type: key_value, "key_name": key_name, "key": key} for k, v in template_variables.items(): - if not isinstance(v, dict): - og_call[k] = v - elif key in v: + if key in v: og_call[k] = v[key] + elif "default" in v: + og_call[k] = v["default"] template_call = [] for template_name in template_names: new_call = og_call.copy() @@ -849,10 +851,10 @@ class MetadataFile(DataFile): auto_type: other_keys, "key_name": other_name, "key": "other" } for k, v in template_variables.items(): - if not isinstance(v, dict): - og_other[k] = v - elif "other" in v: + if "other" in v: og_other[k] = v["other"] + elif "default" in v: + og_other[k] = v["default"] other_call = [] for other_template in other_templates: new_call = og_other.copy() diff --git a/modules/util.py b/modules/util.py index 21c237b2..eebe13da 100644 --- a/modules/util.py +++ b/modules/util.py @@ -717,7 +717,7 @@ def parse(error, attribute, data, datatype=None, methods=None, parent=None, defa new_data[str(dict_data_key)] = dict_data_data final_dict[dict_key] = new_data else: - final_dict[dict_key] = dict_data + raise Failed(f"{error} Warning: {display} {dict_key} is not a dictionary") return final_dict else: raise Failed(f"{error} Error: {display} {value} is not a dictionary")