From 91b492a9dbad3f6f14b9a41df139dfa5ebc6350b Mon Sep 17 00:00:00 2001 From: Yannik Schmidt Date: Thu, 12 Mar 2026 18:45:46 +0100 Subject: [PATCH] fix: handle Gbx error & better s3 naming scheme --- server.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/server.py b/server.py index b6449fc..5cb1c04 100755 --- a/server.py +++ b/server.py @@ -9,6 +9,7 @@ import json import datetime from pygbx import Gbx, GbxType +import pygbx import tm2020parser import notifications @@ -541,7 +542,7 @@ def upload(): try: replay = replay_from_path(tmp_path, uploader=uploader) - new_basename = f"{replay.uploader}_{replay.filehash}_{fname}" + new_basename = f"{replay.filehash}" fullpath = os.path.join("uploads", new_basename) os.rename(tmp_path, fullpath) @@ -549,8 +550,7 @@ def upload(): replay.filepath = fullpath if s3_enabled(): - s3_key = upload_to_s3(fullpath, replay) - replay.filepath = s3_key + s3_key = upload_to_s3(new_basename, replay) os.remove(fullpath) db.session.add(replay) @@ -561,6 +561,9 @@ def upload(): except ValueError as e: results.append((fname, str(e))) continue + except pygbx.Gbx as e: + print(f"Failed to load Replay: {e}") + continue except sqlalchemy.exc.IntegrityError as e: results.append((fname, str(e.args)))