Merge branch 'master' into remove-watermark-option

1 files changed, 18 insertions, 10 deletions

diff --git a/modules/extensions.py b/modules/extensions.py
index ed4b58fe..0d34b89a 100644
--- a/modules/extensions.py
+++ b/modules/extensions.py
@@ -5,15 +5,15 @@ import traceback
 import time

 import git

 

-from modules import paths, shared

+from modules import 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)

 

+

 def active():

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

 

@@ -27,21 +27,29 @@ class Extension:
         self.can_update = False

         self.is_builtin = is_builtin

         self.version = ''

+        self.remote = None

+        self.have_info_from_repo = False

+

+    def read_info_from_repo(self):

+        if self.have_info_from_repo:

+            return

+

+        self.have_info_from_repo = True

 

         repo = None

         try:

-            if os.path.exists(os.path.join(path, ".git")):

-                repo = git.Repo(path)

+            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 {path}:", file=sys.stderr)

+            print(f"Error reading github repository info from {self.path}:", file=sys.stderr)

             print(traceback.format_exc(), file=sys.stderr)

 

         if repo is None or repo.bare:

             self.remote = None

         else:

             try:

-                self.remote = next(repo.remote().urls, None)

                 self.status = 'unknown'

+                self.remote = next(repo.remote().urls, None)

                 head = repo.head.commit

                 ts = time.asctime(time.gmtime(repo.head.commit.committed_date))

                 self.version = f'{head.hexsha[:8]} ({ts})'

@@ -89,7 +97,7 @@ def list_extensions():
     if not os.path.isdir(extensions_dir):

         return

 

-    paths = []

+    extension_paths = []

     for dirname in [extensions_dir, extensions_builtin_dir]:

         if not os.path.isdir(dirname):

             return

@@ -99,9 +107,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 == 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)