Merge branch 'dev' into patch-1

1 files changed, 25 insertions, 23 deletions

diff --git a/modules/extensions.py b/modules/extensions.py
index 34d9d654..abc6e2b1 100644
--- a/modules/extensions.py
+++ b/modules/extensions.py
@@ -1,18 +1,13 @@
 import os

-import sys

-import traceback

+import threading

 

-import time

-from datetime import datetime

-import git

-

-from modules import shared

-from modules.paths_internal import extensions_dir, extensions_builtin_dir, script_path

+from modules import shared, errors

+from modules.gitpython_hack import Repo

+from modules.paths_internal import extensions_dir, extensions_builtin_dir, script_path  # noqa: F401

 

 extensions = []

 

-if not os.path.exists(extensions_dir):

-    os.makedirs(extensions_dir)

+os.makedirs(extensions_dir, exist_ok=True)

 

 

 def active():

@@ -25,6 +20,8 @@ def active():
 

 

 class Extension:

+    lock = threading.Lock()

+

     def __init__(self, name, path, enabled=True, is_builtin=False):

         self.name = name

         self.path = path

@@ -43,15 +40,19 @@ class Extension:
         if self.is_builtin or self.have_info_from_repo:

             return

 

-        self.have_info_from_repo = True

+        with self.lock:

+            if self.have_info_from_repo:

+                return

 

+            self.do_read_info_from_repo()

+

+    def do_read_info_from_repo(self):

         repo = None

         try:

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

-                repo = git.Repo(self.path)

+                repo = Repo(self.path)

         except Exception:

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

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

+            errors.report(f"Error reading github repository info from {self.path}", exc_info=True)

 

         if repo is None or repo.bare:

             self.remote = None

@@ -59,18 +60,19 @@ class Extension:
             try:

                 self.status = 'unknown'

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

-                head = repo.head.commit

-                self.commit_date = repo.head.commit.committed_date

-                ts = time.asctime(time.gmtime(self.commit_date))

+                commit = repo.head.commit

+                self.commit_date = commit.committed_date

                 if repo.active_branch:

                     self.branch = repo.active_branch.name

-                self.commit_hash = head.hexsha

-                self.version = f'{self.commit_hash[:8]} ({ts})'

+                self.commit_hash = commit.hexsha

+                self.version = self.commit_hash[:8]

 

-            except Exception as ex:

-                print(f"Failed reading extension data from Git repository ({self.name}): {ex}", file=sys.stderr)

+            except Exception:

+                errors.report(f"Failed reading extension data from Git repository ({self.name})", exc_info=True)

                 self.remote = None

 

+        self.have_info_from_repo = True

+

     def list_files(self, subdir, extension):

         from modules import scripts

 

@@ -87,7 +89,7 @@ class Extension:
         return res

 

     def check_updates(self):

-        repo = git.Repo(self.path)

+        repo = Repo(self.path)

         for fetch in repo.remote().fetch(dry_run=True):

             if fetch.flags != fetch.HEAD_UPTODATE:

                 self.can_update = True

@@ -109,7 +111,7 @@ class Extension:
         self.status = "latest"

 

     def fetch_and_reset_hard(self, commit='origin'):

-        repo = git.Repo(self.path)

+        repo = Repo(self.path)

         # Fix: `error: Your local changes to the following files would be overwritten by merge`,

         # because WSL2 Docker set 755 file permissions instead of 644, this results to the error.

         repo.git.fetch(all=True)