mirror of
https://github.com/vladmandic/automatic
synced 2026-09-19 01:04:32 +02:00
handle duplicate extensions and redo exception handler
This commit is contained in:
+11
-10
@@ -4,7 +4,7 @@ import sys
|
||||
import time
|
||||
import git
|
||||
|
||||
from modules import shared
|
||||
from modules import shared, errors
|
||||
from modules.paths_internal import extensions_dir, extensions_builtin_dir
|
||||
|
||||
extensions = []
|
||||
@@ -44,9 +44,8 @@ class Extension:
|
||||
try:
|
||||
if os.path.exists(os.path.join(self.path, ".git")):
|
||||
repo = git.Repo(self.path)
|
||||
except Exception:
|
||||
print(f"Error reading github repository info from {self.path}:", file=sys.stderr)
|
||||
shared.exception()
|
||||
except Exception as e:
|
||||
errors.display(e, f'github info from {self.path}')
|
||||
|
||||
if repo is None or repo.bare:
|
||||
self.remote = None
|
||||
@@ -101,13 +100,12 @@ 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 ***")
|
||||
if shared.opts.disable_all_extensions == "all" or shared.opts.disable_all_extensions == "extra":
|
||||
shared.log.warning("Option set: Disable all extensions")
|
||||
|
||||
extension_paths = []
|
||||
for dirname in [extensions_dir, extensions_builtin_dir]:
|
||||
extension_names = []
|
||||
for dirname in [extensions_builtin_dir, extensions_dir]:
|
||||
if not os.path.isdir(dirname):
|
||||
return
|
||||
|
||||
@@ -115,7 +113,10 @@ def list_extensions():
|
||||
path = os.path.join(dirname, extension_dirname)
|
||||
if not os.path.isdir(path):
|
||||
continue
|
||||
|
||||
if extension_dirname in extension_names:
|
||||
shared.log.info(f'Skipping conflicting extension: {path}')
|
||||
continue
|
||||
extension_names.append(extension_dirname)
|
||||
extension_paths.append((extension_dirname, path, dirname == extensions_builtin_dir))
|
||||
|
||||
for dirname, path, is_builtin in extension_paths:
|
||||
|
||||
Reference in New Issue
Block a user