Merge pull request #7 from LewdHuTao/fix-6

fix: youtube return wrong lyrics

Author: LewdHuTao

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.example</groupId>
     <artifactId>lyrics_api_v2</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
     <name>lyrics_api_v2</name>
     <description>lyrics_api_v2</description>
 

src/main/java/com/example/lyrics_api_v2/model/MusixmatchToken.java

@@ -0,0 +1,23 @@
+package com.example.lyrics_api_v2.model;
+
+public class MusixmatchToken {
+    private String message;
+    private String response;
+    private int code;
+
+    public MusixmatchToken(String message, String response, int code) {
+        this.message = message;
+        this.response = response;
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+    public String getRespone() {
+        return response;
+    }
+    public int getCode() {
+        return code;
+    }
+}

src/main/java/com/example/lyrics_api_v2/service/platform/Musixmatch.java

@@ -1,6 +1,7 @@
 package com.example.lyrics_api_v2.service.platform;
 
 import com.example.lyrics_api_v2.model.Lyrics;
+import com.example.lyrics_api_v2.model.MusixmatchToken;
 import org.springframework.stereotype.Service;
 
 import java.io.BufferedReader;
@@ -66,6 +67,7 @@ private synchronized void refreshToken() {
                 cachedToken = matcher.group(1);
                 tokenExpiry = System.currentTimeMillis() + (30 * 60 * 1000); // 30 mins expiry
             } else {
+                new MusixmatchToken("Failed to extract user token from Musixmatch", "500 - Internal Server Error", 500);
                 throw new RuntimeException("Failed to extract user token from Musixmatch.");
             }
         } catch (Exception e) {
@@ -92,7 +94,7 @@ private String fetchLyricsByTrackId(String trackId, String userToken) throws Exc
             lyrics = lyrics.replace("\\n", "\n").replaceAll("\\[\\d+:\\d+\\.\\d+\\]", "").trim();
             return lyrics;
         } else {
-            throw new RuntimeException("Lyrics not found for track ID: " + trackId);
+            return null;
         }
     }
 
@@ -116,7 +118,7 @@ private Lyrics searchTrackByTitle(String title) {
 
                 return new Lyrics(artistName, trackName, trackId, "Musixmatch", artworkUrl, lyrics);
             } else {
-                throw new RuntimeException("No track found for title: " + title);
+                return null;
             }
 
         } catch (Exception e) {
@@ -148,7 +150,7 @@ private Lyrics searchTrackByTitleAndArtist(String title, String artist) {
 
                 return new Lyrics(artistName, trackName, trackId, "Musixmatch", artworkUrl, lyrics);
             } else {
-                throw new RuntimeException("No lyrics found for title: " + title + " and artist: " + artist);
+                return null;
             }
 
         } catch (Exception e) {

src/main/java/com/example/lyrics_api_v2/service/platform/YouTube.java

@@ -63,21 +63,24 @@ public Lyrics fetchLyrics(String title, String artist) {
 
             if (songVideoIds.isEmpty()) return null;
 
-            for (int i = 0; i < songVideoIds.size(); i++) {
-                String videoId = songVideoIds.get(i);
-                String browseId = getLyricsBrowseId(videoId);
-                if (browseId == null) continue;
-                fetchSongContent(videoId);
-
-                String lyricsContent = fetchLyricsContent(browseId);
-                if (lyricsContent != null && !lyricsContent.isBlank()) {
-                    return new Lyrics(this.artistName, this.trackTitle, videoId, "YouTube", this.artworkUrl, lyricsContent);
-                }
+            String videoId = songVideoIds.get(0);
+            String browseId = getLyricsBrowseId(videoId);
+
+            if (browseId == null) {
+                return null;
             }
+
+            fetchSongContent(videoId);
+            String lyricsContent = fetchLyricsContent(browseId);
+
+            if (lyricsContent != null && !lyricsContent.isBlank()) {
+                return new Lyrics(this.artistName, this.trackTitle, videoId, "YouTube", this.artworkUrl, lyricsContent);
+            }
+
+            return null;
         } catch (Exception e) {
             throw new RuntimeException("Error fetching YouTube lyrics: " + e.getMessage());
         }
-        return null;
     }
 
     private List<String> searchSongVideoIds(String query) throws IOException {