lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Var type refinements

Browse Source
This commit is contained in:
1hitsong 2022-09-17 10:42:48 -04:00
parent 823e2ec029
commit 7d886116fd
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Controller/Lyrics/Lyric.cs
View File

@ -8,7 +8,7 @@ namespace MediaBrowser.Controller.Lyrics
/// <summary>
/// Gets or sets the start time in ticks.
/// </summary>
public double? Start { get; set; }
public long? Start { get; set; }
/// <summary>
/// Gets or sets the text.

4
MediaBrowser.Controller/Lyrics/LyricResponse.cs
View File

@ -10,9 +10,9 @@ namespace MediaBrowser.Controller.Lyrics
public class LyricResponse
{
/// <summary>
/// Gets or sets MetaData.
/// Gets or sets Metadata.
/// </summary>
public IDictionary<string, object> MetaData { get; set; }
public IDictionary<string, string> Metadata { get; set; }
/// <summary>
/// Gets or sets Lyrics.

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

@ -8,6 +8,7 @@ using LrcParser.Model;
using LrcParser.Parser;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Lyrics;
using Swashbuckle.AspNetCore.SwaggerGen;
namespace MediaBrowser.Providers.Lyric
{
@ -56,7 +57,7 @@ namespace MediaBrowser.Providers.Lyric
List<Controller.Lyrics.Lyric> lyricList = new List<Controller.Lyrics.Lyric>();
List<LrcParser.Model.Lyric> sortedLyricData = new List<LrcParser.Model.Lyric>();
var metaData = new ExpandoObject() as IDictionary<string, object>;
IDictionary<string, string> metaData = new Dictionary<string, string>();
string lrcFileContent = System.IO.File.ReadAllText(lyricFilePath);
try
@ -77,8 +78,8 @@ namespace MediaBrowser.Providers.Lyric
{
var metaDataField = metaDataRow.Split(":");
string metaDataFieldName = metaDataField[0].Replace("[", string.Empty, StringComparison.Ordinal);
string metaDataFieldValue = metaDataField[1].Replace("]", string.Empty, StringComparison.Ordinal);
string metaDataFieldName = metaDataField[0].Replace("[", string.Empty, StringComparison.Ordinal).Trim();
string metaDataFieldValue = metaDataField[1].Replace("]", string.Empty, StringComparison.Ordinal).Trim();
metaData.Add(metaDataFieldName, metaDataFieldValue);
}
@ -96,13 +97,13 @@ namespace MediaBrowser.Providers.Lyric
for (int i = 0; i < sortedLyricData.Count; i++)
{
var timeData = sortedLyricData[i].TimeTags.ToArray()[0].Value;
double ticks = Convert.ToDouble(timeData, new NumberFormatInfo()) * 10000;
lyricList.Add(new Controller.Lyrics.Lyric { Start = Math.Ceiling(ticks), Text = sortedLyricData[i].Text });
long ticks = Convert.ToInt64(timeData, new NumberFormatInfo()) * 10000;
lyricList.Add(new Controller.Lyrics.Lyric { Start = ticks, Text = sortedLyricData[i].Text });
}
if (metaData.Any())
{
return new LyricResponse { MetaData = metaData, Lyrics = lyricList };
return new LyricResponse { Metadata = metaData, Lyrics = lyricList };
}
return new LyricResponse { Lyrics = lyricList };