From 3110763052cd7362a0ec2a32d6e361fc18fe8f99 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Fri, 3 Dec 2021 02:41:56 +0100 Subject: [PATCH] WebHost: allow switching out "/tracker/" for "/generic_tracker/" in a tracker url to get the generic tracker for that slot. No idea where a good place is to sick a link for it. Maybe on the individual trackers pages? --- WebHostLib/tracker.py | 9 +++++++-- data/client.kv | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/WebHostLib/tracker.py b/WebHostLib/tracker.py index 59102707..c91c2e8a 100644 --- a/WebHostLib/tracker.py +++ b/WebHostLib/tracker.py @@ -281,7 +281,7 @@ def get_static_room_data(room: Room): @app.route('/tracker///') @cache.memoize(timeout=60) # multisave is currently created at most every minute -def getPlayerTracker(tracker: UUID, tracked_team: int, tracked_player: int): +def getPlayerTracker(tracker: UUID, tracked_team: int, tracked_player: int, want_generic: bool = False): # Team and player must be positive and greater than zero if tracked_team < 0 or tracked_player < 1: abort(404) @@ -324,7 +324,7 @@ def getPlayerTracker(tracker: UUID, tracked_team: int, tracked_player: int): checks_done[location_to_area[location]] += 1 checks_done["Total"] += 1 specific_tracker = game_specific_trackers.get(games[tracked_player], None) - if specific_tracker: + if specific_tracker and not want_generic: return specific_tracker(multisave, room, locations, inventory, tracked_team, tracked_player, player_name, seed_checks_in_area, checks_done) else: @@ -332,6 +332,11 @@ def getPlayerTracker(tracker: UUID, tracked_team: int, tracked_player: int): seed_checks_in_area, checks_done) +@app.route('/generic_tracker///') +def get_generic_tracker(tracker: UUID, tracked_team: int, tracked_player: int): + return getPlayerTracker(tracker, tracked_team, tracked_player, True) + + def __renderAlttpTracker(multisave: Dict[str, Any], room: Room, locations: Dict[int, Dict[int, Tuple[int, int]]], inventory: Counter, team: int, player: int, player_name: str, seed_checks_in_area: Dict[int, Dict[str, int]], checks_done: Dict[str, int]) -> str: diff --git a/data/client.kv b/data/client.kv index 84afd22d..09be0188 100644 --- a/data/client.kv +++ b/data/client.kv @@ -33,7 +33,7 @@ : size: self.texture_size size_hint: None, None - font_size: 18 + font_size: dp(18) pos_hint: {'center_y': 0.5, 'center_x': 0.5} halign: "left" canvas.before: