2.4.0 Filter/Subfilter Overall, tmdb_director, and tmdb_writer

CHANGELOG.md

@@ -4,7 +4,22 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.3.0] - 2020-11-02
+## [2.4.0] - 2020-11-03
+### Added
+- Added `plex_search` to AND searches together
+- Added additional `filters` and allow for use of `.not` for inverse `filters`
+- Added `tmdb_director` and `tmdb_writer` which function the same as `tmdb_actor` but for directors and writers
+- More compatibility  with previous config files.
+
+### Changed
+- `Plex Filters` are now listed and have been tested and have been changed to `Plex Searches`
+- `subfilters` are now listed and have been tested and have been changed to `filters`
+
+### Fixed
+- `collection_order` was in the code as `collection_sort`
+- Upgrade PlexAPI dependency to 4.2.0
+
+## [2.3.0] - 2020-11-03
 ### Added
 - Support for the new Plex Movie agent
 - Cache database for IMDB/TMDB id lookups

app/config_tools.py

@@ -57,7 +57,7 @@ def check_for_attribute(config, attribute, parent=None, test_list=None, options=
         message = message + " using {} as default".format(default)
     message = message + endline
     if (default is None and not default_is_none) or throw:
-        if len(options) > 0 and not throw:
+        if len(options) > 0:
             message = message + "\n" + options
         sys.exit(message)
     if do_print:

app/imdb_tools.py

@@ -54,7 +54,7 @@ def imdb_get_movies(config_path, plex, data):
         tree = html.fromstring(r.content)
         title_ids.extend(tree.xpath("//div[contains(@class, 'lister-item-image')]"
                                     "//a/img//@data-tconst"))
-    matched_imbd_movies = []
+    matched_imdb_movies = []
     missing_imdb_movies = []
     plex_tools.create_cache(config_path)
     if title_ids:
@@ -90,31 +90,15 @@ def imdb_get_movies(config_path, plex, data):
         for imdb_id in title_ids:
             movie = imdb_map.pop(imdb_id, None)
             if movie:
-                matched_imbd_movies.append(plex.Server.fetchItem(movie.ratingKey))
+                matched_imdb_movies.append(plex.Server.fetchItem(movie.ratingKey))
             else:
                 missing_imdb_movies.append(imdb_id)
 
-    return matched_imbd_movies, missing_imdb_movies
-
-def tmdb_parse_id(data):
-    try:
-        tmdb_id = re.search('.*?(\\d+)', str(data)) # re.search requires a string
-        tmdb_id = tmdb_id.group(1)
-        return tmdb_id
-    except AttributeError:  # Bad URL Provided
-        raise ValueError("| Config Error: TMDb ID: {} is invalid it must be a number".format(data))
-
-def tvdb_parse_id(data):
-    try:	
-        tvdb_id = re.search('(\\d+)', str(data)) # re.search requires a string
-        tvdb_id = tvdb_id.group(1)
-        return tvdb_id
-    except AttributeError:	
-        raise ValueError("| Config Error: TVDb ID: {} is invalid it must be a number".format(data))
+    return matched_imdb_movies, missing_imdb_movies
 
 
 def tmdb_get_movies(config_path, plex, data, is_list=False):
-    tmdb_id = tmdb_parse_id(data)
+    tmdb_id = int(data)
     t_movs = []
     t_movie = Movie()
     t_movie.api_key = config_tools.TMDB(config_path).apikey  # Set TMDb api key for Movie
@@ -204,14 +188,9 @@ def tmdb_get_movies(config_path, plex, data, is_list=False):
 
 def get_tautulli(config_path, plex, data):
     tautulli = config_tools.Tautulli(config_path)
-    list_type = config_tools.check_for_attribute(data, "list_type", parent="tautulli", test_list=["popular", "watched"], options="| \tpopular (Most Popular List)\n| \twatched (Most Watched List)", throw=True, save=False)
-    time_range = config_tools.check_for_attribute(data, "list_days", parent="tautulli", var_type="int", default=30, save=False)
-    max = config_tools.check_for_attribute(data, "list_size", parent="tautulli", var_type="int", default=10, save=False)
-    buffer = config_tools.check_for_attribute(data, "list_buffer", parent="tautulli", var_type="int", default=20, save=False)
-    stats_count = max + buffer
 
-    response = requests.get("{}/api/v2?apikey={}&cmd=get_home_stats&time_range={}&stats_count={}".format(tautulli.url, tautulli.apikey, time_range, stats_count)).json()
-    stat_id = ("popular" if list_type == "popular" else "top") + "_" + ("movies" if plex.library_type == "movie" else "tv")
+    response = requests.get("{}/api/v2?apikey={}&cmd=get_home_stats&time_range={}&stats_count={}".format(tautulli.url, tautulli.apikey, data["list_days"], int(data["list_size"]) + int(data["list_buffer"]))).json()
+    stat_id = ("popular" if data["list_type"] == "popular" else "top") + "_" + ("movies" if plex.library_type == "movie" else "tv")
 
     items = None
     for entry in response['response']['data']:
@@ -234,7 +213,7 @@ def get_tautulli(config_path, plex, data):
     missing = []
     count = 0
     for item in items:
-        if item['section_id'] == section_id and count < max:
+        if item['section_id'] == section_id and count < int(data["list_size"]):
             matched.append(plex.Library.fetchItem(item['rating_key']))
             count = count + 1
 
@@ -243,18 +222,16 @@ def get_tautulli(config_path, plex, data):
 def get_tvdb_id_from_tmdb_id(id):
     lookup = trakt.Trakt['search'].lookup(id, 'tmdb', 'show')
     if lookup:
-        if isinstance(lookup, list):
-            return trakt.Trakt['search'].lookup(id, 'tmdb', 'show')[0].get_key('tvdb')
-        else:
-            return trakt.Trakt['search'].lookup(id, 'tmdb', 'show').get_key('tvdb')
+        lookup = lookup[0] if isinstance(lookup, list) else lookup
+        return lookup.get_key('tvdb')
     else:
         return None
 
 def tmdb_get_shows(config_path, plex, data, is_list=False):
     config_tools.TraktClient(config_path)
-    
-    tmdb_id = tmdb_parse_id(data)
-    
+
+    tmdb_id = int(data)
+
     t_tvs = []
     t_tv = TV()
     t_tv.api_key = config_tools.TMDB(config_path).apikey  # Set TMDb api key for Movie
@@ -309,8 +286,8 @@ def tmdb_get_shows(config_path, plex, data, is_list=False):
 
 def tvdb_get_shows(config_path, plex, data, is_list=False):
     config_tools.TraktClient(config_path)
-    
-    id = tvdb_parse_id(data)
+
+    id = int(data)
 
     p_tv_map = {}
     for item in plex.Library.all():
@@ -339,10 +316,11 @@ def tvdb_get_shows(config_path, plex, data, is_list=False):
 
     return matched, missing
 
-def tmdb_get_summary(config_path, data, type):
+def tmdb_get_metadata(config_path, data, type):
     # Instantiate TMDB objects
-    id = tmdb_parse_id(data)
+    id = int(data)
 
+    tmdb_url_prefix = "https://image.tmdb.org/t/p/original"
     api_key = config_tools.TMDB(config_path).apikey
     language = config_tools.TMDB(config_path).language
     is_movie = config_tools.Plex(config_path).library_type == "movie"
@@ -355,9 +333,9 @@ def tmdb_get_summary(config_path, data, type):
             if type == "overview":
                 return collection.details(id).overview
             elif type == "poster_path":
-                return collection.details(id).poster_path
+                return tmdb_url_prefix + collection.details(id).poster_path
             elif type == "backdrop_path":
-                return collection.details(id).backdrop_path
+                return tmdb_url_prefix + collection.details(id).backdrop_path
         except AttributeError:
             media = Movie() if is_movie else TV()
             media.api_key = api_key
@@ -366,9 +344,9 @@ def tmdb_get_summary(config_path, data, type):
                 if type == "overview":
                     return media.details(id).overview
                 elif type == "poster_path":
-                    return media.details(id).poster_path
+                    return tmdb_url_prefix + media.details(id).poster_path
                 elif type == "backdrop_path":
-                    return media.details(id).backdrop_path
+                    return tmdb_url_prefix + media.details(id).backdrop_path
             except AttributeError:
                 raise ValueError("| Config Error: TMBd {} ID: {} not found".format("Movie/Collection" if is_movie else "Show", id))
     elif type in ["biography", "profile_path", "name"]:
@@ -379,10 +357,10 @@ def tmdb_get_summary(config_path, data, type):
             if type == "biography":
                 return person.details(id).biography
             elif type == "profile_path":
-                return person.details(id).profile_path
+                return tmdb_url_prefix + person.details(id).profile_path
             elif type == "name":
                 return person.details(id).name
         except AttributeError:
             raise ValueError("| Config Error: TMBd Actor ID: {} not found".format(id))
     else:
-        raise RuntimeError("type {} not yet supported in tmdb_get_summary".format(type))
+        raise RuntimeError("type {} not yet supported in tmdb_get_metadata".format(type))