Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make LyricParser a field

Browse Source
This commit is contained in:
1hitsong 2022-09-19 20:24:05 -04:00
parent 3ba8218e45
commit b442c79e62
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
MediaBrowser.Providers/Lyric/LrcLyricProvider.cs
View File

@ -18,6 +18,8 @@ public class LrcLyricProvider : ILyricProvider
{ {
private readonly ILogger<LrcLyricProvider> _logger; private readonly ILogger<LrcLyricProvider> _logger;
private readonly LyricParser _lrcLyricParser;
private static readonly IReadOnlyList<string> _acceptedTimeFormats = new string[] { "HH:mm:ss", "H:mm:ss", "mm:ss", "m:ss" }; private static readonly IReadOnlyList<string> _acceptedTimeFormats = new string[] { "HH:mm:ss", "H:mm:ss", "mm:ss", "m:ss" };
/// <summary> /// <summary>
@ -27,6 +29,7 @@ public class LrcLyricProvider : ILyricProvider
public LrcLyricProvider(ILogger<LrcLyricProvider> logger) public LrcLyricProvider(ILogger<LrcLyricProvider> logger)
{ {
_logger = logger; _logger = logger;
_lrcLyricParser = new LrcParser.Parser.Lrc.LrcParser();
} }
/// <inheritdoc /> /// <inheritdoc />
@ -62,13 +65,11 @@ public class LrcLyricProvider : ILyricProvider
try try
{ {
// Parse and sort lyric rows lyricData = _lrcLyricParser.Decode(lrcFileContent);
LyricParser lrcLyricParser = new LrcParser.Parser.Lrc.LrcParser();
lyricData = lrcLyricParser.Decode(lrcFileContent);
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Error parsing lyric data from {Provider}", Name); _logger.LogError(ex, "Error parsing lyric file {LyricFilePath} from {Provider}", lyricFilePath, Name);
return null; return null;
} }
@ -92,7 +93,12 @@ public class LrcLyricProvider : ILyricProvider
string metaDataFieldName = metaDataField[0][1..]; string metaDataFieldName = metaDataField[0][1..];
string metaDataFieldValue = metaDataField[1][..^1]; string metaDataFieldValue = metaDataField[1][..^1];
fileMetaData.Add(metaDataFieldName, metaDataFieldValue); if (string.IsNullOrEmpty(metaDataFieldName) || string.IsNullOrEmpty(metaDataFieldValue))
{
continue;
}
fileMetaData[metaDataFieldName] = metaDataFieldValue;
} }
if (sortedLyricData.Count == 0) if (sortedLyricData.Count == 0)