fix: prevent crash on missing artist or invalid id

Author: Felitendo

.github/workflows/publish.yaml

@@ -59,5 +59,5 @@ jobs:
           git config user.email team@jellyfin.org
           git pull
           git add ./manifest.json
-          git commit -m "Update manifest.json"
-          git push --force origin master
+          git diff --cached --quiet || git commit -m "Update manifest.json"
+          git push origin master

Jellyfin.Plugin.Lyrics/LyricsProvider.cs

@@ -68,10 +68,11 @@ public async Task<IEnumerable<RemoteLyricInfo>> SearchAsync(
         }
         catch (HttpRequestException ex)
         {
+            var artist = request.ArtistNames is { Count: > 0 } ? request.ArtistNames[0] : null;
             _logger.LogDebug(
                 ex,
                 "Unable to get results for {Artist} - {Album} - {Song}",
-                request.ArtistNames?[0],
+                artist,
                 request.AlbumName,
                 request.SongName);
             return Enumerable.Empty<RemoteLyricInfo>();
@@ -82,6 +83,13 @@ public async Task<IEnumerable<RemoteLyricInfo>> SearchAsync(
     public async Task<LyricResponse?> GetLyricsAsync(string id, CancellationToken cancellationToken)
     {
         var splitId = id.Split('_', 2);
+        if (splitId.Length != 2
+            || string.IsNullOrWhiteSpace(splitId[0])
+            || !IsSupportedLyricSuffix(splitId[1]))
+        {
+            _logger.LogDebug("Invalid lyric id format: {Id}", id);
+            throw new ResourceNotFoundException($"Unable to get results for id {id}");
+        }
 
         try
         {
@@ -95,7 +103,7 @@ public async Task<IEnumerable<RemoteLyricInfo>> SearchAsync(
                 .ConfigureAwait(false);
             if (response is null)
             {
-                throw new ResourceNotFoundException("Unable to get results for id {Id}");
+                throw new ResourceNotFoundException($"Unable to get results for id {id}");
             }
 
             if (string.Equals(splitId[1], SyncedSuffix, StringComparison.OrdinalIgnoreCase)
@@ -120,18 +128,24 @@ public async Task<IEnumerable<RemoteLyricInfo>> SearchAsync(
                 };
             }
 
-            throw new ResourceNotFoundException("Unable to get results for id {Id}");
+            throw new ResourceNotFoundException($"Unable to get results for id {id}");
         }
         catch (HttpRequestException ex)
         {
             _logger.LogDebug(
                 ex,
                 "Unable to get results for id {Id}",
                 id);
-            throw new ResourceNotFoundException("Unable to get results for id {Id}");
+            throw new ResourceNotFoundException($"Unable to get results for id {id}");
         }
     }
 
+    private static bool IsSupportedLyricSuffix(string suffix)
+    {
+        return string.Equals(suffix, SyncedSuffix, StringComparison.OrdinalIgnoreCase)
+            || string.Equals(suffix, PlainSuffix, StringComparison.OrdinalIgnoreCase);
+    }
+
     private async Task<IEnumerable<RemoteLyricInfo>> GetExactMatch(
         LyricSearchRequest request,
         CancellationToken cancellationToken)
@@ -319,4 +333,4 @@ private List<RemoteLyricInfo> GetRemoteLyrics(LyricsSearchResponse response)
 
         return results;
     }
-}
+}

README.md

@@ -23,13 +23,13 @@ Looking for **v10.10.7 support**? -> https://github.com/Felitendo/jellyfin-plugi
    ```
    https://raw.githubusercontent.com/Felitendo/jellyfin-plugin-lyrics/master/manifest.json
    ```
-4. Open the **Plugin Catalog** in your Jellyfin dashboard  
-5. Look for **"Lyrics"** under the **Metadata** category and install it
-6. Restart Jellyfin
-7. Search for the Plugin "LrcLib" (is sometimes pre-installed) and uninstall it (if it's not installed then skip this step)
-8. Restart Jellyfin again
-9. Go to **Scheduled Tasks** and run **"Download and upgrade lyrics (new)"**
-10. Go to **Libraries** and click on **Scan all Libraries**
+3. Open the **Plugin Catalog** in your Jellyfin dashboard  
+4. Look for **"Lyrics"** under the **Metadata** category and install it
+5. Restart Jellyfin
+6. Search for the Plugin "LrcLib" (is sometimes pre-installed) and uninstall it (if it's not installed then skip this step)
+7. Restart Jellyfin again
+8. Go to **Scheduled Tasks** and run **"Download and upgrade lyrics (new)"**
+9. Go to **Libraries** and click on **Scan all Libraries**
 
 ---