Merge branch 'develop' into idac

titles/idac/frontend.py

@@ -1,15 +1,14 @@
 import json
+from typing import List
+from starlette.routing import Route
+from starlette.responses import Response, RedirectResponse
 import yaml
 import jinja2
 
 from os import path
-from typing import Any, Type
-from twisted.web import resource
-from twisted.web.util import redirectTo
-from twisted.web.http import Request
-from twisted.web.server import Session
+from starlette.requests import Request
 
-from core.frontend import FE_Base, IUserSession
+from core.frontend import FE_Base, UserSession
 from core.config import CoreConfig
 from titles.idac.database import IDACData
 from titles.idac.schema.profile import *
@@ -128,7 +127,8 @@ class IDACFrontend(FE_Base):
             self.game_cfg.update(
                 yaml.safe_load(open(f"{cfg_dir}/{IDACConstants.CONFIG_NAME}"))
             )
-        self.nav_name = "頭文字D THE ARCADE"
+        #self.nav_name = "頭文字D THE ARCADE"
+        self.nav_name = "IDAC"
         # TODO: Add version list
         self.version = IDACConstants.VER_IDAC_SEASON_2
 
@@ -286,7 +286,12 @@ class IDACProfileFrontend(FE_Base):
             34: "full_tune_fragments",
         }
     
-    def generate_all_tables_json(self, user_id: int):
+    def get_routes(self) -> List[Route]:
+        return [
+            Route("/", self.render_GET)
+        ]
+
+    async def generate_all_tables_json(self, user_id: int):
         json_export = {}
 
         idac_tables = {
@@ -322,7 +327,7 @@ class IDACProfileFrontend(FE_Base):
                 sql = sql.where(table.c.version == self.version)
 
             # lol use the profile connection for items, dirty hack
-            result = self.data.profile.execute(sql)
+            result = await self.data.profile.execute(sql)
             data_list = result.fetchall()
 
             # add the list to the json export with the correct table name
@@ -335,50 +340,47 @@ class IDACProfileFrontend(FE_Base):
 
         return json.dumps(json_export, indent=4, default=str, ensure_ascii=False)
 
-
-    def render_GET(self, request: Request) -> bytes:
-        uri: str = request.uri.decode()
+    async def render_GET(self, request: Request) -> bytes:
+        uri: str = request.url.path
 
         template = self.environment.get_template(
-            "titles/idac/frontend/profile/index.jinja"
+            "titles/idac/templates/idac_index.jinja"
         )
-        sesh: Session = request.getSession()
-        usr_sesh = IUserSession(sesh)
-        user_id = usr_sesh.userId
+        usr_sesh = self.validate_session(request)
+        if not usr_sesh:
+            usr_sesh = UserSession()
+        user_id = usr_sesh.user_id
         # user_id = usr_sesh.user_id
 
         # profile export
         if uri.startswith("/game/idac/profile/export.get"):
             if user_id == 0:
-                return redirectTo(b"/game/idac", request)
+                return RedirectResponse(b"/game/idac", request)
 
             # set the file name, content type and size to download the json
-            content = self.generate_all_tables_json(user_id).encode("utf-8")
-            request.responseHeaders.addRawHeader(
-                b"content-type", b"application/octet-stream"
-            )
-            request.responseHeaders.addRawHeader(
-                b"content-disposition", b"attachment; filename=idac_profile.json"
-            )
-            request.responseHeaders.addRawHeader(
-                b"content-length", str(len(content)).encode("utf-8")
-            )
+            content = await self.generate_all_tables_json(user_id).encode("utf-8")
 
             self.logger.info(f"User {user_id} exported their IDAC data")
-            return content
+            return Response(
+                content, 
+                200, 
+                {'content-disposition': 'attachment; filename=idac_profile.json'},
+                "application/octet-stream"
+            )
 
         profile_data, tickets, rank = None, None, None
         if user_id > 0:
-            profile_data = self.data.profile.get_profile(user_id, self.version)
-            ticket_data = self.data.item.get_tickets(user_id)
-            rank = self.data.profile.get_profile_rank(user_id, self.version)
+            profile_data = await self.data.profile.get_profile(user_id, self.version)
+            ticket_data = await self.data.item.get_tickets(user_id)
+            rank = await self.data.profile.get_profile_rank(user_id, self.version)
 
-            tickets = {
-                self.ticket_names[ticket["ticket_id"]]: ticket["ticket_cnt"]
-                for ticket in ticket_data
-            }
+            if ticket_data:
+                tickets = {
+                    self.ticket_names[ticket["ticket_id"]]: ticket["ticket_cnt"]
+                    for ticket in ticket_data
+                }
 
-        return template.render(
+        return Response(template.render(
             title=f"{self.core_config.server.name} | {self.nav_name}",
             game_list=self.environment.globals["game_list"],
             profile=profile_data,
@@ -386,5 +388,4 @@ class IDACProfileFrontend(FE_Base):
             rank=rank,
             sesh=vars(usr_sesh),
             active_page="idac",
-            active_tab="profile",
-        ).encode("utf-16")
+        ), media_type="text/html; charset=utf-8")