diff --git a/maloja/__pkginfo__.py b/maloja/__pkginfo__.py index 386200c..2e9b709 100644 --- a/maloja/__pkginfo__.py +++ b/maloja/__pkginfo__.py @@ -5,7 +5,7 @@ author = { "email":"maloja@krateng.dev", "github": "krateng" } -version = 2,10,4 +version = 2,10,5 versionstr = ".".join(str(n) for n in version) links = { "pypi":"malojaserver", diff --git a/maloja/cleanup.py b/maloja/cleanup.py index 6580c36..c34e322 100644 --- a/maloja/cleanup.py +++ b/maloja/cleanup.py @@ -94,12 +94,7 @@ class CleanerAgent: return self.parseArtists(re.sub(r"(.*) \(" + d + " (.*)\)",r"\1",a)) + \ self.parseArtists(re.sub(r"(.*) \(" + d + " (.*)\)",r"\2",a)) - for d in self.delimiters_formal: - if (d in a): - ls = [] - for i in a.split(d): - ls += self.parseArtists(i) - return ls + for d in (self.delimiters_feat + self.delimiters): if ((" " + d + " ") in a): @@ -108,6 +103,13 @@ class CleanerAgent: ls += self.parseArtists(i) return ls + for d in self.delimiters_formal: + if (d in a): + ls = [] + for i in a.split(d): + ls += self.parseArtists(i) + return ls +