monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tracker.py: run Reformat Code

This commit is contained in:
Fabian Dill 2021-09-23 13:52:32 +02:00
parent 68a5784650
commit 7ac9bd8591
1 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
WebHostLib/tracker.py
View File

@ -10,6 +10,7 @@ from WebHostLib import app, cache, Room
from Utils import restricted_loads from Utils import restricted_loads
from worlds import lookup_any_item_id_to_name, lookup_any_location_id_to_name from worlds import lookup_any_item_id_to_name, lookup_any_location_id_to_name
def get_alttp_id(item_name): def get_alttp_id(item_name):
return Items.item_table[item_name][2] return Items.item_table[item_name][2]
@ -283,6 +284,7 @@ def render_timedelta(delta: datetime.timedelta):
_multidata_cache = {} _multidata_cache = {}
def get_location_table(checks_table: dict) -> dict: def get_location_table(checks_table: dict) -> dict:
loc_to_area = {} loc_to_area = {}
for area, locations in checks_table.items(): for area, locations in checks_table.items():
@ -292,6 +294,7 @@ def get_location_table(checks_table: dict) -> dict:
loc_to_area[location] = area loc_to_area[location] = area
return loc_to_area return loc_to_area
def get_static_room_data(room: Room): def get_static_room_data(room: Room):
result = _multidata_cache.get(room.seed.id, None) result = _multidata_cache.get(room.seed.id, None)
if result: if result:
@ -413,13 +416,13 @@ def getPlayerTracker(tracker: UUID, tracked_team: int, tracked_player: int):
display_data[base_name + "_acquired"] = acquired display_data[base_name + "_acquired"] = acquired
display_data[base_name + "_url"] = icons[display_name] display_data[base_name + "_url"] = icons[display_name]
# The single player tracker doesn't care about overworld, underworld, and total checks. Maybe it should? # The single player tracker doesn't care about overworld, underworld, and total checks. Maybe it should?
sp_areas = ordered_areas[2:15] sp_areas = ordered_areas[2:15]
return render_template("lttpTracker.html", inventory=inventory, return render_template("lttpTracker.html", inventory=inventory,
player_name=player_name, room=room, icons=icons, checks_done=checks_done, player_name=player_name, room=room, icons=icons, checks_done=checks_done,
checks_in_area=seed_checks_in_area[tracked_player], acquired_items={lookup_any_item_id_to_name[id] for id in inventory}, checks_in_area=seed_checks_in_area[tracked_player],
acquired_items={lookup_any_item_id_to_name[id] for id in inventory},
small_key_ids=small_key_ids, big_key_ids=big_key_ids, sp_areas=sp_areas, small_key_ids=small_key_ids, big_key_ids=big_key_ids, sp_areas=sp_areas,
key_locations=player_small_key_locations[tracked_player], key_locations=player_small_key_locations[tracked_player],
big_key_locations=player_big_key_locations[tracked_player], big_key_locations=player_big_key_locations[tracked_player],
@ -514,7 +517,9 @@ def getPlayerTracker(tracker: UUID, tracked_team: int, tracked_player: int):
checks_in_area['Total'] = sum(checks_in_area.values()) checks_in_area['Total'] = sum(checks_in_area.values())
return render_template("minecraftTracker.html", return render_template("minecraftTracker.html",
inventory=inventory, icons=minecraft_icons, acquired_items={lookup_any_item_id_to_name[id] for id in inventory if id in lookup_any_item_id_to_name}, inventory=inventory, icons=minecraft_icons,
acquired_items={lookup_any_item_id_to_name[id] for id in inventory if
id in lookup_any_item_id_to_name},
player=tracked_player, team=tracked_team, room=room, player_name=player_name, player=tracked_player, team=tracked_team, room=room, player_name=player_name,
checks_done=checks_done, checks_in_area=checks_in_area, location_info=location_info, checks_done=checks_done, checks_in_area=checks_in_area, location_info=location_info,
**display_data) **display_data)
@ -522,14 +527,19 @@ def getPlayerTracker(tracker: UUID, tracked_team: int, tracked_player: int):
else: else:
checked_locations = multisave.get("location_checks", {}).get((tracked_team, tracked_player), set()) checked_locations = multisave.get("location_checks", {}).get((tracked_team, tracked_player), set())
player_received_items = {} player_received_items = {}
for order_index, networkItem in enumerate(multisave.get('received_items', {}).get((tracked_team, tracked_player), [])): for order_index, networkItem in enumerate(
player_received_items[networkItem.item] = order_index + 1 multisave.get('received_items', {}).get((tracked_team, tracked_player), []),
start=1
):
player_received_items[networkItem.item] = order_index
return render_template("genericTracker.html", return render_template("genericTracker.html",
inventory=inventory, inventory=inventory,
player=tracked_player, team=tracked_team, room=room, player_name=player_name, player=tracked_player, team=tracked_team, room=room, player_name=player_name,
checked_locations=checked_locations, not_checked_locations=set(locations[tracked_player])-checked_locations, checked_locations=checked_locations,
not_checked_locations=set(locations[tracked_player]) - checked_locations,
received_items=player_received_items) received_items=player_received_items)
@app.route('/tracker/<suuid:tracker>') @app.route('/tracker/<suuid:tracker>')
@cache.memoize(timeout=60) # multisave is currently created at most every minute @cache.memoize(timeout=60) # multisave is currently created at most every minute
def getTracker(tracker: UUID): def getTracker(tracker: UUID):