From de929c6c709c8b59518597472ea7161d2f7ecc9e Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Wed, 11 Jan 2023 15:08:46 +0200
Subject: [PATCH] refactor: extract more methods into `InstallableExtension`

---
 lnbits/core/views/api.py   | 26 +++++++-------------------
 lnbits/extension_manger.py | 23 +++++++++++++++++++++++
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/lnbits/core/views/api.py b/lnbits/core/views/api.py
index 591bf1a6c..d08179e25 100644
--- a/lnbits/core/views/api.py
+++ b/lnbits/core/views/api.py
@@ -730,9 +730,9 @@ async def api_install_extension(
     ext_info: InstallableExtension = await InstallableExtension.get_extension_info(
         ext_id, hash
     )
+    ext_info.download_archive()
 
     try:
-        ext_info.download_archive()
         ext_info.extract_archive()
 
         extension = Extension.from_installable_ext(ext_info)
@@ -744,27 +744,15 @@ async def api_install_extension(
         await update_user_extension(user_id=USER_ID_ALL, extension=ext_id, active=False)
         settings.lnbits_disabled_extensions += [ext_id]
 
-        if ext_info.module_installed:
-            # update upgraded extensions list if module already installed
-            ext_temp_path = f"{extension.hash}/{extension.code}"
-            clean_upgraded_exts = list(
-                filter(
-                    lambda old_ext: old_ext.endswith(ext_temp_path),
-                    settings.lnbits_upgraded_extensions,
-                )
-            )
-            settings.lnbits_upgraded_extensions = clean_upgraded_exts + [ext_temp_path]
-
-        # mount routes at the very end
+        # mount routes for the new version
         core_app_extra.register_new_ext_routes(extension)
+
+        if ext_info.module_installed:
+            ext_info.nofiy_upgrade()
+
     except Exception as ex:
         logger.warning(ex)
-        # remove downloaded archive
-        if os.path.isfile(ext_info.zip_path):
-            os.remove(ext_info.zip_path)
-
-        # remove module from extensions
-        shutil.rmtree(ext_info.ext_dir, True)
+        ext_info.clean_extension_files()
         raise HTTPException(
             status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(ex)
         )
diff --git a/lnbits/extension_manger.py b/lnbits/extension_manger.py
index 02e838091..7c93762a8 100644
--- a/lnbits/extension_manger.py
+++ b/lnbits/extension_manger.py
@@ -165,6 +165,29 @@ class InstallableExtension(NamedTuple):
         with zipfile.ZipFile(self.zip_path, "r") as zip_ref:
             zip_ref.extractall(ext_upgrade_dir)
 
+    def nofiy_upgrade(self) -> None:
+        """Update the the list of upgraded extensions. The middleware will perform redirects based on this"""
+        if not self.hash:
+            return
+
+        clean_upgraded_exts = list(
+            filter(
+                lambda old_ext: old_ext.endswith(f"/{self.id}"),
+                settings.lnbits_upgraded_extensions,
+            )
+        )
+        settings.lnbits_upgraded_extensions = clean_upgraded_exts + [
+            f"{self.hash}/{self.id}"
+        ]
+
+    def clean_extension_files(self):
+        # remove downloaded archive
+        if os.path.isfile(self.zip_path):
+            os.remove(self.zip_path)
+
+        # remove module from extensions
+        shutil.rmtree(self.ext_dir, True)
+
     @classmethod
     async def get_extension_info(cls, ext_id: str, hash: str) -> "InstallableExtension":
         installable_extensions: List[