From a288eb3133dd4acf062c82c039b6bb493e3de742 Mon Sep 17 00:00:00 2001 From: meisnate12 Date: Tue, 15 Nov 2022 16:30:46 -0500 Subject: [PATCH] [21] update decade --- VERSION | 2 +- defaults/show/decade.yml | 4 ++-- defaults/translations/da.yml | 4 ---- defaults/translations/de.yml | 4 ---- defaults/translations/default.yml | 4 ---- defaults/translations/fr.yml | 4 ---- defaults/translations/pt-br.yml | 4 ---- modules/builder.py | 2 +- modules/meta.py | 10 +++++----- 9 files changed, 9 insertions(+), 29 deletions(-) diff --git a/VERSION b/VERSION index 03389141..2bbec4ce 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.18.0-develop20 +1.18.0-develop21 diff --git a/defaults/show/decade.yml b/defaults/show/decade.yml index c045951c..b15cc42d 100644 --- a/defaults/show/decade.yml +++ b/defaults/show/decade.yml @@ -25,7 +25,7 @@ collections: dynamic_collections: Decade: type: decade - title_format: Best of <>s + title_format: Best of <> template: - smart_filter - translation @@ -40,4 +40,4 @@ dynamic_collections: image: default: decade/best/<> translation_key: - default: decade_show \ No newline at end of file + default: decade \ No newline at end of file diff --git a/defaults/translations/da.yml b/defaults/translations/da.yml index 39e56f26..e0f55e54 100644 --- a/defaults/translations/da.yml +++ b/defaults/translations/da.yml @@ -447,10 +447,6 @@ translations: decade_name: Bedste fra <> decade_summary: Top <> <> fra <>. - # example key_name: 2010 - decade_show_name: Bedste fra <> - decade_show_summary: Top <> <> fra <>. - # example key_name: Robin Williams director_name: <> (Instruktør) director_summary: <> instrueret af <>. diff --git a/defaults/translations/de.yml b/defaults/translations/de.yml index bff539ce..7c1c57d6 100644 --- a/defaults/translations/de.yml +++ b/defaults/translations/de.yml @@ -458,10 +458,6 @@ translations: decade_name: Best of <> decade_summary: Top <> <> der <>. - # Beispiel key_name: 2010 - decade_show_name: Best of <>er - decade_show_summary: Top <> <> der <>er. - # Beispiel key_name: Robin Williams director_name: <> (Regisseur) director_summary: <> mit Regie durch <>. diff --git a/defaults/translations/default.yml b/defaults/translations/default.yml index a55da08c..b366ad79 100644 --- a/defaults/translations/default.yml +++ b/defaults/translations/default.yml @@ -447,10 +447,6 @@ translations: decade_name: Best of <> decade_summary: Top <> <>s of the <>. - # example key_name: 2010 - decade_show_name: Best of <>s - decade_show_summary: Top <> <>s of the <>s. - # example key_name: Robin Williams director_name: <> (Director) director_summary: <>s directed by <>. diff --git a/defaults/translations/fr.yml b/defaults/translations/fr.yml index 2eb03b09..1c839ff5 100644 --- a/defaults/translations/fr.yml +++ b/defaults/translations/fr.yml @@ -449,10 +449,6 @@ translations: decade_name: Les meilleurs des années <> decade_summary: Top <> des <>s des années <>. - # example key_name: 2010 - decade_show_name: Les meilleurs des années <> - decade_show_summary: Top <> des <>s des années <>. - # example key_name: Robin Williams director_name: <> (Réalisateur) director_summary: <>s réalisés par <>. diff --git a/defaults/translations/pt-br.yml b/defaults/translations/pt-br.yml index df24760c..f37fd4ad 100644 --- a/defaults/translations/pt-br.yml +++ b/defaults/translations/pt-br.yml @@ -447,10 +447,6 @@ translations: decade_name: Melhores de <> decade_summary: Top <> <>s dos <>. - # example key_name: 2010 - decade_show_name: Melhores de <>s - decade_show_summary: Top <> <>s dos <>s. - # example key_name: Robin Williams director_name: <> (Diretor) director_summary: <>s dirigido por <>. diff --git a/modules/builder.py b/modules/builder.py index eeac37a9..dc4469d1 100644 --- a/modules/builder.py +++ b/modules/builder.py @@ -2078,7 +2078,7 @@ class CollectionBuilder: if self.details["show_options"]: error += f"\nOptions: {names}" if validate: - raise Failed(error) + raise FilterFailed(error) elif not self.ignore_blank_results: logger.error(error) return valid_list diff --git a/modules/meta.py b/modules/meta.py index 0fb3b7c8..491dfeb9 100644 --- a/modules/meta.py +++ b/modules/meta.py @@ -31,8 +31,8 @@ default_templates = { "tmdb_collection": {"tmdb_collection_details": "<>", "minimum_items": 2}, "trakt_user_lists": {"trakt_list_details": "<>"}, "trakt_liked_lists": {"trakt_list_details": "<>"}, - "tmdb_popular_people": {"tmdb_person": f"<>", "plex_search": {"all": {"actor": "tmdb"}}}, - "trakt_people_list": {"tmdb_person": f"<>", "plex_search": {"all": {"actor": "tmdb"}}} + "tmdb_popular_people": {"tmdb_person": "<>", "plex_search": {"all": {"actor": "tmdb"}}}, + "trakt_people_list": {"tmdb_person": "<>", "plex_search": {"all": {"actor": "tmdb"}}} } def get_dict(attribute, attr_data, check_list=None, make_str=False): @@ -649,7 +649,7 @@ class MetadataFile(DataFile): addons[decade].append(item.year) all_keys[str(item.year)] = str(item.year) auto_list = {str(k): f"{k}s" for k in addons if str(k) not in exclude and f"{k}s" not in exclude} - default_template = {"smart_filter": {"limit": 50, "sort_by": "critic_rating.desc", "any": {"year": f"<>"}}} + default_template = {"smart_filter": {"limit": 50, "sort_by": "critic_rating.desc", "any": {"year": "<>"}}} default_title_format = "Best <>s of <>" elif auto_type in ["genre", "mood", "style", "album_style", "country", "studio", "edition", "network", "year", "decade", "content_rating", "subtitle_language", "audio_language", "resolution"]: search_tag = auto_type_translation[auto_type] if auto_type in auto_type_translation else auto_type @@ -673,12 +673,12 @@ class MetadataFile(DataFile): auto_list = {str(i.title): i.title for i in tags if str(i.title) not in exclude} if library.is_music: final_var = auto_type if auto_type.startswith("album") else f"artist_{auto_type}" - default_template = {"smart_filter": {"limit": 50, "sort_by": "plays.desc", "any": {final_var: f"<>"}}} + default_template = {"smart_filter": {"limit": 50, "sort_by": "plays.desc", "any": {final_var: "<>"}}} if auto_type.startswith("album"): default_template["builder_level"] = "album" default_title_format = f"Most Played <> {'Albums' if auto_type.startswith('album') else '<>'}s" elif auto_type == "resolution": - default_template = {"smart_filter": {"sort_by": "title.asc", "any": {auto_type: f"<>"}}} + default_template = {"smart_filter": {"sort_by": "title.asc", "any": {auto_type: "<>"}}} default_title_format = "<> <>s" else: default_template = {"smart_filter": {"limit": 50, "sort_by": "critic_rating.desc", "any": {f"{auto_type}.is" if auto_type == "studio" else auto_type: "<>"}}}