Merge pull request #66 from AUTOMATIC1111/master

merge from upstream
This commit is contained in:
Vladimir Mandic
2023-03-28 16:43:39 -04:00
committed by GitHub
16 changed files with 178 additions and 75 deletions
+11 -1
View File
@@ -14,7 +14,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:
@@ -96,6 +101,11 @@ def list_extensions():
if not os.path.isdir(extensions_dir):
return
if shared.opts.disable_all_extensions == "all":
print("*** \"Disable all extensions\" option was set, will not load any extensions ***")
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]:
if not os.path.isdir(dirname):