updated nuget
This commit is contained in:
parent
464570e34a
commit
aac044f18f
|
@ -49,6 +49,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
|
||||||
trackInfo.TrackEvents.Add(subEvent);
|
trackInfo.TrackEvents.Add(subEvent);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
RemoteNativeFormatting(trackInfo);
|
||||||
return trackInfo;
|
return trackInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -69,5 +70,50 @@ namespace MediaBrowser.MediaEncoding.Subtitles
|
||||||
};
|
};
|
||||||
return result;
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1479,6 +1479,12 @@ namespace MediaBrowser.Model.ApiClient
|
||||||
/// <returns>Task<SyncOptions>.</returns>
|
/// <returns>Task<SyncOptions>.</returns>
|
||||||
Task<SyncDialogOptions> GetSyncOptions(SyncJobRequest jobInfo);
|
Task<SyncDialogOptions> GetSyncOptions(SyncJobRequest jobInfo);
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
/// Gets the synchronize options.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="jobInfo">The job information.</param>
|
||||||
|
/// <returns>Task<SyncDialogOptions>.</returns>
|
||||||
|
Task<SyncDialogOptions> GetSyncOptions(SyncJob jobInfo);
|
||||||
|
/// <summary>
|
||||||
/// Gets the movie recommendations.
|
/// Gets the movie recommendations.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="query">The query.</param>
|
/// <param name="query">The query.</param>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
|
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
|
||||||
<metadata>
|
<metadata>
|
||||||
<id>MediaBrowser.Common.Internal</id>
|
<id>MediaBrowser.Common.Internal</id>
|
||||||
<version>3.0.590</version>
|
<version>3.0.591</version>
|
||||||
<title>MediaBrowser.Common.Internal</title>
|
<title>MediaBrowser.Common.Internal</title>
|
||||||
<authors>Luke</authors>
|
<authors>Luke</authors>
|
||||||
<owners>ebr,Luke,scottisafool</owners>
|
<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>
|
<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>
|
<copyright>Copyright © Media Browser 2013</copyright>
|
||||||
<dependencies>
|
<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="NLog" version="3.2.0.0" />
|
||||||
<dependency id="SimpleInjector" version="2.7.0" />
|
<dependency id="SimpleInjector" version="2.7.0" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
|
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
|
||||||
<metadata>
|
<metadata>
|
||||||
<id>MediaBrowser.Common</id>
|
<id>MediaBrowser.Common</id>
|
||||||
<version>3.0.590</version>
|
<version>3.0.591</version>
|
||||||
<title>MediaBrowser.Common</title>
|
<title>MediaBrowser.Common</title>
|
||||||
<authors>Media Browser Team</authors>
|
<authors>Media Browser Team</authors>
|
||||||
<owners>ebr,Luke,scottisafool</owners>
|
<owners>ebr,Luke,scottisafool</owners>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
|
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
|
||||||
<metadata>
|
<metadata>
|
||||||
<id>MediaBrowser.Model.Signed</id>
|
<id>MediaBrowser.Model.Signed</id>
|
||||||
<version>3.0.590</version>
|
<version>3.0.591</version>
|
||||||
<title>MediaBrowser.Model - Signed Edition</title>
|
<title>MediaBrowser.Model - Signed Edition</title>
|
||||||
<authors>Media Browser Team</authors>
|
<authors>Media Browser Team</authors>
|
||||||
<owners>ebr,Luke,scottisafool</owners>
|
<owners>ebr,Luke,scottisafool</owners>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
||||||
<metadata>
|
<metadata>
|
||||||
<id>MediaBrowser.Server.Core</id>
|
<id>MediaBrowser.Server.Core</id>
|
||||||
<version>3.0.590</version>
|
<version>3.0.591</version>
|
||||||
<title>Media Browser.Server.Core</title>
|
<title>Media Browser.Server.Core</title>
|
||||||
<authors>Media Browser Team</authors>
|
<authors>Media Browser Team</authors>
|
||||||
<owners>ebr,Luke,scottisafool</owners>
|
<owners>ebr,Luke,scottisafool</owners>
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
<description>Contains core components required to build plugins for Media Browser Server.</description>
|
<description>Contains core components required to build plugins for Media Browser Server.</description>
|
||||||
<copyright>Copyright © Media Browser 2013</copyright>
|
<copyright>Copyright © Media Browser 2013</copyright>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency id="MediaBrowser.Common" version="3.0.590" />
|
<dependency id="MediaBrowser.Common" version="3.0.591" />
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</metadata>
|
</metadata>
|
||||||
<files>
|
<files>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user