Merge pull request #1043 from MediaBrowser/dev

3.0.5557.0

2 files changed, 49 insertions, 3 deletions

diff --git a/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs b/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
index f289449452..2a8c958b25 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
@@ -49,6 +49,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                     trackInfo.TrackEvents.Add(subEvent);
                 }
             }
+            RemoteNativeFormatting(trackInfo);
             return trackInfo;
         }
 
@@ -69,5 +70,50 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                                                      };
             return result;
         }
+
+        /// <summary>
+        /// Credit: https://github.com/SubtitleEdit/subtitleedit/blob/master/src/Logic/SubtitleFormats/AdvancedSubStationAlpha.cs
+        /// </summary>
+        private void RemoteNativeFormatting(SubtitleTrackInfo subtitle)
+        {
+            foreach (var p in subtitle.TrackEvents)
+            {
+                int indexOfBegin = p.Text.IndexOf('{');
+                string pre = string.Empty;
+                while (indexOfBegin >= 0 && p.Text.IndexOf('}') > indexOfBegin)
+                {
+                    string s = p.Text.Substring(indexOfBegin);
+                    if (s.StartsWith("{\\an1}", StringComparison.Ordinal) ||
+                        s.StartsWith("{\\an2}", StringComparison.Ordinal) ||
+                        s.StartsWith("{\\an3}", StringComparison.Ordinal) ||
+                        s.StartsWith("{\\an4}", StringComparison.Ordinal) ||
+                        s.StartsWith("{\\an5}", StringComparison.Ordinal) ||
+                        s.StartsWith("{\\an6}", StringComparison.Ordinal) ||
+                        s.StartsWith("{\\an7}", StringComparison.Ordinal) ||
+                        s.StartsWith("{\\an8}", StringComparison.Ordinal) ||
+                        s.StartsWith("{\\an9}", StringComparison.Ordinal))
+                    {
+                        pre = s.Substring(0, 6);
+                    }
+                    else if (s.StartsWith("{\\an1\\", StringComparison.Ordinal) ||
+                        s.StartsWith("{\\an2\\", StringComparison.Ordinal) ||
+                        s.StartsWith("{\\an3\\", StringComparison.Ordinal) ||
+                        s.StartsWith("{\\an4\\", StringComparison.Ordinal) ||
+                        s.StartsWith("{\\an5\\", StringComparison.Ordinal) ||
+                        s.StartsWith("{\\an6\\", StringComparison.Ordinal) ||
+                        s.StartsWith("{\\an7\\", StringComparison.Ordinal) ||
+                        s.StartsWith("{\\an8\\", StringComparison.Ordinal) ||
+                        s.StartsWith("{\\an9\\", StringComparison.Ordinal))
+                    {
+                        pre = s.Substring(0, 5) + "}";
+                    }
+                    int indexOfEnd = p.Text.IndexOf('}');
+                    p.Text = p.Text.Remove(indexOfBegin, (indexOfEnd - indexOfBegin) + 1);
+
+                    indexOfBegin = p.Text.IndexOf('{');
+                }
+                p.Text = pre + p.Text;
+            }
+        }
     }
 }
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index b9cad27e0d..7d74c51bad 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -773,7 +773,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         {
             try
             {
-                using (var file = new FileStream(path, FileMode.Open))
+                using (var file = _fileSystem.GetFileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
                 {
                     var detector = new CharsetDetector();
                     detector.Feed(file);
@@ -797,12 +797,12 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             return null;
         }
 
-        private static Encoding GetFileEncoding(string srcFile)
+        private Encoding GetFileEncoding(string srcFile)
         {
             // *** Detect byte order mark if any - otherwise assume default
             var buffer = new byte[5];
 
-            using (var file = new FileStream(srcFile, FileMode.Open))
+            using (var file = _fileSystem.GetFileStream(srcFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
             {
                 file.Read(buffer, 0, 5);
             }