WebHost: fix some PEP8
This commit is contained in:
parent
744b12345a
commit
bd0b7ea80a
|
@ -126,7 +126,7 @@ def faq(lang):
|
||||||
|
|
||||||
|
|
||||||
@app.route('/seed/<suuid:seed>')
|
@app.route('/seed/<suuid:seed>')
|
||||||
def viewSeed(seed: UUID):
|
def view_seed(seed: UUID):
|
||||||
seed = Seed.get(id=seed)
|
seed = Seed.get(id=seed)
|
||||||
if not seed:
|
if not seed:
|
||||||
abort(404)
|
abort(404)
|
||||||
|
|
|
@ -76,7 +76,7 @@ def generate(race=False):
|
||||||
handle_generation_failure(e)
|
handle_generation_failure(e)
|
||||||
return render_template("seedError.html", seed_error=(e.__class__.__name__ + ": " + str(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)
|
return render_template("generate.html", race=race)
|
||||||
|
|
||||||
|
@ -143,7 +143,7 @@ def wait_seed(seed: UUID):
|
||||||
seed_id = seed
|
seed_id = seed
|
||||||
seed = Seed.get(id=seed_id)
|
seed = Seed.get(id=seed_id)
|
||||||
if seed:
|
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)
|
generation = Generation.get(id=seed_id)
|
||||||
|
|
||||||
if not generation:
|
if not generation:
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
{% include 'header/grassHeader.html' %}
|
{% include 'header/grassHeader.html' %}
|
||||||
<div id="host-room">
|
<div id="host-room">
|
||||||
{% if room.owner == session["_id"] %}
|
{% if room.owner == session["_id"] %}
|
||||||
Room created from <a href="{{ url_for("viewSeed", seed=room.seed.id) }}">Seed #{{ room.seed.id|suuid }}</a>
|
Room created from <a href="{{ url_for("view_seed", seed=room.seed.id) }}">Seed #{{ room.seed.id|suuid }}</a>
|
||||||
<br>
|
<br>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if room.tracker %}
|
{% if room.tracker %}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{% macro list_rooms(rooms) -%}
|
{% macro list_rooms(rooms) -%}
|
||||||
<ul>
|
<ul>
|
||||||
{% for room in rooms %}
|
{% for room in rooms %}
|
||||||
<li><a href="{{ url_for("hostRoom", room=room.id) }}">Room #{{ room.id|suuid }}</a></li>
|
<li><a href="{{ url_for("host_room", room=room.id) }}">Room #{{ room.id|suuid }}</a></li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{{ caller() }}
|
{{ caller() }}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
@ -29,8 +29,8 @@
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for room in rooms %}
|
{% for room in rooms %}
|
||||||
<tr>
|
<tr>
|
||||||
<td><a href="{{ url_for("viewSeed", seed=room.seed.id) }}">{{ room.seed.id|suuid }}</a></td>
|
<td><a href="{{ url_for("view_seed", seed=room.seed.id) }}">{{ room.seed.id|suuid }}</a></td>
|
||||||
<td><a href="{{ url_for("hostRoom", room=room.id) }}">{{ room.id|suuid }}</a></td>
|
<td><a href="{{ url_for("host_room", room=room.id) }}">{{ room.id|suuid }}</a></td>
|
||||||
<td>>={{ room.seed.slots|length }}</td>
|
<td>>={{ room.seed.slots|length }}</td>
|
||||||
<td>{{ room.creation_time.strftime("%Y-%m-%d %H:%M") }}</td>
|
<td>{{ room.creation_time.strftime("%Y-%m-%d %H:%M") }}</td>
|
||||||
<td>{{ room.last_activity.strftime("%Y-%m-%d %H:%M") }}</td>
|
<td>{{ room.last_activity.strftime("%Y-%m-%d %H:%M") }}</td>
|
||||||
|
@ -55,7 +55,7 @@
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for seed in seeds %}
|
{% for seed in seeds %}
|
||||||
<tr>
|
<tr>
|
||||||
<td><a href="{{ url_for("viewSeed", seed=seed.id) }}">{{ seed.id|suuid }}</a></td>
|
<td><a href="{{ url_for("view_seed", seed=seed.id) }}">{{ seed.id|suuid }}</a></td>
|
||||||
<td>{% if seed.multidata %}>={{ seed.slots|length }}{% else %}1{% endif %}
|
<td>{% if seed.multidata %}>={{ seed.slots|length }}{% else %}1{% endif %}
|
||||||
</td>
|
</td>
|
||||||
<td>{{ seed.creation_time.strftime("%Y-%m-%d %H:%M") }}</td>
|
<td>{{ seed.creation_time.strftime("%Y-%m-%d %H:%M") }}</td>
|
||||||
|
|
|
@ -98,7 +98,7 @@ def uploads():
|
||||||
if type(res) == str:
|
if type(res) == str:
|
||||||
return res
|
return res
|
||||||
elif res:
|
elif res:
|
||||||
return redirect(url_for("viewSeed", seed=res.id))
|
return redirect(url_for("view_seed", seed=res.id))
|
||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
multidata = file.read()
|
multidata = file.read()
|
||||||
|
@ -109,7 +109,7 @@ def uploads():
|
||||||
else:
|
else:
|
||||||
seed = Seed(multidata=multidata, owner=session["_id"])
|
seed = Seed(multidata=multidata, owner=session["_id"])
|
||||||
flush() # place into DB and generate ids
|
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:
|
else:
|
||||||
flash("Not recognized file format. Awaiting a .archipelago file or .zip containing one.")
|
flash("Not recognized file format. Awaiting a .archipelago file or .zip containing one.")
|
||||||
return render_template("hostGame.html")
|
return render_template("hostGame.html")
|
||||||
|
|
Loading…
Reference in New Issue