mirror of
https://github.com/krateng/maloja.git
synced 2023-08-10 21:12:55 +03:00
Compare commits
2 Commits
fe21894c5e
...
43ec4c2c9e
Author | SHA1 | Date | |
---|---|---|---|
|
43ec4c2c9e | ||
|
17be00f794 |
|
@ -29,6 +29,10 @@ minor_release_name: "Yeonhee"
|
|||
- "[Bugfix] Fixed native API receiving superfluous keywords"
|
||||
- "[Bugfix] Fixed crash when importing scrobbles with artists with similar names"
|
||||
3.0.5:
|
||||
commit: "fe21894c5ecf3a53c9c5c00453abfc7f41c6a83e"
|
||||
notes:
|
||||
- "[Feature] Added notification system for web interface"
|
||||
- "[Bugfix] Fixed crash when encountering error in Lastfm import"
|
||||
3.0.6:
|
||||
notes:
|
||||
- "[Bugfix] Better parsing of featuring artists"
|
||||
|
|
|
@ -109,9 +109,9 @@ class CleanerAgent:
|
|||
|
||||
|
||||
for d in self.delimiters_feat:
|
||||
if re.match(r"(.*) \(" + d + " (.*)\)",a) is not None:
|
||||
return self.parseArtists(re.sub(r"(.*) \(" + d + " (.*)\)",r"\1",a)) + \
|
||||
self.parseArtists(re.sub(r"(.*) \(" + d + " (.*)\)",r"\2",a))
|
||||
if re.match(r"(.*) [\(\[]" + d + " (.*)[\)\]]",a) is not None:
|
||||
return self.parseArtists(re.sub(r"(.*) [\(\[]" + d + " (.*)[\)\]]",r"\1",a)) + \
|
||||
self.parseArtists(re.sub(r"(.*) [\(\[]" + d + " (.*)[\)\]]",r"\2",a))
|
||||
|
||||
|
||||
|
||||
|
@ -141,9 +141,11 @@ class CleanerAgent:
|
|||
|
||||
t = t.replace("[","(").replace("]",")")
|
||||
|
||||
t = re.sub(r" \(as made famous by .*?\)","",t)
|
||||
t = re.sub(r" \(originally by .*?\)","",t)
|
||||
t = re.sub(r" \(.*?Remaster.*?\)","",t)
|
||||
# we'll leave these matching all bracket types so future changes
|
||||
# won't require readaption
|
||||
t = re.sub(r" [\(\[]as made famous by .*?[\)\]]","",t)
|
||||
t = re.sub(r" [\(\[]originally by .*?[\)\]]","",t)
|
||||
t = re.sub(r" [\(\[].*?Remaster.*?[\)\]]","",t)
|
||||
|
||||
for s in malojaconfig["REMOVE_FROM_TITLE"]:
|
||||
if s in t:
|
||||
|
@ -156,9 +158,9 @@ class CleanerAgent:
|
|||
|
||||
def parseTitleForArtists(self,t):
|
||||
for d in self.delimiters_feat:
|
||||
if re.match(r"(.*) \(" + d + " (.*?)\)",t) is not None:
|
||||
(title,artists) = self.parseTitleForArtists(re.sub(r"(.*) \(" + d + " (.*?)\)",r"\1",t))
|
||||
artists += self.parseArtists(re.sub(r"(.*) \(" + d + " (.*?)\).*",r"\2",t))
|
||||
if re.match(r"(.*) [\(\[]" + d + " (.*?)[\)\]]",t) is not None:
|
||||
(title,artists) = self.parseTitleForArtists(re.sub(r"(.*) [\(\[]" + d + " (.*?)[\)\]]",r"\1",t))
|
||||
artists += self.parseArtists(re.sub(r"(.*) [\(\[]" + d + " (.*?)[\)\]].*",r"\2",t))
|
||||
return (title,artists)
|
||||
if re.match(r"(.*) - " + d + " (.*)",t) is not None:
|
||||
(title,artists) = self.parseTitleForArtists(re.sub(r"(.*) - " + d + " (.*)",r"\1",t))
|
||||
|
|
Loading…
Reference in New Issue
Block a user