From ca347555915bbb4ff531854d04ffff7d1028b7bb Mon Sep 17 00:00:00 2001
From: Won-Kyu Park <wkpark@gmail.com>
Date: Sat, 12 Oct 2024 21:47:57 +0900
Subject: [PATCH] call run_extensions_installer() using executor

---
 modules/launch_utils.py | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/modules/launch_utils.py b/modules/launch_utils.py
index 20c7dc127a7..0bd3ac564b5 100644
--- a/modules/launch_utils.py
+++ b/modules/launch_utils.py
@@ -12,6 +12,7 @@
 import shlex
 from functools import lru_cache
 
+from concurrent.futures import ThreadPoolExecutor, as_completed
 from modules import cmd_args, errors
 from modules.paths_internal import script_path, extensions_dir
 from modules.timer import startup_timer
@@ -228,7 +229,10 @@ def version_check(commit):
 def run_extension_installer(extension_dir):
     path_installer = os.path.join(extension_dir, "install.py")
     if not os.path.isfile(path_installer):
-        return
+        return False
+
+    dirname = os.path.basename(extension_dir)
+    logging.debug(f"Installing {dirname}")
 
     try:
         env = os.environ.copy()
@@ -240,6 +244,8 @@ def run_extension_installer(extension_dir):
     except Exception as e:
         errors.report(str(e))
 
+    return True
+
 
 def list_extensions(settings_file):
     settings = {}
@@ -267,14 +273,19 @@ def run_extensions_installers(settings_file):
         return
 
     with startup_timer.subcategory("run extensions installers"):
+        paths = {}
         for dirname_extension in list_extensions(settings_file):
-            logging.debug(f"Installing {dirname_extension}")
-
             path = os.path.join(extensions_dir, dirname_extension)
 
             if os.path.isdir(path):
-                run_extension_installer(path)
-                startup_timer.record(dirname_extension)
+                paths[dirname_extension] = path
+
+        with ThreadPoolExecutor(max_workers=2) as executor:
+            futures = {executor.submit(run_extension_installer, path): dirname_extension for dirname_extension, path in paths.items()}
+            for future in as_completed(futures):
+                dirname_extension = futures[future]
+                if future.result():
+                    startup_timer.record(dirname_extension)
 
 
 re_requirement = re.compile(r"\s*([-_a-zA-Z0-9]+)\s*(?:==\s*([-+_.a-zA-Z0-9]+))?\s*")