lyrics: Fallback to plain lyrics if synced not available

beetbox · Jan 25, 2024 · 1adec91 · 1adec91
1 parent 7f1250d
commit 1adec91
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/beetsplug/lyrics.py b/beetsplug/lyrics.py
@@ -313,7 +313,7 @@ def fetch(self, artist, title, album=None, length=None):
             return None
 
         if self.config["synced"]:
-            return data.get("syncedLyrics")
+            return data.get("syncedLyrics") or data.get("plainLyrics")
 
         return data.get("plainLyrics")
 

diff --git a/test/plugins/test_lyrics.py b/test/plugins/test_lyrics.py
@@ -696,13 +696,27 @@ def test_fetch_synced_lyrics(self, mock_get):
         mock_get.return_value.json.return_value = mock_response
         mock_get.return_value.status_code = 200
 
+        self.plugin.config["synced"] = False
         lyrics = lrclib.fetch("la", "la", "la", 999)
         self.assertEqual(lyrics, mock_response["plainLyrics"])
 
         self.plugin.config["synced"] = True
         lyrics = lrclib.fetch("la", "la", "la", 999)
         self.assertEqual(lyrics, mock_response["syncedLyrics"])
 
+    @patch("beetsplug.lyrics.requests.get")
+    def test_fetch_synced_lyrics_fallback(self, mock_get):
+        mock_response = {
+            "syncedLyrics": "",
+            "plainLyrics": "la la la",
+        }
+        mock_get.return_value.json.return_value = mock_response
+        mock_get.return_value.status_code = 200
+
+        self.plugin.config["synced"] = True
+        lyrics = lrclib.fetch("la", "la", "la", 999)
+        self.assertEqual(lyrics, mock_response["plainLyrics"])
+
     @patch("beetsplug.lyrics.requests.get")
     def test_fetch_plain_lyrics(self, mock_get):
         mock_response = {
@@ -712,6 +726,7 @@ def test_fetch_plain_lyrics(self, mock_get):
         mock_get.return_value.json.return_value = mock_response
         mock_get.return_value.status_code = 200
 
+        self.plugin.config["synced"] = False
         lyrics = lrclib.fetch("la", "la", "la", 999)
 
         self.assertEqual(lyrics, mock_response["plainLyrics"])