From a8fe8ce9a78ec320cd52a70b0ee2e7502ca8fc91 Mon Sep 17 00:00:00 2001 From: Evgeniy Gurevich Date: Thu, 1 Apr 2021 14:21:49 +0800 Subject: [PATCH] Fix for Musixmatch multi-part lyrics Sometimes Musixmatch lyrics come in 2 parts. Also, sometime non-existent lyrics return some content --- beetsplug/lyrics.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/beetsplug/lyrics.py b/beetsplug/lyrics.py index 08efd38ff..84fe6c6bb 100644 --- a/beetsplug/lyrics.py +++ b/beetsplug/lyrics.py @@ -291,14 +291,25 @@ class MusiXmatch(Backend): self._log.warning(u'we are blocked at MusixMatch: url %s failed' % url) return - html_part = html.split('

1: + html_part1 = html_parts[-2] + lyrics_part1 = extract_text_between(html_part1, '>', '

') + else: + lyrics_part1 = '' + html_part2 = html_parts[-1] + lyrics_part2 = extract_text_between(html_part2, '>', '

') + lyrics = lyrics_part1 + '\n' + lyrics_part2 lyrics = lyrics.strip(',"').replace('\\n', '\n') # another odd case: sometimes only that string remains, for # missing songs. this seems to happen after being blocked # above, when filling in the CAPTCHA. if "Instant lyrics for all your music." in lyrics: return + # sometimes there are non-existent lyrics with some content + if 'Think is wrong? You can always add the lyrics' in lyrics: + return return lyrics