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

Variable declaration cleanup

Browse Source
This commit is contained in:
1hitsong 2022-09-19 16:26:38 -04:00
parent 28d017865b
commit d7fedf3512
2 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,6 @@ using LrcParser.Parser;
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Lyrics; using MediaBrowser.Controller.Lyrics;
using MediaBrowser.Controller.Resolvers; using MediaBrowser.Controller.Resolvers;
using MediaBrowser.Model.Entities;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace MediaBrowser.Providers.Lyric; namespace MediaBrowser.Providers.Lyric;
@ -54,49 +53,45 @@ public class LrcLyricProvider : ILyricProvider
return null; return null;
} }
List<LyricLine> lyricList = new();
List<LrcParser.Model.Lyric> sortedLyricData = new();
IDictionary<string, string> fileMetaData = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); IDictionary<string, string> fileMetaData = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
string lrcFileContent = System.IO.File.ReadAllText(lyricFilePath); string lrcFileContent = System.IO.File.ReadAllText(lyricFilePath);
Song lyricData;
try try
{ {
// Parse and sort lyric rows // Parse and sort lyric rows
LyricParser lrcLyricParser = new LrcParser.Parser.Lrc.LrcParser(); LyricParser lrcLyricParser = new LrcParser.Parser.Lrc.LrcParser();
Song lyricData = lrcLyricParser.Decode(lrcFileContent); lyricData = lrcLyricParser.Decode(lrcFileContent);
sortedLyricData = lyricData.Lyrics.Where(x => x.TimeTags.Count > 0).OrderBy(x => x.TimeTags.First().Value).ToList();
// Parse metadata rows
var metaDataRows = lyricData.Lyrics
.Where(x => x.TimeTags.Count == 0)
.Where(x => x.Text.StartsWith('[') && x.Text.EndsWith(']'))
.Select(x => x.Text)
.ToList();
foreach (string metaDataRow in metaDataRows)
{
int colonCount = metaDataRow.Count(f => (f == ':'));
if (colonCount == 0)
{
continue;
}
string[] metaDataField;
string metaDataFieldName;
string metaDataFieldValue;
string[] test;
metaDataField = metaDataRow.Split(':', 2, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
metaDataFieldName = metaDataField[0][1..].Trim();
metaDataFieldValue = metaDataField[1][..^1].Trim();
fileMetaData.Add(metaDataFieldName, metaDataFieldValue);
}
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Error parsing lyric data from {Provider}", Name); _logger.LogError(ex, "Error parsing lyric data from {Provider}", Name);
return null;
}
List<LrcParser.Model.Lyric> sortedLyricData = lyricData.Lyrics.Where(x => x.TimeTags.Count > 0).OrderBy(x => x.TimeTags.First().Value).ToList();
// Parse metadata rows
var metaDataRows = lyricData.Lyrics
.Where(x => x.TimeTags.Count == 0)
.Where(x => x.Text.StartsWith('[') && x.Text.EndsWith(']'))
.Select(x => x.Text)
.ToList();
foreach (string metaDataRow in metaDataRows)
{
int colonCount = metaDataRow.Count(f => (f == ':'));
if (colonCount == 0)
{
continue;
}
string[] metaDataField = metaDataRow.Split(':', 2, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
string metaDataFieldName = metaDataField[0][1..].Trim();
string metaDataFieldValue = metaDataField[1][..^1].Trim();
fileMetaData.Add(metaDataFieldName, metaDataFieldValue);
} }
if (sortedLyricData.Count == 0) if (sortedLyricData.Count == 0)
@ -104,6 +99,8 @@ public class LrcLyricProvider : ILyricProvider
return null; return null;
} }
List<LyricLine> lyricList = new();
for (int i = 0; i < sortedLyricData.Count; i++) for (int i = 0; i < sortedLyricData.Count; i++)
{ {
var timeData = sortedLyricData[i].TimeTags.First().Value; var timeData = sortedLyricData[i].TimeTags.First().Value;
@ -132,7 +129,7 @@ public class LrcLyricProvider : ILyricProvider
/// </summary> /// </summary>
/// <param name="metaData">The metadata from the LRC file.</param> /// <param name="metaData">The metadata from the LRC file.</param>
/// <returns>A lyricMetadata object with mapped property data.</returns> /// <returns>A lyricMetadata object with mapped property data.</returns>
private LyricMetadata MapMetadataValues(IDictionary<string, string> metaData) private static LyricMetadata MapMetadataValues(IDictionary<string, string> metaData)
{ {
LyricMetadata lyricMetadata = new(); LyricMetadata lyricMetadata = new();

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

@ -38,13 +38,13 @@ public class TxtLyricProvider : ILyricProvider
string[] lyricTextLines = System.IO.File.ReadAllLines(lyricFilePath); string[] lyricTextLines = System.IO.File.ReadAllLines(lyricFilePath);
List<LyricLine> lyricList = new();
if (lyricTextLines.Length == 0) if (lyricTextLines.Length == 0)
{ {
return null; return null;
} }
List<LyricLine> lyricList = new(lyricTextLines.Length);
foreach (string lyricTextLine in lyricTextLines) foreach (string lyricTextLine in lyricTextLines)
{ {
lyricList.Add(new LyricLine(lyricTextLine)); lyricList.Add(new LyricLine(lyricTextLine));