From 8f8ebbeeaab450205fa018ea381b0ba58b1f7321 Mon Sep 17 00:00:00 2001 From: Vlad Stan Date: Tue, 29 Nov 2022 18:19:33 +0200 Subject: [PATCH] refactor: class rename and code format --- lnbits/app.py | 4 ++-- lnbits/helpers.py | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lnbits/app.py b/lnbits/app.py index 8cf44469a..e559e2b85 100644 --- a/lnbits/app.py +++ b/lnbits/app.py @@ -27,8 +27,8 @@ from .core import core_app, core_app_extra from .core.services import check_admin_settings from .core.views.generic import core_html_routes from .helpers import ( - EnabledExtensionMiddleware, Extension, + InstalledExtensionMiddleware, get_css_vendored, get_js_vendored, get_valid_extensions, @@ -72,7 +72,7 @@ def create_app() -> FastAPI: ) app.add_middleware(GZipMiddleware, minimum_size=1000) - app.add_middleware(EnabledExtensionMiddleware) + app.add_middleware(InstalledExtensionMiddleware) register_startup(app) register_assets(app) diff --git a/lnbits/helpers.py b/lnbits/helpers.py index 9dec9566f..ecb895f45 100644 --- a/lnbits/helpers.py +++ b/lnbits/helpers.py @@ -80,7 +80,7 @@ class ExtensionManager: return output -class EnabledExtensionMiddleware: +class InstalledExtensionMiddleware: def __init__(self, app: ASGIApp) -> None: self.app = app @@ -97,14 +97,15 @@ class EnabledExtensionMiddleware: # re-route trafic if the extension has been upgraded upgraded_extensions = list( filter( - lambda ext: ext.endswith(f"/{pathname}"), g().config.LNBITS_UPGRADED_EXTENSIONS) + lambda ext: ext.endswith(f"/{pathname}"), + g().config.LNBITS_UPGRADED_EXTENSIONS, ) + ) if len(upgraded_extensions) != 0: upgrade_path = upgraded_extensions[0] tail = "/".join(rest) scope["path"] = f"/upgrades/{upgrade_path}/{tail}" - await self.app(scope, receive, send)