From bb440a4d2d705a6bfb8c0c1ba923abf0dacc373c Mon Sep 17 00:00:00 2001
From: "dr.lt.data" <Dr.Lt.Data@gmail.com>
Date: Fri, 15 Mar 2024 16:08:29 +0900
Subject: [PATCH] fix: invalid detection of failed import -  reflect changed
 ComfyUI log system

https://github.com/ltdrdata/ComfyUI-Manager/issues/480
---
 __init__.py          |  2 +-
 prestartup_script.py | 23 ++++++-----------------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/__init__.py b/__init__.py
index a6de5bed..0b783db5 100644
--- a/__init__.py
+++ b/__init__.py
@@ -29,7 +29,7 @@ except:
     print(f"[WARN] ComfyUI-Manager: Your ComfyUI version is outdated. Please update to the latest version.")
 
 
-version = [2, 10]
+version = [2, 10, 1]
 version_str = f"V{version[0]}.{version[1]}" + (f'.{version[2]}' if len(version) > 2 else '')
 print(f"### Loading: ComfyUI-Manager ({version_str})")
 
diff --git a/prestartup_script.py b/prestartup_script.py
index b7e13f42..a335f3d0 100644
--- a/prestartup_script.py
+++ b/prestartup_script.py
@@ -173,11 +173,9 @@ try:
         write_stderr = wrapper_stderr
 
     pat_tqdm = r'\d+%.*\[(.*?)\]'
-    pat_import_fail = r'seconds \(IMPORT FAILED\):'
-    pat_custom_node = r'[/\\]custom_nodes[/\\](.*)$'
+    pat_import_fail = r'seconds \(IMPORT FAILED\):.*[/\\]custom_nodes[/\\](.*)$'
 
     is_start_mode = True
-    is_import_fail_mode = False
 
     class ComfyUIManagerLogger:
         def __init__(self, is_stdout):
@@ -197,26 +195,17 @@ try:
 
         def write(self, message):
             global is_start_mode
-            global is_import_fail_mode
 
             if any(f(message) for f in message_collapses):
                 return
 
             if is_start_mode:
-                if is_import_fail_mode:
-                    match = re.search(pat_custom_node, message)
-                    if match:
-                        import_failed_extensions.add(match.group(1))
-                        is_import_fail_mode = False
-                else:
-                    match = re.search(pat_import_fail, message)
-                    if match:
-                        is_import_fail_mode = True
-                    else:
-                        is_import_fail_mode = False
+                match = re.search(pat_import_fail, message)
+                if match:
+                    import_failed_extensions.add(match.group(1))
 
-                    if 'Starting server' in message:
-                        is_start_mode = False
+                if 'Starting server' in message:
+                    is_start_mode = False
 
             if not self.is_stdout:
                 match = re.search(pat_tqdm, message)