From 8c801362b43013a628c58f0c1276e076ee48227d Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Sat, 25 Mar 2023 16:05:12 +0300
Subject: split commandline args into its own file make launch.py use the same
 command line argument parser as the main program

---
 modules/extensions.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'modules/extensions.py')

diff --git a/modules/extensions.py b/modules/extensions.py
index ed4b58fe..8107a933 100644
--- a/modules/extensions.py
+++ b/modules/extensions.py
@@ -8,11 +8,9 @@ import git
 from modules import paths, shared
 
 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 +84,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 +97,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)
 
-- 
cgit v1.2.3