alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-27 18:10:54 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Use Directory GetFiles to find lyric files

Browse Source
This commit is contained in:
1hitsong
2022-09-20 08:36:43 -04:00
parent b442c79e62
commit 6f0d33b1ca
5 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@ public class LrcLyricProvider : ILyricProvider
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 string[] _acceptedTimeFormats = { "HH:mm:ss", "H:mm:ss", "mm:ss", "m:ss" };
/// <summary>
/// Initializes a new instance of the <see cref="LrcLyricProvider"/> class.
@@ -51,14 +51,14 @@ public class LrcLyricProvider : ILyricProvider
/// <returns>If provider can determine lyrics, returns a <see cref="LyricResponse"/> with or without metadata; otherwise, null.</returns>
public LyricResponse? GetLyrics(BaseItem item)
{
string? lyricFilePath = LyricInfo.GetLyricFilePath(this, item.Path);
string? lyricFilePath = this.GetLyricFilePath(item.Path);
if (string.IsNullOrEmpty(lyricFilePath))
{
return null;
}
IDictionary<string, string> fileMetaData = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
var fileMetaData = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
string lrcFileContent = System.IO.File.ReadAllText(lyricFilePath);
Song lyricData;
@@ -90,6 +90,10 @@ public class LrcLyricProvider : ILyricProvider
}
string[] metaDataField = metaDataRow.Split(':', 2, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
// Remove square bracket before field name, and after field value
// Example 1: [au: 1hitsong]
// Example 2: [ar: Calabrese]
string metaDataFieldName = metaDataField[0][1..];
string metaDataFieldValue = metaDataField[1][..^1];
@@ -162,7 +166,7 @@ public class LrcLyricProvider : ILyricProvider
if (metaData.TryGetValue("length", out var length) && !string.IsNullOrEmpty(length))
{
if (DateTime.TryParseExact(length, _acceptedTimeFormats.ToArray(), null, DateTimeStyles.None, out var value))
if (DateTime.TryParseExact(length, _acceptedTimeFormats, null, DateTimeStyles.None, out var value))
{
lyricMetadata.Length = value.TimeOfDay.Ticks;
}

2
MediaBrowser.Providers/Lyric/LyricManager.cs
View File

@@ -46,7 +46,7 @@ public class LyricManager : ILyricManager
continue;
}
if (LyricInfo.GetLyricFilePath(provider, item.Path) is not null)
if (provider.GetLyricFilePath(item.Path) is not null)
{
return true;
}

2
MediaBrowser.Providers/Lyric/TxtLyricProvider.cs
View File

@@ -29,7 +29,7 @@ public class TxtLyricProvider : ILyricProvider
/// <returns>If provider can determine lyrics, returns a <see cref="LyricResponse"/>; otherwise, null.</returns>
public LyricResponse? GetLyrics(BaseItem item)
{
string? lyricFilePath = LyricInfo.GetLyricFilePath(this, item.Path);
string? lyricFilePath = this.GetLyricFilePath(item.Path);
if (string.IsNullOrEmpty(lyricFilePath))
{