From 4845db4e324dd5194ea82cc5f772237242a89a92 Mon Sep 17 00:00:00 2001
From: Ftps <63702646+Tps-F@users.noreply.github.com>
Date: Wed, 15 Mar 2023 20:29:50 +0900
Subject: [PATCH 1/4] Update ui_extensions.py

Add git submodule and Fix WinError
---
 modules/ui_extensions.py | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py
index df75a925d..b24b67fc2 100644
--- a/modules/ui_extensions.py
+++ b/modules/ui_extensions.py
@@ -141,22 +141,11 @@ def install_extension_from_url(dirname, url):
 
     try:
         shutil.rmtree(tmpdir, True)
-
-        repo = git.Repo.clone_from(url, tmpdir)
-        repo.remote().fetch()
-
-        try:
-            os.rename(tmpdir, target_dir)
-        except OSError as err:
-            # TODO what does this do on windows? I think it'll be a different error code but I don't have a system to check it
-            # Shouldn't cause any new issues at least but we probably want to handle it there too.
-            if err.errno == errno.EXDEV:
-                # Cross device link, typical in docker or when tmp/ and extensions/ are on different file systems
-                # Since we can't use a rename, do the slower but more versitile shutil.move()
-                shutil.move(tmpdir, target_dir)
-            else:
-                # Something else, not enough free space, permissions, etc.  rethrow it so that it gets handled.
-                raise(err)
+        with git.Repo.clone_from(url, tmpdir) as repo:
+            repo.remote().fetch()
+            for submodule in repo.submodules:
+                submodule.update()
+        os.rename(tmpdir, target_dir)
 
         import launch
         launch.run_extension_installer(target_dir)

From 79ed567b12c73231b712eb97106a565330968e34 Mon Sep 17 00:00:00 2001
From: Ftps <63702646+Tps-F@users.noreply.github.com>
Date: Wed, 15 Mar 2023 22:42:53 +0900
Subject: [PATCH 2/4] remove unused library

I'm sorry I forgot.
---
 modules/ui_extensions.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py
index b24b67fc2..3d9c4261b 100644
--- a/modules/ui_extensions.py
+++ b/modules/ui_extensions.py
@@ -1,6 +1,5 @@
 import json
 import os.path
-import shutil
 import sys
 import time
 import traceback
@@ -10,7 +9,6 @@ import git
 import gradio as gr
 import html
 import shutil
-import errno
 
 from modules import extensions, shared, paths
 from modules.call_queue import wrap_gradio_gpu_call

From 147d2922ff573f757b8940446b925c2e658e40ac Mon Sep 17 00:00:00 2001
From: Ftps <63702646+Tps-F@users.noreply.github.com>
Date: Thu, 16 Mar 2023 12:35:48 +0900
Subject: [PATCH 3/4] Cross device link

---
 .fleet/settings.json     |  0
 modules/ui_extensions.py | 12 +++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 .fleet/settings.json

diff --git a/.fleet/settings.json b/.fleet/settings.json
new file mode 100644
index 000000000..e69de29bb
diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py
index 3d9c4261b..d9def96e5 100644
--- a/modules/ui_extensions.py
+++ b/modules/ui_extensions.py
@@ -9,6 +9,7 @@ import git
 import gradio as gr
 import html
 import shutil
+import errno
 
 from modules import extensions, shared, paths
 from modules.call_queue import wrap_gradio_gpu_call
@@ -143,7 +144,16 @@ def install_extension_from_url(dirname, url):
             repo.remote().fetch()
             for submodule in repo.submodules:
                 submodule.update()
-        os.rename(tmpdir, target_dir)
+        try:
+            os.rename(tmpdir, target_dir)
+        except OSError as err:
+            if err.errno == errno.EXDEV:
+                # Cross device link, typical in docker or when tmp/ and extensions/ are on different file systems
+                # Since we can't use a rename, do the slower but more versitile shutil.move()
+                shutil.move(tmpdir, target_dir)
+            else:
+                # Something else, not enough free space, permissions, etc.  rethrow it so that it gets handled.
+                raise err
 
         import launch
         launch.run_extension_installer(target_dir)

From 6f5a5ad2057a2b2a1c94a5c3bf5bf0d8fefc187f Mon Sep 17 00:00:00 2001
From: Ftps <63702646+Tps-F@users.noreply.github.com>
Date: Thu, 16 Mar 2023 12:36:11 +0900
Subject: [PATCH 4/4] Delete settings.json

---
 .fleet/settings.json | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .fleet/settings.json

diff --git a/.fleet/settings.json b/.fleet/settings.json
deleted file mode 100644
index e69de29bb..000000000