allow aliases in tracker and prevent them from causing html/js/database "stuff"
Though technically they can still do unicode "stuff"
This commit is contained in:
parent
f72f344860
commit
38fe292acb
|
@ -443,7 +443,7 @@ async def get_snes_devices(ctx: Context):
|
||||||
|
|
||||||
|
|
||||||
async def snes_connect(ctx: Context, address):
|
async def snes_connect(ctx: Context, address):
|
||||||
if ctx.snes_socket is not None:
|
if ctx.snes_socket is not None and ctx.snes_state == SNES_CONNECTED:
|
||||||
ctx.ui_node.log_error('Already connected to snes')
|
ctx.ui_node.log_error('Already connected to snes')
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
|
@ -8,18 +8,22 @@
|
||||||
src="https://cdn.datatables.net/v/bs4/jq-3.3.1/dt-1.10.21/fh-3.1.7/datatables.min.js"></script>
|
src="https://cdn.datatables.net/v/bs4/jq-3.3.1/dt-1.10.21/fh-3.1.7/datatables.min.js"></script>
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
$(".table").DataTable({
|
var tables = $(".table").DataTable({
|
||||||
"paging": false,
|
"paging": false,
|
||||||
"ordering": true,
|
"ordering": true,
|
||||||
"info": false,
|
"info": false,
|
||||||
"fixedHeader": true,
|
"fixedHeader": true,
|
||||||
"dom": "t"
|
"dom": "t"
|
||||||
});
|
});
|
||||||
|
$('#searchbox').keyup(function () {
|
||||||
|
tables.search($(this).val()).draw();
|
||||||
|
})
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="static.css") }}"/>
|
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="static.css") }}"/>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
{% block body %}
|
{% block body %}
|
||||||
|
<input id="searchbox" class="form-control" type="text" placeholder="Search">
|
||||||
{% for team, players in inventory.items() %}
|
{% for team, players in inventory.items() %}
|
||||||
<table class="table table-striped table-bordered table-hover table-sm">
|
<table class="table table-striped table-bordered table-hover table-sm">
|
||||||
<thead class="thead-dark">
|
<thead class="thead-dark">
|
||||||
|
@ -30,9 +34,9 @@
|
||||||
{% if name in icons %}
|
{% if name in icons %}
|
||||||
<th style="text-align: center"><img height="32" width="32" style="object-fit: contain"
|
<th style="text-align: center"><img height="32" width="32" style="object-fit: contain"
|
||||||
src="{{ icons[name] }}"
|
src="{{ icons[name] }}"
|
||||||
alt="{{ name }}"></th>
|
alt="{{ name|e }}"></th>
|
||||||
{% else %}
|
{% else %}
|
||||||
<th>{{ name }}</th>
|
<th>{{ name|e }}</th>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -78,7 +82,7 @@
|
||||||
{% for player, checks in players.items() %}
|
{% for player, checks in players.items() %}
|
||||||
<tr>
|
<tr>
|
||||||
<td class="table-info">{{ loop.index }}</td>
|
<td class="table-info">{{ loop.index }}</td>
|
||||||
<td class="table-info">{{ player_names[(team, loop.index)] }}</td>
|
<td class="table-info">{{ player_names[(team, loop.index)]|e }}</td>
|
||||||
{% for area in ordered_areas %}
|
{% for area in ordered_areas %}
|
||||||
{% set checks_done = checks[area] %}
|
{% set checks_done = checks[area] %}
|
||||||
{% set checks_total = checks_in_area[area] %}
|
{% set checks_total = checks_in_area[area] %}
|
||||||
|
|
|
@ -188,6 +188,7 @@ def get_tracker(room: int):
|
||||||
attribute_item(inventory, team, recipient, item)
|
attribute_item(inventory, team, recipient, item)
|
||||||
checks_done[team][player][location_to_area[location]] += 1
|
checks_done[team][player][location_to_area[location]] += 1
|
||||||
checks_done[team][player]["Total"] += 1
|
checks_done[team][player]["Total"] += 1
|
||||||
|
|
||||||
for (team, player), game_state in room.multisave.get("client_game_state", []):
|
for (team, player), game_state in room.multisave.get("client_game_state", []):
|
||||||
if game_state:
|
if game_state:
|
||||||
inventory[team][player][106] = 1 # Triforce
|
inventory[team][player][106] = 1 # Triforce
|
||||||
|
@ -200,6 +201,8 @@ def get_tracker(room: int):
|
||||||
for team, names in enumerate(multidata['names']):
|
for team, names in enumerate(multidata['names']):
|
||||||
for player, name in enumerate(names, 1):
|
for player, name in enumerate(names, 1):
|
||||||
player_names[(team, player)] = name
|
player_names[(team, player)] = name
|
||||||
|
for (team, player), alias in room.multisave.get("name_aliases", []):
|
||||||
|
player_names[team, player] = alias
|
||||||
|
|
||||||
return render_template("tracker.html", inventory=inventory, get_item_name_from_id=get_item_name_from_id,
|
return render_template("tracker.html", inventory=inventory, get_item_name_from_id=get_item_name_from_id,
|
||||||
lookup_id_to_name=Items.lookup_id_to_name, player_names=player_names,
|
lookup_id_to_name=Items.lookup_id_to_name, player_names=player_names,
|
||||||
|
|
Loading…
Reference in New Issue