From 752d27b30aa8bdf95b8da9cde69d602b981151c1 Mon Sep 17 00:00:00 2001 From: beerpsi Date: Sun, 21 Apr 2024 04:53:32 +0000 Subject: [PATCH] Reuse app_allnet and app_billing --- core/app.py | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/core/app.py b/core/app.py index 68cbae3..8d4f25e 100644 --- a/core/app.py +++ b/core/app.py @@ -1,13 +1,14 @@ import yaml import logging -from starlette.routing import Route +from starlette.routing import Mount, Route from starlette.requests import Request from starlette.applications import Starlette from starlette.responses import PlainTextResponse -from os import environ, path, mkdir, W_OK, access +from os import environ, path from typing import List -from core import CoreConfig, TitleServlet, MuchaServlet, AllnetServlet, BillingServlet, logger +from core import CoreConfig, TitleServlet, MuchaServlet, logger +from core.allnet import app_allnet, app_billing from core.frontend import FrontendServlet async def dummy_rt(request: Request): @@ -39,27 +40,10 @@ route_lst: List[Route] = [ ] if not cfg.billing.standalone: - billing = BillingServlet(cfg, cfg_dir) - route_lst += [ - Route("/request", billing.handle_billing_request, methods=["POST"]), - Route("/request/", billing.handle_billing_request, methods=["POST"]), - ] + route_lst.append(Mount("/", app_billing)) -if not cfg.allnet.standalone: - allnet = AllnetServlet(cfg, cfg_dir) - route_lst += [ - Route("/sys/servlet/PowerOn", allnet.handle_poweron, methods=["GET", "POST"]), - Route("/sys/servlet/DownloadOrder", allnet.handle_dlorder, methods=["GET", "POST"]), - Route("/sys/servlet/LoaderStateRecorder", allnet.handle_loaderstaterecorder, methods=["GET", "POST"]), - Route("/sys/servlet/Alive", allnet.handle_alive, methods=["GET", "POST"]), - Route("/naomitest.html", allnet.handle_naomitest), - ] - - if cfg.allnet.allow_online_updates: - route_lst += [ - Route("/report-api/Report", allnet.handle_dlorder_report, methods=["POST"]), - Route("/dl/ini/{file:str}", allnet.handle_dlorder_ini), - ] +if not cfg.allnet.standalone: + route_lst.append(Mount("/", app_allnet)) for code, game in title.title_registry.items(): route_lst += game.get_routes()