Resolve scoring and HUD font records by native VLT identity

tools/prepare_hud.py

@@ -24,11 +24,12 @@ def font_mapping(collections: Path, cache: AssetCache) -> dict:
     data = json.loads(collections.read_text(encoding='utf-8'))
     result = {}
     for row in data['collections']:
-        if row['class'] != 'Hash_FECFBCAF356518C4':
+        class_id = int(row['class'][5:], 16) if row['class'].startswith('Hash_') else hash64(row['class'])
+        if class_id != 0xFECFBCAF356518C4:
             continue
         def field(name):
             return row['fields'].get(name, row['fields'].get(f'Hash_{hash64(name):016X}'))
-        apt_name = row['fields']['Hash_340832CCFD9FDEB4']['data']
+        apt_name = field('AptName')['data']
         filename = field('FileName')['data']
         matches = [r for r in cache.manifest['bundles']
                    if 'font' in r and Path(r['name']).name == filename]

tools/test_hud_font_identity.py

@@ -0,0 +1,37 @@
+import json
+from pathlib import Path
+import tempfile
+import unittest
+
+from prepare_hud import font_mapping
+from asset_pipeline.vlt import hash64
+
+
+class Cache:
+    manifest = {'bundles': [{'name': 'fonts/original', 'font': {'family': 'Original family'}}]}
+
+    def add_font_alias(self, name, target, provenance):
+        self.alias = (name, target)
+
+
+class FontIdentityTests(unittest.TestCase):
+    def test_readable_and_numeric_exports_resolve_the_same_original_font(self):
+        with tempfile.TemporaryDirectory() as directory:
+            path = Path(directory) / 'collections.json'
+            for named_class in (True, False):
+                for named_fields in (True, False):
+                    fields = {'AptName': {'data': 'Original APT name'}, 'FileName': {'data': 'original'}}
+                    fields.update({key: {'data': '3F800000'} for key in ('ScaleX', 'ScaleY', 'OffsetX', 'OffsetY')})
+                    if not named_fields:
+                        fields = {f'Hash_{hash64(key):016X}': value for key, value in fields.items()}
+                    path.write_text(json.dumps({'collections': [{
+                        'class': 'fe_fonts' if named_class else 'Hash_FECFBCAF356518C4',
+                        'key': 'original', 'sha256': '', 'fields': fields}]}))
+                    cache = Cache()
+                    result = font_mapping(path, cache)
+                    self.assertEqual(cache.alias, ('Original APT name', 'Original family'))
+                    self.assertEqual(result['Original APT name']['native_layout']['ScaleX'], 1.0)
+
+
+if __name__ == '__main__':
+    unittest.main()