aboutsummaryrefslogtreecommitdiff
path: root/modules/extensions.py
diff options
context:
space:
mode:
Diffstat (limited to 'modules/extensions.py')
-rw-r--r--modules/extensions.py17
1 files changed, 8 insertions, 9 deletions
diff --git a/modules/extensions.py b/modules/extensions.py
index ed4b58fe..a14ffbf0 100644
--- a/modules/extensions.py
+++ b/modules/extensions.py
@@ -6,13 +6,12 @@ import time
import git
from modules import paths, shared
+from modules.paths_internal import extensions_dir, extensions_builtin_dir
extensions = []
-extensions_dir = os.path.join(paths.data_path, "extensions")
-extensions_builtin_dir = os.path.join(paths.script_path, "extensions-builtin")
-if not os.path.exists(extensions_dir):
- os.makedirs(extensions_dir)
+if not os.path.exists(paths.extensions_dir):
+ os.makedirs(paths.extensions_dir)
def active():
return [x for x in extensions if x.enabled]
@@ -86,11 +85,11 @@ class Extension:
def list_extensions():
extensions.clear()
- if not os.path.isdir(extensions_dir):
+ if not os.path.isdir(paths.extensions_dir):
return
- paths = []
- for dirname in [extensions_dir, extensions_builtin_dir]:
+ extension_paths = []
+ for dirname in [paths.extensions_dir, paths.extensions_builtin_dir]:
if not os.path.isdir(dirname):
return
@@ -99,9 +98,9 @@ def list_extensions():
if not os.path.isdir(path):
continue
- paths.append((extension_dirname, path, dirname == extensions_builtin_dir))
+ extension_paths.append((extension_dirname, path, dirname == paths.extensions_builtin_dir))
- for dirname, path, is_builtin in paths:
+ 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)