From 09133ebcb669422cc40ab0ce44dc05131d493909 Mon Sep 17 00:00:00 2001 From: michael-grace Date: Sat, 15 May 2021 23:51:12 +0100 Subject: [PATCH] Let the Log Pages Cope --- ui-templates/log.html | 35 +++++++++++++++++++++++++++++------ web_server.py | 12 ++++++++++-- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/ui-templates/log.html b/ui-templates/log.html index 5651a39..3ef8a31 100644 --- a/ui-templates/log.html +++ b/ui-templates/log.html @@ -1,11 +1,34 @@ {% extends 'base.html' %} {% block content_inner %} {% if data %} - {% for log in data.logs %} - - {{log}} - -
- {% endfor %} +
+ {% if data.page != 1 %} + + <<< Previous Page + + {% endif %} + + Next Page >>> + +
+
+ {% for log in data.logs %} + + {{log}} + +
+ {% endfor %} +
+
+ {% if data.page != 1 %} + + <<< Previous Page + + {% endif %} + + Next Page >>> + +
+
{% endif %} {% endblock %} \ No newline at end of file diff --git a/web_server.py b/web_server.py index 933a818..e940c6e 100644 --- a/web_server.py +++ b/web_server.py @@ -141,11 +141,18 @@ def ui_logs_list(request): @app.route("/logs/") def ui_logs_render(request, path): + page = request.args.get("page") + if not page: + return redirect(f"/logs/{path}?page=1") + page = int(page) + assert page >= 1 + log_file = open("logs/{}.log".format(path)) data = { - "logs": log_file.read().splitlines(), + "logs": log_file.read().splitlines()[-300*page:(-300*(page-1) if page > 1 else None)][::-1], "ui_page": "logs", "ui_title": "Logs - {}".format(path), + "page": page } log_file.close() return render_template("log.html", data=data) @@ -306,7 +313,8 @@ async def audio_file(request, type: str, id: int): # Static Files app.static("/favicon.ico", resolve_local_file_path("ui-static/favicon.ico"), name="ui-favicon") app.static("/static", resolve_local_file_path("ui-static"), name="ui-static") -app.static("/presenter/", resolve_local_file_path("presenter-build/index.html"), strict_slashes=True, name="presenter-index") +app.static("/presenter/", resolve_local_file_path("presenter-build/index.html"), + strict_slashes=True, name="presenter-index") app.static("/presenter/", resolve_local_file_path("presenter-build"))