lyrics: normalize " & " and " and "

snejus · snejus · commit e02260c430ea · 2025-01-20T17:11:23.000Z
diff --git a/beets/autotag/hooks.py b/beets/autotag/hooks.py
@@ -271,7 +271,8 @@ def copy(self) -> TrackInfo:
 ]
 # Replacements to use before testing distance.
 SD_REPLACE = [
-    (r"&", "and"),
+    (r" & ", ", "),
+    (r" and ", ", "),
 ]
 
 
diff --git a/test/plugins/test_lyrics.py b/test/plugins/test_lyrics.py
@@ -156,6 +156,7 @@ def backend(self, dist_thresh):
             (0.11, "Psychonaut", "Psychonaut (BEL)", True),
             (0.11, "beets song", "beats song", True),
             (0.10, "beets song", "beats song", False),
+            (0.10, "beets & song", "beats and song", False),
             (
                 0.11,
                 "Lucid Dreams (Forget Me)",

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,8 @@ def copy(self) -> TrackInfo:`
`271`	`271`	`]`
`272`	`272`	`# Replacements to use before testing distance.`
`273`	`273`	`SD_REPLACE = [`
`274`		`- (r"&", "and"),`
	`274`	`+ (r" & ", ", "),`
	`275`	`+ (r" and ", ", "),`
`275`	`276`	`]`
`276`	`277`
`277`	`278`
Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,7 @@ def backend(self, dist_thresh):`
`156`	`156`	`(0.11, "Psychonaut", "Psychonaut (BEL)", True),`
`157`	`157`	`(0.11, "beets song", "beats song", True),`
`158`	`158`	`(0.10, "beets song", "beats song", False),`
	`159`	`+ (0.10, "beets & song", "beats and song", False),`
`159`	`160`	`(`
`160`	`161`	`0.11,`
`161`	`162`	`"Lucid Dreams (Forget Me)",`