alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-10 20:26:17 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fix subtitle unit tests

Browse Source
This commit is contained in:
Luke Pulverenti
2014-08-31 14:28:20 -04:00
parent 6e25c572fa
commit bdc04cda17
9 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
View File

@@ -62,6 +62,7 @@
<Compile Include="Subtitles\ISubtitleParser.cs" />
<Compile Include="Subtitles\ISubtitleWriter.cs" />
<Compile Include="Subtitles\JsonWriter.cs" />
<Compile Include="Subtitles\ParserValues.cs" />
<Compile Include="Subtitles\SrtParser.cs" />
<Compile Include="Subtitles\SrtWriter.cs" />
<Compile Include="Subtitles\AssParser.cs" />

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

@@ -1,4 +1,5 @@
using System;
using MediaBrowser.Common.Extensions;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
@@ -42,6 +43,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
subEvent.StartPositionTicks = GetTicks(sections[headers["Start"]]);
subEvent.EndPositionTicks = GetTicks(sections[headers["End"]]);
subEvent.Text = string.Join(",", sections.Skip(headers["Text"]));
subEvent.Text = subEvent.Text.Replace(@"\N", ParserValues.NewLine, StringComparison.OrdinalIgnoreCase);
subEvent.Text = Regex.Replace(subEvent.Text, @"\{(\\[\w]+\(?([\w\d]+,?)+\)?)+\}", string.Empty, RegexOptions.IgnoreCase);
trackInfo.TrackEvents.Add(subEvent);

13
MediaBrowser.MediaEncoding/Subtitles/ParserValues.cs Normal file
View File

@@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MediaBrowser.MediaEncoding.Subtitles
{
public class ParserValues
{
public const string NewLine = "\r\n";
}
}

4
MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
View File

@@ -4,6 +4,7 @@ using System.Globalization;
using System.IO;
using System.Text.RegularExpressions;
using System.Threading;
using MediaBrowser.Common.Extensions;
namespace MediaBrowser.MediaEncoding.Subtitles
{
@@ -48,7 +49,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
}
multiline.Add(line);
}
subEvent.Text = string.Join(@"\n", multiline);
subEvent.Text = string.Join(ParserValues.NewLine, multiline);
subEvent.Text = subEvent.Text.Replace(@"\N", ParserValues.NewLine, StringComparison.OrdinalIgnoreCase);
subEvent.Text = Regex.Replace(subEvent.Text, @"\{(\\[\w]+\(?([\w\d]+,?)+\)?)+\}", string.Empty, RegexOptions.IgnoreCase);
subEvent.Text = Regex.Replace(subEvent.Text, "<", "&lt;", RegexOptions.IgnoreCase);
subEvent.Text = Regex.Replace(subEvent.Text, ">", "&gt;", RegexOptions.IgnoreCase);

7
MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
View File

@@ -1,4 +1,5 @@
using System;
using MediaBrowser.Common.Extensions;
using System;
using System.IO;
using System.Text;
using System.Threading;
@@ -147,7 +148,9 @@ namespace MediaBrowser.MediaEncoding.Subtitles
public static string GetFormattedText(string text)
{
text = text.Replace("\\n", Environment.NewLine).Replace("\\n", Environment.NewLine);
text = text.Replace("\\n", ParserValues.NewLine, StringComparison.OrdinalIgnoreCase)
.Replace("\\n", ParserValues.NewLine, StringComparison.OrdinalIgnoreCase);
bool italic = false;
for (int i = 0; i < 10; i++) // just look ten times...