Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-23 03:33:18 +01:00
Code Issues Projects Releases Wiki Activity

Minor refactor - fix #2508 - thx ivandrofly :)

Browse Source
This commit is contained in:
Nikolaj Olsson 2017-08-07 19:32:38 +02:00
parent c02f3287ab
commit 720adee908
2 changed files with 8 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libse/SubtitleFormats/DCSubtitle.cs
View File

@ -670,30 +670,22 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
subtitle.Renumber();
}
private static string GetColorStringFromDCinema(string s)
internal static string GetColorStringFromDCinema(string s)
{
if (string.IsNullOrWhiteSpace(s))
{
return s;
}
if (s[0] == '#')
{
s = s.Substring(1);
}
var chars = new char[s.Length];
var hex = s.TrimStart('#');
for (int i = s.Length - 1; i >= 0; i--)
{
char ch = s[i];
if (CharUtils.IsHexadecimal(ch))
{
chars[i] = ch;
}
else
if (!CharUtils.IsHexadecimal(s[i]))
{
return s;
}
}
return "#" + new string(chars);
return "#" + hex;
}
private static TimeCode GetTimeCode(string s)

34
libse/SubtitleFormats/DCinemaSmpte2010.cs
View File

@ -654,16 +654,16 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
innerInnerNode.Attributes["Italic"].InnerText.Equals("yes", StringComparison.OrdinalIgnoreCase))
{
if (innerInnerNode.Attributes["Color"] != null)
pText.Append("<i><font color=\"" + GetColorStringFromDCinema(innerInnerNode.Attributes["Color"].Value) + "\">" + innerInnerNode.InnerText + "</font><i>");
pText.Append("<i><font color=\"" + DCSubtitle.GetColorStringFromDCinema(innerInnerNode.Attributes["Color"].Value) + "\">" + innerInnerNode.InnerText + "</font><i>");
else
pText.Append("<i>" + innerInnerNode.InnerText + "</i>");
}
else if (innerInnerNode.Name == "Font" && innerInnerNode.Attributes["Color"] != null)
{
if (innerInnerNode.Attributes["Italic"] != null && innerInnerNode.Attributes["Italic"].InnerText.Equals("yes", StringComparison.OrdinalIgnoreCase))
pText.Append("<i><font color=\"" + GetColorStringFromDCinema(innerInnerNode.Attributes["Color"].Value) + "\">" + innerInnerNode.InnerText + "</font><i>");
pText.Append("<i><font color=\"" + DCSubtitle.GetColorStringFromDCinema(innerInnerNode.Attributes["Color"].Value) + "\">" + innerInnerNode.InnerText + "</font><i>");
else
pText.Append("<font color=\"" + GetColorStringFromDCinema(innerInnerNode.Attributes["Color"].Value) + "\">" + innerInnerNode.InnerText + "</font>");
pText.Append("<font color=\"" + DCSubtitle.GetColorStringFromDCinema(innerInnerNode.Attributes["Color"].Value) + "\">" + innerInnerNode.InnerText + "</font>");
}
else
{
@ -706,34 +706,6 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
subtitle.Renumber();
}
private static string GetColorStringFromDCinema(string p)
{
string s = p.ToLower().Trim();
if (s.Replace("#", string.Empty).
Replace("0", string.Empty).
Replace("1", string.Empty).
Replace("2", string.Empty).
Replace("3", string.Empty).
Replace("4", string.Empty).
Replace("5", string.Empty).
Replace("6", string.Empty).
Replace("7", string.Empty).
Replace("8", string.Empty).
Replace("9", string.Empty).
Replace("a", string.Empty).
Replace("b", string.Empty).
Replace("c", string.Empty).
Replace("d", string.Empty).
Replace("e", string.Empty).
Replace("f", string.Empty).Length == 0)
{
if (s.StartsWith('#'))
return s;
return "#" + s;
}
return p;
}
private TimeCode GetTimeCode(string s)
{
var parts = s.Split(new[] { ':', '.', ',' });