Merge branch 'master' into vae-picker

1 files changed, 4 insertions, 17 deletions

diff --git a/modules/scripts.py b/modules/scripts.py
index 96e44bfd..533db45c 100644
--- a/modules/scripts.py
+++ b/modules/scripts.py
@@ -7,7 +7,7 @@ import modules.ui as ui
 import gradio as gr

 

 from modules.processing import StableDiffusionProcessing

-from modules import shared, paths, script_callbacks

+from modules import shared, paths, script_callbacks, extensions

 

 AlwaysVisible = object()

 

@@ -107,17 +107,8 @@ def list_scripts(scriptdirname, extension):
         for filename in sorted(os.listdir(basedir)):

             scripts_list.append(ScriptFile(paths.script_path, filename, os.path.join(basedir, filename)))

 

-    extdir = os.path.join(paths.script_path, "extensions")

-    if os.path.exists(extdir):

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

-            dirpath = os.path.join(extdir, dirname)

-            scriptdirpath = os.path.join(dirpath, scriptdirname)

-

-            if not os.path.isdir(scriptdirpath):

-                continue

-

-            for filename in sorted(os.listdir(scriptdirpath)):

-                scripts_list.append(ScriptFile(dirpath, filename, os.path.join(scriptdirpath, filename)))

+    for ext in extensions.active():

+        scripts_list += ext.list_files(scriptdirname, extension)

 

     scripts_list = [x for x in scripts_list if os.path.splitext(x.path)[1].lower() == extension and os.path.isfile(x.path)]

 

@@ -127,11 +118,7 @@ def list_scripts(scriptdirname, extension):
 def list_files_with_name(filename):

     res = []

 

-    dirs = [paths.script_path]

-

-    extdir = os.path.join(paths.script_path, "extensions")

-    if os.path.exists(extdir):

-        dirs += [os.path.join(extdir, d) for d in sorted(os.listdir(extdir))]

+    dirs = [paths.script_path] + [ext.path for ext in extensions.active()]

 

     for dirpath in dirs:

         if not os.path.isdir(dirpath):