#430 add new tmdb_discover options

modules/builder.py

@@ -978,10 +978,10 @@ class CollectionBuilder:
                         new_dictionary[discover_attr] = util.parse(discover_attr, discover_data, parent=method_name, regex=regex)
                     elif discover_attr == "sort_by" and self.library.is_movie:
                         options = tmdb.discover_movie_sort if self.library.is_movie else tmdb.discover_tv_sort
-                        new_dictionary[discover_attr] = util.parse(discover_attr, discover_data, parent=method_name, options=options)
+                        new_dictionary[discover_final] = util.parse(discover_attr, discover_data, parent=method_name, options=options)
                     elif discover_attr == "certification_country":
                         if "certification" in dict_data or "certification.lte" in dict_data or "certification.gte" in dict_data:
-                            new_dictionary[discover_attr] = discover_data
+                            new_dictionary[discover_final] = discover_data
                         else:
                             raise Failed(f"Collection Error: {method_name} {discover_attr} attribute: must be used with either certification, certification.lte, or certification.gte")
                     elif discover_attr == "certification":
@@ -989,10 +989,24 @@ class CollectionBuilder:
                             new_dictionary[discover_final] = discover_data
                         else:
                             raise Failed(f"Collection Error: {method_name} {discover_final} attribute: must be used with certification_country")
+                    elif discover_attr == "watch_region":
+                        if "with_watch_providers" in dict_data:
+                            new_dictionary[discover_final] = discover_data
+                        else:
+                            raise Failed(f"Collection Error: {method_name} {discover_final} attribute: must be used with with_watch_providers")
+                    elif discover_attr == "with_watch_monetization_types":
+                        if "watch_region" in dict_data:
+                            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"]:
                         new_dictionary[discover_attr] = util.parse(discover_attr, discover_data, datatype="bool", parent=method_name)
                     elif discover_final in tmdb.discover_dates:
                         new_dictionary[discover_final] = util.validate_date(discover_data, f"{method_name} {discover_final} attribute", return_as="%m/%d/%Y")
+                    elif discover_attr == "with_status":
+                        new_dictionary[discover_attr] = util.parse(discover_attr, discover_data, datatype="int", parent=method_name, minimum=0, maximum=5)
+                    elif discover_attr == "with_type":
+                        new_dictionary[discover_attr] = util.parse(discover_attr, discover_data, datatype="int", parent=method_name, minimum=0, maximum=6)
                     elif discover_attr in ["primary_release_year", "year", "first_air_date_year"]:
                         new_dictionary[discover_attr] = util.parse(discover_attr, discover_data, datatype="int", parent=method_name, minimum=1800, maximum=self.current_year + 1)
                     elif discover_attr in ["vote_count", "vote_average", "with_runtime"]:

modules/convert.py

@@ -291,13 +291,13 @@ class Convert:
                     logger.info(util.adjust_space(f" Cache  |  {'^' if expired else '+'}  | {ids} | {item.title}"))
                     self.config.Cache.update_guid_map(item.guid, cache_ids, imdb_in, expired, guid_type)
 
-            if tmdb_id and library.is_movie:
+            if (tmdb_id or imdb_id) and library.is_movie:
                 update_cache(tmdb_id, "TMDb", imdb_id, "movie")
                 return "movie", tmdb_id, imdb_id
-            elif tvdb_id and library.is_show:
+            elif (tvdb_id or imdb_id) and library.is_show:
                 update_cache(tvdb_id, "TVDb", imdb_id, "show")
                 return "show", tvdb_id, imdb_id
-            elif anidb_id and tmdb_id and library.is_show:
+            elif anidb_id and (tmdb_id or imdb_id) and library.is_show:
                 update_cache(tmdb_id, "TMDb", imdb_id, "show_movie")
                 return "movie", tmdb_id, imdb_id
             else:

modules/radarr.py

@@ -51,7 +51,7 @@ class Radarr:
         for i, item in enumerate(tmdb_ids, 1):
             path = item[1] if isinstance(item, tuple) else None
             tmdb_id = item[0] if isinstance(item, tuple) else item
-            util.print_return(f"Loading TMDb ID: {tmdb_id} {i}/{len(tmdb_ids)}")
+            util.print_return(f"Loading TMDb ID {i}/{len(tmdb_ids)} ({tmdb_id})")
             try:
                 movie = self.api.get_movie(tmdb_id=tmdb_id)
                 movies.append((movie, path) if path else movie)

modules/sonarr.py

@@ -77,7 +77,7 @@ class Sonarr:
         for i, item in enumerate(tvdb_ids, 1):
             path = item[1] if isinstance(item, tuple) else None
             tvdb_id = item[0] if isinstance(item, tuple) else item
-            util.print_return(f"Loading TVDb ID: {tvdb_id} {i}/{len(tvdb_ids)}")
+            util.print_return(f"Loading TVDb ID {i}/{len(tvdb_ids)} ({tvdb_id})")
             try:
                 show = self.api.get_series(tvdb_id=tvdb_id)
                 shows.append((show, path) if path else show)

modules/tmdb.py

@@ -27,8 +27,9 @@ discover_all = [
     "year", "primary_release_year", "primary_release_date.gte", "primary_release_date.lte",
     "release_date.gte", "release_date.lte", "vote_count.gte", "vote_count.lte",
     "vote_average.gte", "vote_average.lte", "with_runtime.gte", "with_runtime.lte",
-    "with_companies", "with_genres", "without_genres", "with_keywords", "without_keywords", "include_adult",
-    "timezone", "screened_theatrically", "include_null_first_air_dates", "limit",
+    "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"
 ]
 discover_movie_only = [
@@ -36,8 +37,8 @@ discover_movie_only = [
     "year", "primary_release_year", "primary_release_date", "release_date", "include_adult"
 ]
 discover_tv_only = [
-    "timezone", "screened_theatrically", "include_null_first_air_dates",
-    "air_date", "first_air_date", "first_air_date_year", "with_networks",
+    "timezone", "screened_theatrically", "include_null_first_air_dates", "air_date",
+    "first_air_date", "first_air_date_year", "with_networks", "with_status", "with_type",
 ]
 discover_dates = [
     "primary_release_date.gte", "primary_release_date.lte", "release_date.gte", "release_date.lte",
@@ -49,6 +50,7 @@ discover_movie_sort = [
     "vote_average.asc", "vote_average.desc", "vote_count.asc", "vote_count.desc"
 ]
 discover_tv_sort = ["vote_average.desc", "vote_average.asc", "first_air_date.desc", "first_air_date.asc", "popularity.desc", "popularity.asc"]
+discover_monetization_types = ["flatrate", "free", "ads", "rent", "buy"]
 
 class TMDb:
     def __init__(self, config, params):