Merge branch 'master' into album-view

beets/autotag/match.py

@@ -22,9 +22,11 @@
 import re
 from collections.abc import Iterable, Sequence
 from enum import IntEnum
-from typing import TYPE_CHECKING, Any, NamedTuple, TypeVar, Union, cast
+from functools import cache
+from typing import TYPE_CHECKING, Any, NamedTuple, TypeVar, cast
 
-from munkres import Munkres
+import lap
+import numpy as np
 
 from beets import config, logging, plugins
 from beets.autotag import (
@@ -126,21 +128,15 @@ def assign_items(
     of objects of the two types.
     """
     # Construct the cost matrix.
-    costs: list[list[Distance]] = []
-    for item in items:
-        row = []
-        for track in tracks:
-            row.append(track_distance(item, track))
-        costs.append(row)
-
+    costs = [[float(track_distance(i, t)) for t in tracks] for i in items]
     # Find a minimum-cost bipartite matching.
     log.debug("Computing track assignment...")
-    matching = Munkres().compute(costs)
+    cost, _, assigned_idxs = lap.lapjv(np.array(costs), extend_cost=True)
     log.debug("...done.")
 
     # Produce the output matching.
-    mapping = {items[i]: tracks[j] for (i, j) in matching}
-    extra_items = list(set(items) - set(mapping.keys()))
+    mapping = {items[i]: tracks[t] for (t, i) in enumerate(assigned_idxs)}
+    extra_items = list(set(items) - mapping.keys())
     extra_items.sort(key=lambda i: (i.disc, i.track, i.title))
     extra_tracks = list(set(tracks) - set(mapping.values()))
     extra_tracks.sort(key=lambda t: (t.index, t.title))
@@ -154,6 +150,18 @@ def track_index_changed(item: Item, track_info: TrackInfo) -> bool:
     return item.track not in (track_info.medium_index, track_info.index)
 
 
+@cache
+def get_track_length_grace() -> float:
+    """Get cached grace period for track length matching."""
+    return config["match"]["track_length_grace"].as_number()
+
+
+@cache
+def get_track_length_max() -> float:
+    """Get cached maximum track length for track length matching."""
+    return config["match"]["track_length_max"].as_number()
+
+
 def track_distance(
     item: Item,
     track_info: TrackInfo,
@@ -162,23 +170,17 @@ def track_distance(
     """Determines the significance of a track metadata change. Returns a
     Distance object. `incl_artist` indicates that a distance component should
     be included for the track artist (i.e., for various-artist releases).
+
+    ``track_length_grace`` and ``track_length_max`` configuration options are
+    cached because this function is called many times during the matching
+    process and their access comes with a performance overhead.
     """
     dist = hooks.Distance()
 
     # Length.
-    if track_info.length:
-        item_length = cast(float, item.length)
-        track_length_grace = cast(
-            Union[float, int],
-            config["match"]["track_length_grace"].as_number(),
-        )
-        track_length_max = cast(
-            Union[float, int],
-            config["match"]["track_length_max"].as_number(),
-        )
-
-        diff = abs(item_length - track_info.length) - track_length_grace
-        dist.add_ratio("track_length", diff, track_length_max)
+    if info_length := track_info.length:
+        diff = abs(item.length - info_length) - get_track_length_grace()
+        dist.add_ratio("track_length", diff, get_track_length_max())
 
     # Title.
     dist.add_string("track_title", item.title, track_info.title)

beets/util/__init__.py

@@ -510,10 +510,7 @@ def copy(path: bytes, dest: bytes, replace: bool = False):
 def move(path: bytes, dest: bytes, replace: bool = False):
     """Rename a file. `dest` may not be a directory. If `dest` already
     exists, raises an OSError unless `replace` is True. Has no effect if
-    `path` is the same as `dest`. If the paths are on different
-    filesystems (or the rename otherwise fails), a copy is attempted
-    instead, in which case metadata will *not* be preserved. Paths are
-    translated to system paths.
+    `path` is the same as `dest`. Paths are translated to system paths.
     """
     if os.path.isdir(syspath(path)):
         raise FilesystemError("source is directory", "move", (path, dest))
@@ -548,6 +545,14 @@ def move(path: bytes, dest: bytes, replace: bool = False):
         finally:
             tmp.close()
 
+        try:
+            # Copy file metadata
+            shutil.copystat(syspath(path), tmp.name)
+        except OSError:
+            # Ignore errors because it doesn't matter too much.  We may be on a
+            # filesystem that doesn't support this.
+            pass
+
         # Move the copied file into place.
         tmp_filename = tmp.name
         try:

docs/changelog.rst

@@ -27,6 +27,9 @@ Bug fixes:
   :bug:`5265`
   :bug:`5371`
   :bug:`4715`
+* :ref:`import-cmd`: Fix ``MemoryError`` and improve performance tagging large
+  albums by replacing ``munkres`` library with ``lap.lapjv``.
+  :bug:`5207`
 
 For packagers:
 

pyproject.toml

@@ -44,9 +44,10 @@ python = ">=3.9,<4"
 colorama = { version = "*", markers = "sys_platform == 'win32'" }
 confuse = ">=1.5.0"
 jellyfish = "*"
+lap = ">=0.5.12"
 mediafile = ">=0.12.0"
-munkres = ">=1.0.0"
 musicbrainzngs = ">=0.4"
+numpy = ">=1.24.4"
 platformdirs = ">=3.5.0"
 pyyaml = "*"
 typing_extensions = { version = "*", python = "<=3.10" }

test/plugins/test_bucket.py

@@ -14,6 +14,8 @@
 
 """Tests for the 'bucket' plugin."""
 
+from datetime import datetime
+
 import pytest
 
 from beets import config, ui
@@ -51,7 +53,8 @@ def test_year_single_year_last_folder(self):
         year."""
         self._setup_config(bucket_year=["1950", "1970"])
         assert self.plugin._tmpl_bucket("2014") == "1970"
-        assert self.plugin._tmpl_bucket("2025") == "2025"
+        next_year = datetime.now().year + 1
+        assert self.plugin._tmpl_bucket(str(next_year)) == str(next_year)
 
     def test_year_two_years(self):
         """Buckets can be named with the 'from-to' syntax."""