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

Minor improvements to ass parser

Browse Source
This commit is contained in:
Bond_009 2020-12-28 15:33:15 +01:00
parent bad516d473
commit d0382db37d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
View File

@ -24,7 +24,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
using (var reader = new StreamReader(stream)) using (var reader = new StreamReader(stream))
{ {
string line; string line;
while (reader.ReadLine() != "[Events]") while (!string.Equals(reader.ReadLine(), "[Events]", StringComparison.Ordinal))
{ {
} }
@ -46,12 +46,13 @@ namespace MediaBrowser.MediaEncoding.Subtitles
var subEvent = new SubtitleTrackEvent { Id = eventIndex.ToString(_usCulture) }; var subEvent = new SubtitleTrackEvent { Id = eventIndex.ToString(_usCulture) };
eventIndex++; eventIndex++;
var sections = line.Substring(10).Split(','); const string Dialogue = "Dialogue: ";
var sections = line.Substring(Dialogue.Length).Split(',');
subEvent.StartPositionTicks = GetTicks(sections[headers["Start"]]); subEvent.StartPositionTicks = GetTicks(sections[headers["Start"]]);
subEvent.EndPositionTicks = GetTicks(sections[headers["End"]]); subEvent.EndPositionTicks = GetTicks(sections[headers["End"]]);
subEvent.Text = string.Join(",", sections.Skip(headers["Text"])); subEvent.Text = string.Join(',', sections[headers["Text"]..]);
RemoteNativeFormatting(subEvent); RemoteNativeFormatting(subEvent);
subEvent.Text = subEvent.Text.Replace("\\n", ParserValues.NewLine, StringComparison.OrdinalIgnoreCase); subEvent.Text = subEvent.Text.Replace("\\n", ParserValues.NewLine, StringComparison.OrdinalIgnoreCase);
@ -62,7 +63,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
} }
} }
trackInfo.TrackEvents = trackEvents.ToArray(); trackInfo.TrackEvents = trackEvents;
return trackInfo; return trackInfo;
} }
@ -72,9 +73,10 @@ namespace MediaBrowser.MediaEncoding.Subtitles
? span.Ticks : 0; ? span.Ticks : 0;
} }
private Dictionary<string, int> ParseFieldHeaders(string line) internal static Dictionary<string, int> ParseFieldHeaders(string line)
{ {
var fields = line.Substring(8).Split(',').Select(x => x.Trim()).ToList(); const string Format = "Format: ";
var fields = line.Substring(Format.Length).Split(',').Select(x => x.Trim()).ToList();
return new Dictionary<string, int> return new Dictionary<string, int>
{ {