Merge pull request #465 from meisnate12/develop

v1.13.1
Kometa-Team · Nov 30, 2021 · 0ea91d6 · 0ea91d6
2 parents 0228574 + cdb850e
commit 0ea91d6
Show file tree

Hide file tree

Showing 20 changed files with 552 additions and 101 deletions.
diff --git a/README.md b/README.md
@@ -22,6 +22,12 @@ The script works with most Metadata agents including the new Plex Movie Agent, N
 3. After that you can start updating Metadata and building automatic Collections by creating a [Metadata File](https://github.com/meisnate12/Plex-Meta-Manager/wiki/Metadata-File) for each Library you want to interact with.
 4. Explore the [Wiki](https://github.com/meisnate12/Plex-Meta-Manager/wiki) to see all the different Collection Builders that can be used to create collections. 
 
+## IBRACORP Video Walkthrough
+
+[IBRACORP](https://ibracorp.io/) made a video walkthough for installing Plex Meta Manager on Unraid. While you might not be using Unraid the video goes over many key accepts of Plex Meta Manager and can be a great place to start learning how to use the script.
+
+[![Plex Meta Manager](https://img.youtube.com/vi/dF69MNoot3w/0.jpg)](https://www.youtube.com/watch?v=dF69MNoot3w "Plex Meta Manager")
+
 ## Support
 
 * Before posting on GitHub about an enhancement, error, or configuration question please visit the [Plex Meta Manager Discord Server](https://discord.gg/TsdpsFYqqm).

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.12.2-develop1115
+1.13.1
diff --git a/config/config.yml.template b/config/config.yml.template
@@ -37,14 +37,14 @@ webhooks:                                       # Can be individually specified
   collection_creation:
   collection_addition:
   collection_removal:
-plex:                                           # Can be individually specified per library as well
+plex:                                           # Can be individually specified per library as well; REQUIRED for the script to run
   url: http://192.168.1.12:32400
   token: ####################
   timeout: 60
   clean_bundles: false
   empty_trash: false
   optimize: false
-tmdb:
+tmdb:                                           # REQUIRED for the script to run
   apikey: ################################
   language: en
 tautulli:                                       # Can be individually specified per library as well
@@ -67,6 +67,8 @@ radarr:                                         # Can be individually specified
   quality_profile: HD-1080p
   tag:
   search: false
+  radarr_path:
+  plex_path:
 sonarr:                                         # Can be individually specified per library as well
   url: http://192.168.1.12:8989
   token: ################################
@@ -80,6 +82,8 @@ sonarr:                                         # Can be individually specified
   tag:
   search: false
   cutoff_search: false
+  sonarr_path:
+  plex_path:
 trakt:
   client_id: ################################################################
   client_secret: ################################################################

diff --git a/modules/builder.py b/modules/builder.py
diff --git a/modules/cache.py b/modules/cache.py
@@ -60,6 +60,14 @@ def __init__(self, config_path, expiration):
                     tmdb_id TEXT,
                     expiration_date TEXT)"""
                 )
+                cursor.execute(
+                    """CREATE TABLE IF NOT EXISTS flixpatrol_map (
+                    key INTEGER PRIMARY KEY,
+                    flixpatrol_id TEXT UNIQUE,
+                    tmdb_id TEXT,
+                    media_type TEXT,
+                    expiration_date TEXT)"""
+                )
                 cursor.execute(
                     """CREATE TABLE IF NOT EXISTS omdb_data (
                     key INTEGER PRIMARY KEY,
@@ -88,6 +96,18 @@ def __init__(self, config_path, expiration):
                     key INTEGER PRIMARY KEY,
                     library TEXT UNIQUE)"""
                 )
+                cursor.execute(
+                    """CREATE TABLE IF NOT EXISTS radarr_adds (
+                    key INTEGER PRIMARY KEY,
+                    tmdb_id TEXT,
+                    library TEXT)"""
+                )
+                cursor.execute(
+                    """CREATE TABLE IF NOT EXISTS sonarr_adds (
+                    key INTEGER PRIMARY KEY,
+                    tvdb_id TEXT,
+                    library TEXT)"""
+                )
                 cursor.execute("SELECT count(name) FROM sqlite_master WHERE type='table' AND name='image_map'")
                 if cursor.fetchone()[0] > 0:
                     cursor.execute(f"SELECT DISTINCT library FROM image_map")
@@ -161,6 +181,12 @@ def query_letterboxd_map(self, letterboxd_id):
     def update_letterboxd_map(self, expired, letterboxd_id, tmdb_id):
         self._update_map("letterboxd_map", "letterboxd_id", letterboxd_id, "tmdb_id", tmdb_id, expired)
 
+    def query_flixpatrol_map(self, flixpatrol_id, media_type):
+        return self._query_map("flixpatrol_map", flixpatrol_id, "flixpatrol_id", "tmdb_id", media_type=media_type)
+
+    def update_flixpatrol_map(self, expired, flixpatrol_id, tmdb_id, media_type):
+        self._update_map("flixpatrol_map", "flixpatrol_id", flixpatrol_id, "tmdb_id", tmdb_id, expired, media_type=media_type)
+
     def _query_map(self, map_name, _id, from_id, to_id, media_type=None, return_type=False):
         id_to_return = None
         expired = None
@@ -324,3 +350,31 @@ def update_image_map(self, rating_key, table_name, location, compare, overlay=""
             with closing(connection.cursor()) as cursor:
                 cursor.execute(f"INSERT OR IGNORE INTO {table_name}(rating_key) VALUES(?)", (rating_key,))
                 cursor.execute(f"UPDATE {table_name} SET location = ?, compare = ?, overlay = ? WHERE rating_key = ?", (location, compare, overlay, rating_key))
+
+    def query_radarr_adds(self, tmdb_id, library):
+        return self.query_arr_adds(tmdb_id, library, "radarr", "tmdb_id")
+
+    def query_sonarr_adds(self, tvdb_id, library):
+        return self.query_arr_adds(tvdb_id, library, "sonarr", "tvdb_id")
+
+    def query_arr_adds(self, t_id, library, arr, id_type):
+        with sqlite3.connect(self.cache_path) as connection:
+            connection.row_factory = sqlite3.Row
+            with closing(connection.cursor()) as cursor:
+                cursor.execute(f"SELECT * FROM {arr}_adds WHERE {id_type} = ? AND library = ?", (t_id, library))
+                row = cursor.fetchone()
+                if row and row[id_type]:
+                    return int(row[id_type])
+        return None
+
+    def update_radarr_adds(self, tmdb_id, library):
+        return self.update_arr_adds(tmdb_id, library, "radarr", "tmdb_id")
+
+    def update_sonarr_adds(self, tvdb_id, library):
+        return self.update_arr_adds(tvdb_id, library, "sonarr", "tvdb_id")
+
+    def update_arr_adds(self, t_id, library, arr, id_type):
+        with sqlite3.connect(self.cache_path) as connection:
+            connection.row_factory = sqlite3.Row
+            with closing(connection.cursor()) as cursor:
+                cursor.execute(f"INSERT OR IGNORE INTO {arr}_adds({id_type}, library) VALUES(?, ?)", (t_id, library))
diff --git a/modules/config.py b/modules/config.py
@@ -6,6 +6,7 @@
 from modules.anilist import AniList
 from modules.cache import Cache
 from modules.convert import Convert
+from modules.flixpatrol import FlixPatrol
 from modules.icheckmovies import ICheckMovies
 from modules.imdb import IMDb
 from modules.letterboxd import Letterboxd
@@ -124,7 +125,8 @@ def check_for_attribute(data, attribute, parent=None, test_list=None, default=No
                     else:                                                               endline = ""
                     yaml.round_trip_dump(loaded_config, open(self.config_path, "w"), indent=None, block_seq_indent=2)
             elif data[attribute] is None:
-                if default_is_none is True:                                         return None
+                if default_is_none and var_type == "list":                          return []
+                elif default_is_none:                                               return None
                 else:                                                               message = f"{text} is blank"
             elif var_type == "url":
                 if data[attribute].endswith(("\\", "/")):                           return data[attribute][:-1]
@@ -180,7 +182,7 @@ def check_for_attribute(data, attribute, parent=None, test_list=None, default=No
         self.general = {
             "cache": check_for_attribute(self.data, "cache", parent="settings", var_type="bool", default=True),
             "cache_expiration": check_for_attribute(self.data, "cache_expiration", parent="settings", var_type="int", default=60),
-            "asset_directory": check_for_attribute(self.data, "asset_directory", parent="settings", var_type="list_path", default=[os.path.join(default_dir, "assets")]),
+            "asset_directory": check_for_attribute(self.data, "asset_directory", parent="settings", var_type="list_path", default=[os.path.join(default_dir, "assets")], default_is_none=True),
             "asset_folders": check_for_attribute(self.data, "asset_folders", parent="settings", var_type="bool", default=True),
             "assets_for_all": check_for_attribute(self.data, "assets_for_all", parent="settings", var_type="bool", default=False, save=False, do_print=False),
             "sync_mode": check_for_attribute(self.data, "sync_mode", parent="settings", default="append", test_list=sync_modes),
@@ -228,7 +230,11 @@ def check_for_attribute(data, attribute, parent=None, test_list=None, default=No
             logger.warning("notifiarr attribute not found")
 
         self.Webhooks = Webhooks(self, self.webhooks, notifiarr=self.NotifiarrFactory)
-        self.Webhooks.start_time_hooks(self.run_start_time)
+        try:
+            self.Webhooks.start_time_hooks(self.run_start_time)
+        except Failed as e:
+            util.print_stacktrace()
+            logger.error(f"Webhooks Error: {e}")
 
         self.errors = []
 
@@ -320,8 +326,9 @@ def check_for_attribute(data, attribute, parent=None, test_list=None, default=No
             self.IMDb = IMDb(self)
             self.Convert = Convert(self)
             self.AniList = AniList(self)
-            self.Letterboxd = Letterboxd(self)
+            self.FlixPatrol = FlixPatrol(self)
             self.ICheckMovies = ICheckMovies(self)
+            self.Letterboxd = Letterboxd(self)
             self.StevenLu = StevenLu(self)
 
             util.separator()
@@ -346,7 +353,9 @@ def check_for_attribute(data, attribute, parent=None, test_list=None, default=No
                 "availability": check_for_attribute(self.data, "availability", parent="radarr", test_list=radarr.availability_descriptions, default="announced"),
                 "quality_profile": check_for_attribute(self.data, "quality_profile", parent="radarr", default_is_none=True),
                 "tag": check_for_attribute(self.data, "tag", parent="radarr", var_type="lower_list", default_is_none=True),
-                "search": check_for_attribute(self.data, "search", parent="radarr", var_type="bool", default=False)
+                "search": check_for_attribute(self.data, "search", parent="radarr", var_type="bool", default=False),
+                "radarr_path": check_for_attribute(self.data, "radarr_path", parent="radarr", default_is_none=True),
+                "plex_path": check_for_attribute(self.data, "plex_path", parent="radarr", default_is_none=True)
             }
             self.general["sonarr"] = {
                 "url": check_for_attribute(self.data, "url", parent="sonarr", var_type="url", default_is_none=True),
@@ -361,7 +370,9 @@ def check_for_attribute(data, attribute, parent=None, test_list=None, default=No
                 "season_folder": check_for_attribute(self.data, "season_folder", parent="sonarr", var_type="bool", default=True),
                 "tag": check_for_attribute(self.data, "tag", parent="sonarr", var_type="lower_list", default_is_none=True),
                 "search": check_for_attribute(self.data, "search", parent="sonarr", var_type="bool", default=False),
-                "cutoff_search": check_for_attribute(self.data, "cutoff_search", parent="sonarr", var_type="bool", default=False)
+                "cutoff_search": check_for_attribute(self.data, "cutoff_search", parent="sonarr", var_type="bool", default=False),
+                "sonarr_path": check_for_attribute(self.data, "sonarr_path", parent="sonarr", default_is_none=True),
+                "plex_path": check_for_attribute(self.data, "plex_path", parent="sonarr", default_is_none=True)
             }
             self.general["tautulli"] = {
                 "url": check_for_attribute(self.data, "url", parent="tautulli", var_type="url", default_is_none=True),
@@ -495,6 +506,7 @@ def check_dict(attr, name):
                     self.errors.append(e)
                     util.print_stacktrace()
                     util.print_multiline(e, error=True)
+                    logger.info("")
                     logger.info(f"{display_name} Library Connection Failed")
                     continue
 
@@ -505,17 +517,19 @@ def check_dict(attr, name):
                     logger.info(f"Connecting to {display_name} library's Radarr...")
                     logger.info("")
                     try:
-                        library.Radarr = Radarr(self, {
+                        library.Radarr = Radarr(self, library, {
                             "url": check_for_attribute(lib, "url", parent="radarr", var_type="url", default=self.general["radarr"]["url"], req_default=True, save=False),
                             "token": check_for_attribute(lib, "token", parent="radarr", default=self.general["radarr"]["token"], req_default=True, save=False),
                             "add": check_for_attribute(lib, "add", parent="radarr", var_type="bool", default=self.general["radarr"]["add"], save=False),
                             "add_existing": check_for_attribute(lib, "add_existing", parent="radarr", var_type="bool", default=self.general["radarr"]["add_existing"], save=False),
                             "root_folder_path": check_for_attribute(lib, "root_folder_path", parent="radarr", default=self.general["radarr"]["root_folder_path"], req_default=True, save=False),
                             "monitor": check_for_attribute(lib, "monitor", parent="radarr", var_type="bool", default=self.general["radarr"]["monitor"], save=False),
                             "availability": check_for_attribute(lib, "availability", parent="radarr", test_list=radarr.availability_descriptions, default=self.general["radarr"]["availability"], save=False),
-                            "quality_profile": check_for_attribute(lib, "quality_profile", parent="radarr",default=self.general["radarr"]["quality_profile"], req_default=True, save=False),
+                            "quality_profile": check_for_attribute(lib, "quality_profile", parent="radarr", default=self.general["radarr"]["quality_profile"], req_default=True, save=False),
                             "tag": check_for_attribute(lib, "tag", parent="radarr", var_type="lower_list", default=self.general["radarr"]["tag"], default_is_none=True, save=False),
-                            "search": check_for_attribute(lib, "search", parent="radarr", var_type="bool", default=self.general["radarr"]["search"], save=False)
+                            "search": check_for_attribute(lib, "search", parent="radarr", var_type="bool", default=self.general["radarr"]["search"], save=False),
+                            "radarr_path": check_for_attribute(lib, "radarr_path", parent="radarr", default=self.general["radarr"]["radarr_path"], default_is_none=True, save=False),
+                            "plex_path": check_for_attribute(lib, "plex_path", parent="radarr", default=self.general["radarr"]["plex_path"], default_is_none=True, save=False)
                         })
                     except Failed as e:
                         self.errors.append(e)
@@ -531,7 +545,7 @@ def check_dict(attr, name):
                     logger.info(f"Connecting to {display_name} library's Sonarr...")
                     logger.info("")
                     try:
-                        library.Sonarr = Sonarr(self, {
+                        library.Sonarr = Sonarr(self, library, {
                             "url": check_for_attribute(lib, "url", parent="sonarr", var_type="url", default=self.general["sonarr"]["url"], req_default=True, save=False),
                             "token": check_for_attribute(lib, "token", parent="sonarr", default=self.general["sonarr"]["token"], req_default=True, save=False),
                             "add": check_for_attribute(lib, "add", parent="sonarr", var_type="bool", default=self.general["sonarr"]["add"], save=False),
@@ -544,7 +558,9 @@ def check_dict(attr, name):
                             "season_folder": check_for_attribute(lib, "season_folder", parent="sonarr", var_type="bool", default=self.general["sonarr"]["season_folder"], save=False),
                             "tag": check_for_attribute(lib, "tag", parent="sonarr", var_type="lower_list", default=self.general["sonarr"]["tag"], default_is_none=True, save=False),
                             "search": check_for_attribute(lib, "search", parent="sonarr", var_type="bool", default=self.general["sonarr"]["search"], save=False),
-                            "cutoff_search": check_for_attribute(lib, "cutoff_search", parent="sonarr", var_type="bool", default=self.general["sonarr"]["cutoff_search"], save=False)
+                            "cutoff_search": check_for_attribute(lib, "cutoff_search", parent="sonarr", var_type="bool", default=self.general["sonarr"]["cutoff_search"], save=False),
+                            "sonarr_path": check_for_attribute(lib, "sonarr_path", parent="sonarr", default=self.general["sonarr"]["sonarr_path"], default_is_none=True, save=False),
+                            "plex_path": check_for_attribute(lib, "plex_path", parent="sonarr", default=self.general["sonarr"]["plex_path"], default_is_none=True, save=False)
                         })
                     except Failed as e:
                         self.errors.append(e)
@@ -560,7 +576,7 @@ def check_dict(attr, name):
                     logger.info(f"Connecting to {display_name} library's Tautulli...")
                     logger.info("")
                     try:
-                        library.Tautulli = Tautulli(self, {
+                        library.Tautulli = Tautulli(self, library, {
                             "url": check_for_attribute(lib, "url", parent="tautulli", var_type="url", default=self.general["tautulli"]["url"], req_default=True, save=False),
                             "apikey": check_for_attribute(lib, "apikey", parent="tautulli", default=self.general["tautulli"]["apikey"], req_default=True, save=False)
                         })
@@ -593,7 +609,11 @@ def check_dict(attr, name):
 
     def notify(self, text, library=None, collection=None, critical=True):
         for error in util.get_list(text, split=False):
-            self.Webhooks.error_hooks(error, library=library, collection=collection, critical=critical)
+            try:
+                self.Webhooks.error_hooks(error, library=library, collection=collection, critical=critical)
+            except Failed as e:
+                util.print_stacktrace()
+                logger.error(f"Webhooks Error: {e}")
 
     def get_html(self, url, headers=None, params=None):
         return html.fromstring(self.get(url, headers=headers, params=params).content)