Fix non deterministic behavior

desbma · Jun 5, 2020 · 92309dd · 92309dd
1 parent 4ab874c
commit 92309dd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/amg/tag.py b/amg/tag.py
@@ -11,6 +11,7 @@
 import string
 from typing import Dict, List, Optional, Sequence
 
+import more_itertools
 import mutagen
 import unidecode
 
@@ -385,14 +386,14 @@ def doKeep(self) -> bool:
 
   def cleanup(self, title: str, artist: str) -> str:
     """ See TitleCleanerBase.cleanup. """
-    artist_variants = tuple(frozenset((f"{artist} band",
-                                       artist,
-                                       artist.replace(" ", ""),
-                                       artist.replace("and", "&"),
-                                       artist.replace("&", "and"),
-                                       artist.replace(", ", " and "),
-                                       artist.replace(" and ", ", "),
-                                       artist.replace("’", ""))))
+    artist_variants = tuple(more_itertools.unique_everseen((f"{artist} band",
+                                                            artist,
+                                                            artist.replace(" ", ""),
+                                                            artist.replace("and", "&"),
+                                                            artist.replace("&", "and"),
+                                                            artist.replace(", ", " and "),
+                                                            artist.replace(" and ", ", "),
+                                                            artist.replace("’", ""))))
     for s, suffix_only in itertools.zip_longest(("by " + artist,) + artist_variants,
                                                 (True,),
                                                 fillvalue=False):

diff --git a/requirements.txt b/requirements.txt
@@ -2,6 +2,7 @@ appdirs>=1.4.3
 cssselect>=1.0.3
 curses-menu==0.5.0
 lxml>=4.3.3
+more_itertools>=8.3.0
 mutagen>=1.42.0
 Pillow>=6.0.0
 r128gain>=1.0.1