small fixes

modules/config.py

@@ -325,6 +325,7 @@ class Config:
             else:
                 params["name"] = str(library_name)
                 logger.info(f"Connecting to {params['name']} Library...")
+            params["mapping_name"] = str(library_name)
 
             params["asset_directory"] = check_for_attribute(lib, "asset_directory", parent="settings", var_type="list_path", default=self.general["asset_directory"], default_is_none=True, save=False)
             if params["asset_directory"] is None:

modules/convert.py

@@ -2,6 +2,7 @@ import logging, re, requests
 from lxml import html
 from modules import util
 from modules.util import Failed
+from plexapi.exceptions import BadRequest
 from retrying import retry
 
 logger = logging.getLogger("Plex Meta Manager")
@@ -356,7 +357,9 @@ class Convert:
                 return "movie", tmdb_id
             else:
                 raise Failed(f"No ID to convert")
-
         except Failed as e:
             util.print_end(length, f"Mapping Error | {item.guid:<46} | {e} for {item.title}")
-            return None, None
+        except BadRequest:
+            util.print_stacktrace()
+            util.print_end(length, f"Mapping Error: | {item.guid} for {item.title} not found")
+        return None, None

modules/plex.py

@@ -396,7 +396,11 @@ class PlexAPI:
 
     @retry(stop_max_attempt_number=6, wait_fixed=10000, retry_on_exception=util.retry_if_not_plex)
     def get_guids(self, item):
-        item.reload(includeOnDeck=False, includeRelated=False, includeReviews=False)
+        item.reload(checkFiles=False, includeAllConcerts=False, includeBandwidths=False, includeChapters=False,
+                    includeChildren=False, includeConcerts=False, includeExternalMedia=False, inclueExtras=False,
+                    includeFields='', includeGeolocation=False, includeLoudnessRamps=False, includeMarkers=False,
+                    includeOnDeck=False, includePopularLeaves=False, includePreferences=False, includeRelated=False,
+                    includeRelatedCount=0, includeReviews=False, includeStations=False)
         return item.guids
 
     @retry(stop_max_attempt_number=6, wait_fixed=10000, retry_on_exception=util.retry_if_not_plex)

modules/util.py

@@ -366,16 +366,22 @@ def centered(text, do_print=True):
     return final_text
 
 def separator(text=None):
-    logger.handlers[0].setFormatter(logging.Formatter(f"%(message)-{screen_width - 2}s"))
-    logger.handlers[1].setFormatter(logging.Formatter(f"[%(asctime)s] %(filename)-27s %(levelname)-10s %(message)-{screen_width - 2}s"))
+    for handler in logger.handlers:
+        apply_formatter(handler, border=False)
     logger.info(f"|{separating_character * screen_width}|")
     if text:
         text_list = text.split("\n")
         for t in text_list:
             logger.info(f"| {centered(t, do_print=False)} |")
         logger.info(f"|{separating_character * screen_width}|")
-    logger.handlers[0].setFormatter(logging.Formatter(f"| %(message)-{screen_width - 2}s |"))
-    logger.handlers[1].setFormatter(logging.Formatter(f"[%(asctime)s] %(filename)-27s %(levelname)-10s | %(message)-{screen_width - 2}s |"))
+    for handler in logger.handlers:
+        apply_formatter(handler)
+
+def apply_formatter(handler, border=True):
+    text = f"| %(message)-{screen_width - 2}s |" if border else f"%(message)-{screen_width - 2}s"
+    if not isinstance(handler, logging.StreamHandler):
+        text = f"[%(asctime)s] %(filename)-27s %(levelname)-10s {text}"
+    handler.setFormatter(logging.Formatter(text))
 
 def print_return(length, text):
     print(adjust_space(length, f"| {text}"), end="\r")

plex_meta_manager.py

@@ -6,7 +6,6 @@ try:
     from modules.builder import CollectionBuilder
     from modules.config import Config
     from modules.util import Failed
-    from plexapi.exceptions import BadRequest
 except ModuleNotFoundError:
     print("Error: Requirements are not installed")
     sys.exit(0)
@@ -77,10 +76,8 @@ def fmt_filter(record):
 
 file_handler = logging.handlers.TimedRotatingFileHandler(os.path.join(default_dir, "logs", "meta.log"), when="midnight", backupCount=10, encoding="utf-8")
 file_handler.addFilter(fmt_filter)
