hooks: Generalise AlbumMatch and TrackMatch into Match

Author: snejus

beets/autotag/hooks.py

@@ -17,7 +17,9 @@
 from __future__ import annotations
 
 from copy import deepcopy
-from typing import TYPE_CHECKING, Any, NamedTuple, TypeVar
+from dataclasses import dataclass
+from functools import cached_property
+from typing import TYPE_CHECKING, Any, TypeVar
 
 from typing_extensions import Self
 
@@ -214,20 +216,24 @@ def __init__(
 
 
 # Structures that compose all the information for a candidate match.
+@dataclass
+class Match:
+    distance: Distance
+    info: Info
 
 
-class AlbumMatch(NamedTuple):
-    distance: Distance
+@dataclass
+class AlbumMatch(Match):
     info: AlbumInfo
     mapping: list[tuple[Item, TrackInfo]]
     extra_items: list[Item]
     extra_tracks: list[TrackInfo]
 
-    @property
+    @cached_property
     def items(self) -> list[Item]:
         return [i for i, _ in self.mapping]
 
 
-class TrackMatch(NamedTuple):
-    distance: Distance
+@dataclass
+class TrackMatch(Match):
     info: TrackInfo