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

Minor clean

Browse Source
This commit is contained in:
Nikolaj Olsson 2019-02-10 12:27:19 +01:00
parent 6b2e699032
commit 69c1bf6a4c
2 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libse/Subtitle.cs
View File

@ -2,7 +2,6 @@
using Nikse.SubtitleEdit.Core.SubtitleFormats;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Text;
@ -677,7 +676,7 @@ namespace Nikse.SubtitleEdit.Core
if (pre != null)
{
hash = hash * 23 + pre.GetHashCode();
}
}
if (Header != null)
{
hash = hash * 23 + Header.Trim().GetHashCode();

63
libse/SubtitleFormats/WebVTT.cs
View File

@ -18,6 +18,34 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
private static readonly Regex RegexTimeCodesMiddle = new Regex(@"^-?\d+:-?\d+\.-?\d+\s*-->\s*-?\d+:-?\d+:-?\d+\.-?\d+", RegexOptions.Compiled);
private static readonly Regex RegexTimeCodesShort = new Regex(@"^-?\d+:-?\d+\.-?\d+\s*-->\s*-?\d+:-?\d+\.-?\d+", RegexOptions.Compiled);
private static readonly Dictionary<string, Color> DefaultColorClasses = new Dictionary<string, Color>
{
{
"white", Color.FromArgb(255, 255, 255)
},
{
"lime", Color.FromArgb(0, 255, 0)
},
{
"cyan", Color.FromArgb(0,255,255)
},
{
"red", Color.FromArgb(255,0,0)
},
{
"yellow", Color.FromArgb(255,255,0)
},
{
"magenta", Color.FromArgb(255,0,255)
},
{
"blue", Color.FromArgb(0,0,255)
},
{
"black", Color.FromArgb(0,0,0)
},
};
public override string Extension => ".vtt";
public override string Name => "WebVTT";
@ -375,14 +403,13 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
private string FindBestColorTagOrDefault(string tag)
{
var knownColors = new List<string> { "white", "lime", "cyan", "red", "yellow", "magenta", "blue", "black" };
{
var tags = tag.Split('.').ToList();
tags.Reverse();
foreach (var s in tags)
{
var l = s.ToLowerInvariant();
if (knownColors.Contains(l))
if (DefaultColorClasses.Keys.Contains(l))
{
return l;
}
@ -471,39 +498,11 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
private static string GetCloseColor(string tag)
{
var dictionary = new Dictionary<string, Color>
{
{
"white", Color.FromArgb(255, 255, 255)
},
{
"lime", Color.FromArgb(0, 255, 0)
},
{
"cyan", Color.FromArgb(0,255,255)
},
{
"red", Color.FromArgb(255,0,0)
},
{
"yellow", Color.FromArgb(255,255,0)
},
{
"magenta", Color.FromArgb(255,0,255)
},
{
"blue", Color.FromArgb(0,0,255)
},
{
"black", Color.FromArgb(0,0,0)
},
};
try
{
var c = ColorTranslator.FromHtml("#" + tag.Trim('#'));
int maxDiff = 25;
foreach (var kvp in dictionary)
foreach (var kvp in DefaultColorClasses)
{
if (Math.Abs(kvp.Value.R - c.R) <= maxDiff &&
Math.Abs(kvp.Value.G - c.G) <= maxDiff &&