From ea7e834ae18d31b453d1163ab7f43cb8df6fa4b0 Mon Sep 17 00:00:00 2001 From: gnattu Date: Mon, 24 Jun 2024 20:29:05 -0400 Subject: [PATCH] Backport pull request #12126 from jellyfin/release-10.9.z Try to add extracted lyrics during scanning Original-merge: 25f02658f08c484338d4288e048a6e71dfb39d96 Merged-by: Bond-009 Backported-by: Joshua M. Boniface --- MediaBrowser.Providers/MediaInfo/AudioFileProber.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/MediaBrowser.Providers/MediaInfo/AudioFileProber.cs b/MediaBrowser.Providers/MediaInfo/AudioFileProber.cs index 7ffe2f32a4..9eacfc2b68 100644 --- a/MediaBrowser.Providers/MediaInfo/AudioFileProber.cs +++ b/MediaBrowser.Providers/MediaInfo/AudioFileProber.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using Jellyfin.Data.Enums; +using Jellyfin.Extensions; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Library; @@ -136,6 +137,10 @@ namespace MediaBrowser.Providers.MediaInfo if (!audio.IsLocked) { await FetchDataFromTags(audio, mediaInfo, options, tryExtractEmbeddedLyrics).ConfigureAwait(false); + if (tryExtractEmbeddedLyrics) + { + AddExternalLyrics(audio, mediaStreams, options); + } } audio.HasLyrics = mediaStreams.Any(s => s.Type == MediaStreamType.Lyric); @@ -369,7 +374,10 @@ namespace MediaBrowser.Providers.MediaInfo var externalLyricFiles = _lyricResolver.GetExternalStreams(audio, startIndex, options.DirectoryService, false); audio.LyricFiles = externalLyricFiles.Select(i => i.Path).Distinct().ToArray(); - currentStreams.AddRange(externalLyricFiles); + if (externalLyricFiles.Count > 0) + { + currentStreams.Add(externalLyricFiles[0]); + } } } }