From bdc04cda174da26631e6f9ec90f7dccf9efda941 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 31 Aug 2014 14:28:20 -0400
Subject: fix subtitle unit tests

---
 .../MediaBrowser.MediaEncoding.csproj                       |  1 +
 MediaBrowser.MediaEncoding/Subtitles/AssParser.cs           |  4 +++-
 MediaBrowser.MediaEncoding/Subtitles/ParserValues.cs        | 13 +++++++++++++
 MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs           |  4 +++-
 MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs           |  7 +++++--
 5 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 MediaBrowser.MediaEncoding/Subtitles/ParserValues.cs

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
index 9263a3187..22873d910 100644
--- a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
+++ b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
@@ -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" />
diff --git a/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs b/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
index e5a727428..aaaafc226 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
@@ -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);
diff --git a/MediaBrowser.MediaEncoding/Subtitles/ParserValues.cs b/MediaBrowser.MediaEncoding/Subtitles/ParserValues.cs
new file mode 100644
index 000000000..d79aeee76
--- /dev/null
+++ b/MediaBrowser.MediaEncoding/Subtitles/ParserValues.cs
@@ -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";
+    }
+}
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs b/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
index 84cd1eb2d..ea565f70a 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
@@ -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);
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs b/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
index 559a05bc8..d82ef4e24 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
@@ -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...
-- 
cgit v1.2.3