Make disable configurable between builtin/extra extensions

1 files changed, 9 insertions, 4 deletions

diff --git a/modules/extensions.py b/modules/extensions.py
index 1493e8c8..3a7a0372 100644
--- a/modules/extensions.py
+++ b/modules/extensions.py
@@ -15,7 +15,12 @@ if not os.path.exists(extensions_dir):
 

 

 def active():

-    return [x for x in extensions if x.enabled]

+    if shared.opts.disable_all_extensions == "all":

+        return []

+    elif shared.opts.disable_all_extensions == "extra":

+        return [x for x in extensions if x.enabled and x.is_builtin]

+    else:

+        return [x for x in extensions if x.enabled]

 

 

 class Extension:

@@ -97,9 +102,10 @@ def list_extensions():
     if not os.path.isdir(extensions_dir):

         return

 

-    if shared.opts.disable_all_extensions:

+    if shared.opts.disable_all_extensions == "all":

         print("*** \"Disable all extensions\" option was set, will not load any extensions ***")

-        return

+    elif shared.opts.disable_all_extensions == "extra":

+        print("*** \"Disable all extensions\" option was set, will only load built-in extensions ***")

 

     extension_paths = []

     for dirname in [extensions_dir, extensions_builtin_dir]:

@@ -116,4 +122,3 @@ def list_extensions():
     for dirname, path, is_builtin in extension_paths:

         extension = Extension(name=dirname, path=path, enabled=dirname not in shared.opts.disabled_extensions, is_builtin=is_builtin)

         extensions.append(extension)

-