-file_handler.setFormatter(logging.Formatter("[%(asctime)s] %(filename)-27s %(levelname)-10s | %(message)-100s |"))
 
 cmd_handler = logging.StreamHandler()
-cmd_handler.setFormatter(logging.Formatter("| %(message)-100s |"))
 cmd_handler.setLevel(logging.DEBUG if test or debug else logging.INFO)
 
 logger.addHandler(cmd_handler)
@@ -214,22 +211,18 @@ def map_guids(config, library):
     items = library.Plex.all()
     for i, item in enumerate(items, 1):
         length = util.print_return(length, f"Processing: {i}/{len(items)} {item.title}")
-        try:
-            id_type, main_id = config.Convert.get_id(item, library, length)
-        except BadRequest:
-            util.print_stacktrace()
-            util.print_end(length, f"Mapping Error: | {item.guid} for {item.title} not found")
-            continue
-        if not isinstance(main_id, list):
-            main_id = [main_id]
-        if id_type == "movie":
-            for m in main_id:
-                if m in movie_map:              movie_map[m].append(item.ratingKey)
-                else:                           movie_map[m] = [item.ratingKey]
-        elif id_type == "show":
-            for m in main_id:
-                if m in show_map:               show_map[m].append(item.ratingKey)
-                else:                           show_map[m] = [item.ratingKey]
+        id_type, main_id = config.Convert.get_id(item, library, length)
+        if main_id:
+            if not isinstance(main_id, list):
+                main_id = [main_id]
+            if id_type == "movie":
+                for m in main_id:
+                    if m in movie_map:              movie_map[m].append(item.ratingKey)
+                    else:                           movie_map[m] = [item.ratingKey]
+            elif id_type == "show":
+                for m in main_id:
+                    if m in show_map:               show_map[m].append(item.ratingKey)
+                    else:                           show_map[m] = [item.ratingKey]
     util.print_end(length, f"Processed {len(items)} {'Movies' if library.is_movie else 'Shows'}")
     return movie_map, show_map
 
@@ -332,6 +325,7 @@ def mass_metadata(config, library, movie_map, show_map):
                 pass
 
 def run_collection(config, library, metadata, requested_collections, is_test, resume_from, movie_map, show_map):
+    logger.info("")
     for mapping_name, collection_attrs in requested_collections.items():
         if is_test and ("test" not in collection_attrs or collection_attrs["test"] is not True):
             no_template_test = True
@@ -347,15 +341,15 @@ def run_collection(config, library, metadata, requested_collections, is_test, re
                         no_template_test = False
             if no_template_test:
                 continue
-        try:
-            if resume_from and resume_from != mapping_name:
-                continue
-            elif resume_from == mapping_name:
-                resume_from = None
-                logger.info("")
-                util.separator(f"Resuming Collections")
 
+        if resume_from and resume_from != mapping_name:
+            continue
+        elif resume_from == mapping_name:
+            resume_from = None
             logger.info("")
+            util.separator(f"Resuming Collections")
+
+        try:
             util.separator(f"{mapping_name} Collection")
             logger.info("")
 
@@ -364,15 +358,15 @@ def run_collection(config, library, metadata, requested_collections, is_test, re
             if len(builder.schedule) > 0:
                 util.print_multiline(builder.schedule, info=True)
 
-            logger.info("")
-            logger.info(f"Sync Mode: {'sync' if builder.sync else 'append'}")
-
-            if len(builder.filters) > 0:
+            if not builder.smart_url:
                 logger.info("")
-                for filter_key, filter_value in builder.filters:
-                    logger.info(f"Collection Filter {filter_key}: {filter_value}")
+                logger.info(f"Sync Mode: {'sync' if builder.sync else 'append'}")
+
+                if len(builder.filters) > 0:
+                    logger.info("")
+                    for filter_key, filter_value in builder.filters:
+                        logger.info(f"Collection Filter {filter_key}: {filter_value}")
 
-            if not builder.smart_url:
                 builder.collect_rating_keys(movie_map, show_map)
                 logger.info("")
                 if len(builder.rating_keys) > 0:
@@ -394,6 +388,7 @@ def run_collection(config, library, metadata, requested_collections, is_test, re
         except Exception as e:
             util.print_stacktrace()
             logger.error(f"Unknown Error: {e}")
+        logger.info("")
     return resume_from
 
 try: