From afc072801c4a254e6b4114d89133d6bebc3e34b9 Mon Sep 17 00:00:00 2001
From: Evgeniy Gurevich <evgeniy.gurevich@gmail.com>
Date: Fri, 2 Apr 2021 10:35:53 +0800
Subject: [PATCH] Simplify Musixmatch multi-part lyrics parser

---
 beetsplug/lyrics.py | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/beetsplug/lyrics.py b/beetsplug/lyrics.py
index 84fe6c6bb..125d1330d 100644
--- a/beetsplug/lyrics.py
+++ b/beetsplug/lyrics.py
@@ -292,15 +292,11 @@ class MusiXmatch(Backend):
                               % url)
             return
         html_parts = html.split('<p class="mxm-lyrics__content')
-        # Sometimes lyrics come in 2 parts
-        if len(html_parts) > 1:
-            html_part1 = html_parts[-2]
-            lyrics_part1 = extract_text_between(html_part1, '>', '</p>')
-        else:
-            lyrics_part1 = ''
-        html_part2 = html_parts[-1]
-        lyrics_part2 = extract_text_between(html_part2, '>', '</p>')
-        lyrics = lyrics_part1 + '\n' + lyrics_part2
+        # Sometimes lyrics come in 2 or more parts
+        lyrics_parts = []
+        for html_part in html_parts:
+            lyrics_parts.append(extract_text_between(html_part, '>', '</p>'))
+        lyrics = '\n'.join(lyrics_parts)
         lyrics = lyrics.strip(',"').replace('\\n', '\n')
         # another odd case: sometimes only that string remains, for
         # missing songs. this seems to happen after being blocked
@@ -308,7 +304,7 @@ class MusiXmatch(Backend):
         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:
+        if 'Lyrics | Musixmatch' in lyrics:
             return
         return lyrics