From aac044f18f11009fc4911b509f4d6dd4c0d56f56 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 18 Mar 2015 17:09:48 -0400
Subject: [PATCH] updated nuget

---
 .../Subtitles/AssParser.cs                    | 46 +++++++++++++++++++
 MediaBrowser.Model/ApiClient/IApiClient.cs    |  6 +++
 Nuget/MediaBrowser.Common.Internal.nuspec     |  4 +-
 Nuget/MediaBrowser.Common.nuspec              |  2 +-
 Nuget/MediaBrowser.Model.Signed.nuspec        |  2 +-
 Nuget/MediaBrowser.Server.Core.nuspec         |  4 +-
 6 files changed, 58 insertions(+), 6 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.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index c32155a335..ef99e444f5 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -1479,6 +1479,12 @@ namespace MediaBrowser.Model.ApiClient
         /// <returns>Task&lt;SyncOptions&gt;.</returns>
         Task<SyncDialogOptions> GetSyncOptions(SyncJobRequest jobInfo);
         /// <summary>
+        /// Gets the synchronize options.
+        /// </summary>
+        /// <param name="jobInfo">The job information.</param>
+        /// <returns>Task&lt;SyncDialogOptions&gt;.</returns>
+        Task<SyncDialogOptions> GetSyncOptions(SyncJob jobInfo);
+        /// <summary>
         /// Gets the movie recommendations.
         /// </summary>
         /// <param name="query">The query.</param>
diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec
index b8eade1092..5941a2a15f 100644
--- a/Nuget/MediaBrowser.Common.Internal.nuspec
+++ b/Nuget/MediaBrowser.Common.Internal.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common.Internal</id>
-        <version>3.0.590</version>
+        <version>3.0.591</version>
         <title>MediaBrowser.Common.Internal</title>
         <authors>Luke</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.590" />
+            <dependency id="MediaBrowser.Common" version="3.0.591" />
             <dependency id="NLog" version="3.2.0.0" />
             <dependency id="SimpleInjector" version="2.7.0" />
         </dependencies>
diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec
index 2185c2c044..dd0e8602d1 100644
--- a/Nuget/MediaBrowser.Common.nuspec
+++ b/Nuget/MediaBrowser.Common.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>3.0.590</version>
+        <version>3.0.591</version>
         <title>MediaBrowser.Common</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
diff --git a/Nuget/MediaBrowser.Model.Signed.nuspec b/Nuget/MediaBrowser.Model.Signed.nuspec
index 9b9996bafb..2e09e01fd2 100644
--- a/Nuget/MediaBrowser.Model.Signed.nuspec
+++ b/Nuget/MediaBrowser.Model.Signed.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Model.Signed</id>
-        <version>3.0.590</version>
+        <version>3.0.591</version>
         <title>MediaBrowser.Model - Signed Edition</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec
index ad2e38ab21..ce2248e09a 100644
--- a/Nuget/MediaBrowser.Server.Core.nuspec
+++ b/Nuget/MediaBrowser.Server.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Server.Core</id>
-        <version>3.0.590</version>
+        <version>3.0.591</version>
         <title>Media Browser.Server.Core</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains core components required to build plugins for Media Browser Server.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.590" />
+            <dependency id="MediaBrowser.Common" version="3.0.591" />
         </dependencies>
     </metadata>
     <files>