add backwards compatibility --lyco-dir-backcompat option, use that for LyCORIS directory instead of hardcoded value

prevent running preload.py for disabled extensions

2 files changed, 5 insertions, 3 deletions

diff --git a/modules/script_loading.py b/modules/script_loading.py
index 306a1f35..0d55f193 100644
--- a/modules/script_loading.py
+++ b/modules/script_loading.py
@@ -12,11 +12,12 @@ def load_module(path):
     return module

 

 

-def preload_extensions(extensions_dir, parser):

+def preload_extensions(extensions_dir, parser, extension_list=None):

     if not os.path.isdir(extensions_dir):

         return

 

-    for dirname in sorted(os.listdir(extensions_dir)):

+    extensions = extension_list if extension_list is not None else os.listdir(extensions_dir)

+    for dirname in sorted(extensions):

         preload_script = os.path.join(extensions_dir, dirname, "preload.py")

         if not os.path.isfile(preload_script):

             continue

diff --git a/modules/shared.py b/modules/shared.py
index 6162938a..1ce7b49e 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -11,6 +11,7 @@ import gradio as gr
 import torch

 import tqdm

 

+import launch

 import modules.interrogate

 import modules.memmon

 import modules.styles

@@ -26,7 +27,7 @@ demo = None
 

 parser = cmd_args.parser

 

-script_loading.preload_extensions(extensions_dir, parser)

+script_loading.preload_extensions(extensions_dir, parser, extension_list=launch.list_extensions(launch.args.ui_settings_file))

 script_loading.preload_extensions(extensions_builtin_dir, parser)

 

 if os.environ.get('IGNORE_CMD_ARGS_ERRORS', None) is None: