diff --git a/VERSION b/VERSION index 4c3a89ed..67414d65 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.16.5-develop23 +1.16.5-develop24 diff --git a/modules/overlays.py b/modules/overlays.py index c091d807..80b3356b 100644 --- a/modules/overlays.py +++ b/modules/overlays.py @@ -149,8 +149,7 @@ class Overlays: logger.separator(f"Applying Overlays for the {self.library.name} Library") logger.info("") for i, (over_key, (item, over_names)) in enumerate(sorted(key_to_overlays.items(), key=lambda io: io[1][0].titleSort), 1): - start_time = time.time() - logger.info(f"Overlay Start Time: {start_time}") + util.check_time("Overlay Start Time") try: logger.ghost(f"Overlaying: {i}/{len(key_to_overlays)} {item.title}") image_compare = None @@ -208,8 +207,7 @@ class Overlays: while util.is_locked(backup_image_path): time.sleep(1) has_original = backup_image_path - new_time = time.time() - start_time - logger.info(f"Find Image Time {new_time}") + util.check_time("Find Image Time") poster_compare = None if poster is None and has_original is None: @@ -217,8 +215,7 @@ class Overlays: elif changed_image or overlay_change: new_poster = Image.open(poster.location if poster else has_original).convert("RGBA") temp = os.path.join(self.library.overlay_folder, f"temp.png") - new_time = time.time() - new_time - logger.info(f"Open Image Time {new_time}") + util.check_time("Open Image Time") try: blur_num = 0 for over_name in over_names: @@ -233,17 +230,13 @@ class Overlays: new_poster = new_poster.resize(overlay_images[over_name].size, Image.ANTIALIAS) new_poster.paste(overlay_images[over_name], (0, 0), overlay_images[over_name]) new_poster.save(temp, "PNG") - new_time = time.time() - new_time - logger.info(f"Overlay and Save Image Time {new_time}") + util.check_time("Overlay and Save Image Time") self.library.upload_poster(item, temp) - new_time = time.time() - new_time - logger.info(f"Upload Image Time {new_time}") + util.check_time("Upload Image Time") self.library.edit_tags("label", item, add_tags=["Overlay"], do_print=False) - new_time = time.time() - new_time - logger.info(f"Edit Tag Time {new_time}") + util.check_time("Edit Tag Time") self.library.reload(item) - new_time = time.time() - new_time - logger.info(f"Reload Time {new_time}") + util.check_time("Reload Time") poster_compare = poster.compare if poster else item.thumb logger.info(f"Detail: Overlays: {', '.join(over_names)} applied to {item.title}") except (OSError, BadRequest) as e: @@ -255,5 +248,5 @@ class Overlays: poster_compare, overlay=','.join(over_names)) except Failed as e: logger.error(e) - logger.info(f"Overall Overlay Time {time.time() - start_time}") + util.check_time("Overall Overlay Time", end=True) logger.exorcise() diff --git a/modules/util.py b/modules/util.py index ae07f218..3941f951 100644 --- a/modules/util.py +++ b/modules/util.py @@ -83,6 +83,8 @@ collection_mode_options = { "show_items": "showItems", "showitems": "showItems" } github_base = "https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager-Configs/master/" +previous_time = None +start_time = None def tab_new_lines(data): return str(data).replace("\n", "\n ") if "\n" in str(data) else str(data) @@ -622,3 +624,16 @@ def replace_label(_label, _data): final_data = _data return final_data, replaced + +def check_time(message, end=False): + global previous_time + global start_time + current_time = time.time() + if end: + previous_time = start_time + if previous_time is None: + logger.debug(f"{message}: {current_time}") + start_time = current_time + else: + logger.debug(f"{message}: {current_time - previous_time}") + previous_time = None if end else current_time diff --git a/plex_meta_manager.py b/plex_meta_manager.py index b603a3cf..2b53e53c 100644 --- a/plex_meta_manager.py +++ b/plex_meta_manager.py @@ -289,7 +289,7 @@ def update_libraries(config): continue logger.info("") logger.separator(f"Running {metadata_name} Metadata File\n{metadata.path}") - if not config.test_mode and not config.resume_from and not collection_only: + if not config.test_mode and not config.resume_from and not collection_only and not operations_only and not overlays_only: try: metadata.update_metadata() except Failed as e: