From 6fd699b58a8b6b2509a50f3f75fb7738ed5abffb Mon Sep 17 00:00:00 2001 From: meisnate12 Date: Mon, 29 Nov 2021 11:02:16 -0500 Subject: [PATCH] #464 added include_video and with_release_type to tmdb_discover --- modules/builder.py | 2 +- modules/tmdb.py | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/builder.py b/modules/builder.py index b8214a5e..0d24426b 100644 --- a/modules/builder.py +++ b/modules/builder.py @@ -1033,7 +1033,7 @@ class CollectionBuilder: new_dictionary[discover_final] = util.parse(discover_attr, discover_data, parent=method_name, options=tmdb.discover_monetization_types) else: raise Failed(f"Collection Error: {method_name} {discover_final} attribute: must be used with watch_region") - elif discover_attr in ["include_adult", "include_null_first_air_dates", "screened_theatrically"]: + elif discover_attr in tmdb.discover_booleans: new_dictionary[discover_attr] = util.parse(discover_attr, discover_data, datatype="bool", parent=method_name) elif discover_attr == "vote_average": new_dictionary[discover_final] = util.parse(discover_final, discover_data, datatype="float", parent=method_name) diff --git a/modules/tmdb.py b/modules/tmdb.py index 19bb3c75..6570b2c1 100644 --- a/modules/tmdb.py +++ b/modules/tmdb.py @@ -29,23 +29,24 @@ discover_all = [ "vote_average.gte", "vote_average.lte", "with_runtime.gte", "with_runtime.lte", "with_companies", "without_companies ", "with_genres", "without_genres", "with_keywords", "without_keywords", "with_watch_providers", "without_watch_providers", "watch_region", "with_watch_monetization_types", "with_status", - "include_adult", "timezone", "screened_theatrically", "include_null_first_air_dates", "limit", "with_type", - "air_date.gte", "air_date.lte", "first_air_date.gte", "first_air_date.lte", "first_air_date_year", "with_networks" + "include_adult", "include_video", "timezone", "screened_theatrically", "include_null_first_air_dates", "limit", "with_type", + "air_date.gte", "air_date.lte", "first_air_date.gte", "first_air_date.lte", "first_air_date_year", "with_networks", "with_release_type" ] discover_movie_only = [ - "region", "with_cast", "with_crew", "with_people", "certification_country", "certification", - "year", "primary_release_year", "primary_release_date", "release_date", "include_adult" + "region", "with_cast", "with_crew", "with_people", "certification_country", "certification", "include_video", + "year", "primary_release_year", "primary_release_date", "release_date", "include_adult", "with_release_type" ] discover_tv_only = [ "timezone", "screened_theatrically", "include_null_first_air_dates", "air_date", "first_air_date", "first_air_date_year", "with_networks", "with_status", "with_type", ] discover_strings = [ - "with_cast", "with_crew", "with_people", "with_companies", "with_networks", "with_genres", "without_genres", + "with_cast", "with_crew", "with_people", "with_companies", "with_networks", "with_genres", "without_genres", "with_release_type", "with_keywords", "without_keywords", "with_original_language", "timezone", "with_watch_providers", "without_watch_providers" ] discover_ints = ["vote_count", "with_runtime"] discover_years = ["primary_release_year", "year", "first_air_date_year"] +discover_booleans = ["include_adult", "include_video", "include_null_first_air_dates", "screened_theatrically"] discover_dates = [ "primary_release_date.gte", "primary_release_date.lte", "release_date.gte", "release_date.lte", "air_date.gte", "air_date.lte", "first_air_date.gte", "first_air_date.lte"