v117

annihilation7071 · Jan 4, 2025 · ec2f1b1 · ec2f1b1
1 parent bd2b359
commit ec2f1b1
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 19 deletions.
diff --git a/backend/db/connect.py b/backend/db/connect.py
@@ -29,7 +29,7 @@ class Project(Base):
     preview = Column(String(length=500))
     parody = Column(JSON)
     character = Column(JSON)
-    tag = Column(JSON)
+    tag = Column(JSON, index=True)
     artist = Column(JSON, index=True)
     group = Column(JSON)
     language = Column(JSON)

diff --git a/routers/main.py b/routers/main.py
@@ -40,18 +40,18 @@ async def index(request: Request, page: int = 1, search: str = ""):
     )
 
 
-@router.get("/project/{project_id}", response_class=HTMLResponse)
-async def detail_view(request: Request, project_id: int):
-    project = projects.get_project_by_id(project_id)
-    images = utils.get_pages(project)
-    return templates.TemplateResponse(
-        "detailview.html",
-        {
-            "request": request,
-            "project": project,
-            "images": images
-        },
-    )
+# @router.get("/project/{project_id}", response_class=HTMLResponse)
+# async def detail_view(request: Request, project_id: int):
+#     project = projects.get_project_by_id(project_id)
+#     images = utils.get_pages(project)
+#     return templates.TemplateResponse(
+#         "detailview.html",
+#         {
+#             "request": request,
+#             "project": project,
+#             "images": images
+#         },
+#     )
 
 
 @router.get("/project/lid/{project_lid}", response_class=HTMLResponse)
@@ -68,9 +68,30 @@ async def detail_view_lid(request: Request, project_lid: str):
     )
 
 
-@router.get("/project/{project_id}/{page_id}", response_class=HTMLResponse)
-async def reader(request: Request, project_id: int, page_id: int):
-    project = projects.get_project_by_id(project_id)
+# @router.get("/project/{project_id}/{page_id}", response_class=HTMLResponse)
+# async def reader(request: Request, project_id: int, page_id: int):
+#     project = projects.get_project_by_id(project_id)
+#     images = utils.get_pages(project)
+#     page = page_id
+#     image = images[page - 1]["path"]
+#     total_pages = len(images)
+#     visible_pages = get_visible_pages(page, total_pages)
+#     return templates.TemplateResponse(
+#         "reader.html",
+#         {
+#             "request": request,
+#             "image": image,
+#             "current_page": page,
+#             "project_id": project_id,
+#             "total_pages": total_pages,
+#             "visible_pages": visible_pages,
+#         },
+#     )
+
+
+@router.get("/project/lid/{project_lid}/{page_id}", response_class=HTMLResponse)
+async def reader_lid(request: Request, project_lid: str, page_id: int):
+    project = projects.get_project_by_lid(project_lid)
     images = utils.get_pages(project)
     page = page_id
     image = images[page - 1]["path"]
@@ -82,7 +103,7 @@ async def reader(request: Request, project_id: int, page_id: int):
             "request": request,
             "image": image,
             "current_page": page,
-            "project_id": project_id,
+            "project_id": project_lid,
             "total_pages": total_pages,
             "visible_pages": visible_pages,
         },

diff --git a/templates/detailview.html b/templates/detailview.html
@@ -138,7 +138,7 @@ <h2>{{ project.subtitle }}</h2>
     <main class="detail-view-pages">
         <div class="grid-container-pages">
             {% for image in images %}
-            <a href="{{ request.url_for('reader', project_id=project.id, page_id=image.idx + 1) }}{{ ('?' + request.query_string.decode('utf-8')) if request.query_string else '' }}"
+            <a href="{{ request.url_for('reader_lid', project_lid=project.lid, page_id=image.idx + 1) }}{{ ('?' + request.query_string.decode('utf-8')) if request.query_string else '' }}"
                class="image-item">
                 <img src="{{ request.url_for('get_image', image_path=image.path | urlencode) }}" alt="Error">
             </a>

diff --git a/templates/index.html b/templates/index.html
@@ -51,7 +51,7 @@
     <main>
         <div class="grid-container">
             {% for project in projects %}
-            <a href="{{ request.url_for('detail_view', project_id=project.id) }}?page={{ current_page }}&search={{ request.query_params.get('search', '') }}"
+            <a href="{{ request.url_for('detail_view_lid', project_lid=project.lid) }}?page={{ current_page }}&search={{ request.query_params.get('search', '') }}"
                class="project-item-container">
                 <div class="project-item-preview-data pages-count">{{ project.pages }}</div>
                 {% if project.lid.startswith('pool_') %}