WebHost: Fix player tracker issue with items missing from data package.

Reported in https://discord.com/channels/731205301247803413/1192202112172576819
ArchipelagoMW · Jan 3, 2024 · dffa9e9 · dffa9e9
1 parent 0df0955
commit dffa9e9
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 9 deletions.
diff --git a/WebHostLib/templates/genericTracker.html b/WebHostLib/templates/genericTracker.html
@@ -48,7 +48,13 @@
 
                     {% for id, count in inventory.items() if count > 0 %}
                         <tr>
-                            <td>{{ item_id_to_name[game][id] }}</td>
+                            <td>
+                                {% if item_id_to_name[game][id] %}
+                                {{ item_id_to_name[game][id] }}
+                                {% else %}
+                                Unknown Item #{{ id }}
+                                {% endif %}
+                            </td>
                             <td>{{ count }}</td>
                             <td>{{ received_items[id] }}</td>
                         </tr>
@@ -69,7 +75,13 @@
 
                     {%- for location in locations -%}
                         <tr>
-                            <td>{{ location_id_to_name[game][location] }}</td>
+                            <td>
+                                {% if location_id_to_name[game][location] %}
+                                {{ location_id_to_name[game][location] }}
+                                {% else %}
+                                Unknown Location #{{ id }}
+                                {% endif %}
+                            </td>
                             <td class="center-column">
                                 {% if location in checked_locations %}✔{% endif %}
                             </td>
@@ -109,8 +121,20 @@
                                     {{ player_names_with_alias[(team, hint.receiving_player)] }}
                                 {% endif %}
                             </td>
-                            <td>{{ item_id_to_name[games[(team, hint.receiving_player)]][hint.item] }}</td>
-                            <td>{{ location_id_to_name[games[(team, hint.finding_player)]][hint.location] }}</td>
+                            <td>
+                                {% if item_id_to_name[games[(team, hint.receiving_player)]][hint.item] %}
+                                {{ item_id_to_name[games[(team, hint.receiving_player)]][hint.item] }}
+                                {% else %}
+                                Unknown Item #{{ id }}
+                                {% endif %}
+                            </td>
+                            <td>
+                                {% if location_id_to_name[games[(team, hint.finding_player)]][hint.location] %}
+                                {{ location_id_to_name[games[(team, hint.finding_player)]][hint.location] }}
+                                {% else %}
+                                Unknown Location #{{ id }}
+                                {% endif %}
+                            </td>
                             <td>{{ games[(team, hint.finding_player)] }}</td>
                             <td>{% if hint.entrance %}{{ hint.entrance }}{% else %}Vanilla{% endif %}</td>
                             <td class="center-column">{% if hint.found %}✔{% endif %}</td>

diff --git a/WebHostLib/templates/multitrackerHintTable.html b/WebHostLib/templates/multitrackerHintTable.html
@@ -23,8 +23,20 @@
                     <tr>
                         <td>{{ player_names_with_alias[(team, hint.finding_player)] }}</td>
                         <td>{{ player_names_with_alias[(team, hint.receiving_player)] }}</td>
-                        <td>{{ item_id_to_name[games[(team, hint.receiving_player)]][hint.item] }}</td>
-                        <td>{{ location_id_to_name[games[(team, hint.finding_player)]][hint.location] }}</td>
+                        <td>
+                            {% if item_id_to_name[games[(team, hint.receiving_player)]][hint.item] %}
+                            {{ item_id_to_name[games[(team, hint.receiving_player)]][hint.item] }}
+                            {% else %}
+                            Unknown Item #{{ id }}
+                            {% endif %}
+                        </td>
+                        <td>
+                            {% if location_id_to_name[games[(team, hint.finding_player)]][hint.location] %}
+                            {{ location_id_to_name[games[(team, hint.finding_player)]][hint.location] }}
+                            {% else %}
+                            Unknown Location #{{ id }}
+                            {% endif %}
+                        </td>
                         <td>{{ games[(team, hint.finding_player)] }}</td>
                         <td>{% if hint.entrance %}{{ hint.entrance }}{% else %}Vanilla{% endif %}</td>
                         <td class="center-column">{% if hint.found %}✔{% endif %}</td>

diff --git a/WebHostLib/tracker.py b/WebHostLib/tracker.py
@@ -1,4 +1,5 @@
 import datetime
+import collections
 from dataclasses import dataclass
 from typing import Any, Callable, Dict, List, Optional, Set, Tuple
 from uuid import UUID
@@ -115,10 +116,10 @@ def get_player_received_items(self, team: int, player: int) -> List[NetworkItem]
         return self._multisave.get("received_items", {}).get((team, player, True), [])
 
     @_cache_results
-    def get_player_inventory_counts(self, team: int, player: int) -> Dict[int, int]:
+    def get_player_inventory_counts(self, team: int, player: int) -> collections.Counter:
         """Retrieves a dictionary of all items received by their id and their received count."""
         items = self.get_player_received_items(team, player)
-        inventory = {item: 0 for item in self.item_id_to_name[self.get_player_game(team, player)]}
+        inventory = collections.Counter()
         for item in items:
             inventory[item.item] += 1
 
@@ -389,7 +390,6 @@ def render_generic_multiworld_tracker(tracker_data: TrackerData, enabled_tracker
 
 # TODO: This is a temporary solution until a proper Tracker API can be implemented for tracker templates and data to
 #       live in their respective world folders.
-import collections
 
 from worlds import network_data_package