From bd0b7ea80a67dd590a3fa3bae02736bfc77455c2 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Thu, 25 Nov 2021 20:48:58 +0100 Subject: [PATCH] WebHost: fix some PEP8 --- WebHostLib/__init__.py | 2 +- WebHostLib/generate.py | 4 ++-- WebHostLib/templates/hostRoom.html | 2 +- WebHostLib/templates/macros.html | 2 +- WebHostLib/templates/userContent.html | 6 +++--- WebHostLib/upload.py | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/WebHostLib/__init__.py b/WebHostLib/__init__.py index b9a99569..d32267d2 100644 --- a/WebHostLib/__init__.py +++ b/WebHostLib/__init__.py @@ -126,7 +126,7 @@ def faq(lang): @app.route('/seed/') -def viewSeed(seed: UUID): +def view_seed(seed: UUID): seed = Seed.get(id=seed) if not seed: abort(404) diff --git a/WebHostLib/generate.py b/WebHostLib/generate.py index c6e2d7d8..f80f4c51 100644 --- a/WebHostLib/generate.py +++ b/WebHostLib/generate.py @@ -76,7 +76,7 @@ def generate(race=False): handle_generation_failure(e) return render_template("seedError.html", seed_error=(e.__class__.__name__ + ": " + str(e))) - return redirect(url_for("viewSeed", seed=seed_id)) + return redirect(url_for("view_seed", seed=seed_id)) return render_template("generate.html", race=race) @@ -143,7 +143,7 @@ def wait_seed(seed: UUID): seed_id = seed seed = Seed.get(id=seed_id) if seed: - return redirect(url_for("viewSeed", seed=seed_id)) + return redirect(url_for("view_seed", seed=seed_id)) generation = Generation.get(id=seed_id) if not generation: diff --git a/WebHostLib/templates/hostRoom.html b/WebHostLib/templates/hostRoom.html index 9e392af9..281811e8 100644 --- a/WebHostLib/templates/hostRoom.html +++ b/WebHostLib/templates/hostRoom.html @@ -9,7 +9,7 @@ {% include 'header/grassHeader.html' %}
{% if room.owner == session["_id"] %} - Room created from Seed #{{ room.seed.id|suuid }} + Room created from Seed #{{ room.seed.id|suuid }}
{% endif %} {% if room.tracker %} diff --git a/WebHostLib/templates/macros.html b/WebHostLib/templates/macros.html index 7c7161a7..37ca89ee 100644 --- a/WebHostLib/templates/macros.html +++ b/WebHostLib/templates/macros.html @@ -1,7 +1,7 @@ {% macro list_rooms(rooms) -%} diff --git a/WebHostLib/templates/userContent.html b/WebHostLib/templates/userContent.html index c7754bed..ba7be082 100644 --- a/WebHostLib/templates/userContent.html +++ b/WebHostLib/templates/userContent.html @@ -29,8 +29,8 @@ {% for room in rooms %} - {{ room.seed.id|suuid }} - {{ room.id|suuid }} + {{ room.seed.id|suuid }} + {{ room.id|suuid }} >={{ room.seed.slots|length }} {{ room.creation_time.strftime("%Y-%m-%d %H:%M") }} {{ room.last_activity.strftime("%Y-%m-%d %H:%M") }} @@ -55,7 +55,7 @@ {% for seed in seeds %} - {{ seed.id|suuid }} + {{ seed.id|suuid }} {% if seed.multidata %}>={{ seed.slots|length }}{% else %}1{% endif %} {{ seed.creation_time.strftime("%Y-%m-%d %H:%M") }} diff --git a/WebHostLib/upload.py b/WebHostLib/upload.py index eef912c2..d17db9aa 100644 --- a/WebHostLib/upload.py +++ b/WebHostLib/upload.py @@ -98,7 +98,7 @@ def uploads(): if type(res) == str: return res elif res: - return redirect(url_for("viewSeed", seed=res.id)) + return redirect(url_for("view_seed", seed=res.id)) else: try: multidata = file.read() @@ -109,7 +109,7 @@ def uploads(): else: seed = Seed(multidata=multidata, owner=session["_id"]) flush() # place into DB and generate ids - return redirect(url_for("viewSeed", seed=seed.id)) + return redirect(url_for("view_seed", seed=seed.id)) else: flash("Not recognized file format. Awaiting a .archipelago file or .zip containing one.") return render_template("hostGame.html")