Try to fix backwards plugin

Author: misode

gm4/plugins/backwards.py

@@ -1,7 +1,6 @@
 import logging
 from typing import Any, Tuple, Callable
 from beet import Context, Pack, NamespaceFile, ItemModel
-from beet.core.utils import SupportedFormats
 
 logger = logging.getLogger("gm4.backwards")
 
@@ -55,8 +54,7 @@ def backport(pack: Pack[Any], format: int, run: Callable[[str, NamespaceFile], N
       resources[(file_type, path)] = proxy[path]
 
   for overlay in pack.overlays.values():
-    overlay_formats = overlay.supported_formats or overlay.pack_format
-    if check_formats(overlay_formats, format):
+    if check_formats(overlay, format):
       for file_type in overlay.resolve_scope_map().values():
         proxy = overlay[file_type]
         for path in proxy.keys():
@@ -74,13 +72,23 @@ def backport(pack: Pack[Any], format: int, run: Callable[[str, NamespaceFile], N
       overlay[path] = new_resource
 
 
-def check_formats(supported: SupportedFormats, format: int):
-  match supported:
-    case int(value):
-      return value == format
-    case [min, max]:
-      return min <= format <= max
-    case { "min_inclusive": min, "max_inclusive": max }:
-      return min <= format <= max
-    case _:
-      raise ValueError(f"Unknown supported_formats structure {supported}")
+def check_formats(overlay: Pack[Any], format: int):
+  if overlay.min_format and overlay.max_format:
+    return get_major(overlay.min_format) <= format <= get_major(overlay.max_format)
+  if overlay.supported_formats:
+    match overlay.supported_formats:
+      case int(value):
+        return value == format
+      case [min, max]:
+        return min <= format <= max
+      case { "min_inclusive": min, "max_inclusive": max }:
+        return min <= format <= max
+      case _:
+        raise ValueError(f"Unknown supported_formats structure {overlay.supported_formats}")
+  if overlay.pack_format:
+    return overlay.pack_format == format
+  return False
+
+
+def get_major(format: int | tuple[int] | tuple[int, int]):
+  return format if isinstance(format, int) else format[0]