diff --git a/swingmusic/config.py b/swingmusic/config.py index baf48a33..0c153c6a 100644 --- a/swingmusic/config.py +++ b/swingmusic/config.py @@ -31,6 +31,8 @@ class UserConfig: "Peter, Paul & Mary", "Simon & Garfunkel", "Judy & Mary", + "Belle & Sebastian", + "Florence & The Machine", } ) genreSeparators: set[str] = field(default_factory=lambda: {"/", ";", "&"}) @@ -72,7 +74,12 @@ class UserConfig: # loop through the config file and set the values for key, value in config.items(): - setattr(self, key, value) + if key == "artistSplitIgnoreList": + # Merge with default values instead of overwriting + default_values = self.artistSplitIgnoreList + setattr(self, key, default_values.union(value)) + else: + setattr(self, key, value) # finally set the config path self._config_path = config_path diff --git a/swingmusic/enums/album_versions.py b/swingmusic/enums/album_versions.py index b9a3d365..404ec40b 100644 --- a/swingmusic/enums/album_versions.py +++ b/swingmusic/enums/album_versions.py @@ -42,7 +42,7 @@ class AlbumVersionEnum(Enum): BONUS_EDITION = ("bonus",) BONUS_TRACK = ("bonus track",) - ORIGINAL = ("original", "og") + ORIGINAL = ("original", " og ", "og ") INTL_VERSION = ("international",) UK_VERSION = ("uk version",) US_VERSION = ("us version",)