From 60617c682e5ac5fe0d02600b585a248a126661b9 Mon Sep 17 00:00:00 2001 From: black-sliver <59490463+black-sliver@users.noreply.github.com> Date: Sun, 5 Oct 2025 19:05:52 +0000 Subject: [PATCH] WebHost: fix log fetching extra characters when there is non-ascii (#5515) --- WebHostLib/misc.py | 8 ++++---- WebHostLib/templates/hostRoom.html | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/WebHostLib/misc.py b/WebHostLib/misc.py index b3088267..b56b11dd 100644 --- a/WebHostLib/misc.py +++ b/WebHostLib/misc.py @@ -271,9 +271,9 @@ def host_room(room: UUID): or "Discordbot" in request.user_agent.string or not any(browser_token in request.user_agent.string for browser_token in browser_tokens)) - def get_log(max_size: int = 0 if automated else 1024000) -> str: + def get_log(max_size: int = 0 if automated else 1024000) -> Tuple[str, int]: if max_size == 0: - return "…" + return "…", 0 try: with open(os.path.join("logs", str(room.id) + ".txt"), "rb") as log: raw_size = 0 @@ -284,9 +284,9 @@ def host_room(room: UUID): break raw_size += len(block) fragments.append(block.decode("utf-8")) - return "".join(fragments) + return "".join(fragments), raw_size except FileNotFoundError: - return "" + return "", 0 return render_template("hostRoom.html", room=room, should_refresh=should_refresh, get_log=get_log) diff --git a/WebHostLib/templates/hostRoom.html b/WebHostLib/templates/hostRoom.html index c5996d18..10ff5e84 100644 --- a/WebHostLib/templates/hostRoom.html +++ b/WebHostLib/templates/hostRoom.html @@ -58,8 +58,7 @@ Open Log File... - {% set log = get_log() -%} - {%- set log_len = log | length - 1 if log.endswith("…") else log | length -%} + {% set log, log_len = get_log() -%}
{{ log }}