Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-27 14:32:35 +01:00
Code Issues Projects Releases Wiki Activity

Minor refactor

Browse Source
This commit is contained in:
Nikolaj Olsson 2020-04-15 13:03:48 +02:00
parent 33514e2f0e
commit afef6d0623
2 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libse/DialogSplitMerge.cs
View File

@ -1,5 +1,5 @@
using System;
using Nikse.SubtitleEdit.Core.Enums;
using Nikse.SubtitleEdit.Core.Enums;
using System;
using System.Collections.Generic;
using System.Text;
@ -319,7 +319,7 @@ namespace Nikse.SubtitleEdit.Core
return DialogType.DashBothLinesWithSpace;
}
}
private static string GetStartTags(string input)
{
var pre = new StringBuilder();
@ -350,12 +350,9 @@ namespace Nikse.SubtitleEdit.Core
var l0 = HtmlUtil.RemoveHtmlTags(lines[0]);
var l1 = HtmlUtil.RemoveHtmlTags(lines[1], true);
if (lines.Count == 2)
if (lines.Count == 2 && (l0.HasSentenceEnding() || AllowDialogWithNoSentenceEnding) && (l1.TrimStart().StartsWith(GetDashChar()) || l1.TrimStart().StartsWith(GetAlternateDashChar())))
{
if ((l0.HasSentenceEnding() || AllowDialogWithNoSentenceEnding) && (l1.TrimStart().StartsWith(GetDashChar()) || l1.TrimStart().StartsWith(GetAlternateDashChar())))
{
return true;
}
return true;
}
if (lines.Count == 3)
@ -392,28 +389,18 @@ namespace Nikse.SubtitleEdit.Core
private static bool IsDialogThreeLinesOneTwo(string l0, string l1, string l2)
{
if (l0.HasSentenceEnding() &&
(l1.TrimStart().StartsWith(GetDashChar()) || l1.TrimStart().StartsWith(GetAlternateDashChar())) &&
!l1.HasSentenceEnding() &&
!(l2.TrimStart().StartsWith(GetDashChar()) || l2.TrimStart().StartsWith(GetAlternateDashChar())))
{
return true;
}
return false;
return l0.HasSentenceEnding() &&
(l1.TrimStart().StartsWith(GetDashChar()) || l1.TrimStart().StartsWith(GetAlternateDashChar())) &&
!l1.HasSentenceEnding() &&
!(l2.TrimStart().StartsWith(GetDashChar()) || l2.TrimStart().StartsWith(GetAlternateDashChar()));
}
private static bool IsDialogThreeLinesTwoOne(string l0, string l1, string l2)
{
if (!l0.HasSentenceEnding() &&
l1.HasSentenceEnding() &&
!(l1.TrimStart().StartsWith(GetDashChar()) || l1.TrimStart().StartsWith(GetAlternateDashChar())) &&
(l2.TrimStart().StartsWith(GetDashChar())) || l2.TrimStart().StartsWith(GetAlternateDashChar()))
{
return true;
}
return false;
return !l0.HasSentenceEnding() &&
l1.HasSentenceEnding() &&
!(l1.TrimStart().StartsWith(GetDashChar()) || l1.TrimStart().StartsWith(GetAlternateDashChar())) &&
(l2.TrimStart().StartsWith(GetDashChar())) || l2.TrimStart().StartsWith(GetAlternateDashChar());
}
private string GetLineStartFromDashStyle(int lineIndex)
@ -435,6 +422,6 @@ namespace Nikse.SubtitleEdit.Core
private static char GetDashChar() => '-';
private static char GetAlternateDashChar() => '‐'; // Unicode En Dash
private static char GetAlternateDashChar() => '‐'; // Unicode En Dash (\u2010)
}
}

13
libse/Dictionaries/NameList.cs
View File

@ -13,7 +13,7 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
private readonly HashSet<string> _blackList;
private readonly string _languageName;
public NameList(string dictionaryFolder, string languageName, bool useOnlinenames, string namesUrl)
public NameList(string dictionaryFolder, string languageName, bool useOnlineNameList, string namesUrl)
{
_dictionaryFolder = dictionaryFolder;
_languageName = languageName;
@ -24,7 +24,7 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
LoadNamesList(GetLocalNamesUserFileName()); // e.g: en_names_user.xml (culture sensitive)
LoadNamesList(GetLocalNamesFileName()); // e.g: en_names.xml (culture sensitive)
if (useOnlinenames && !string.IsNullOrEmpty(namesUrl))
if (useOnlineNameList && !string.IsNullOrEmpty(namesUrl))
{
try
{
@ -166,11 +166,11 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
}
// Add removed name to blacklist
var xnode = nameListXml.CreateElement("name");
xnode.InnerText = name;
var nameNode = nameListXml.CreateElement("name");
nameNode.InnerText = name;
if (nameListXml.DocumentElement != null)
{
nameListXml.DocumentElement.SelectSingleNode("blacklist")?.AppendChild(xnode);
nameListXml.DocumentElement.SelectSingleNode("blacklist")?.AppendChild(nameNode);
var nodeToRemove = default(XmlNode);
// Remove remove-name from name-list
@ -266,7 +266,7 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
return false;
}
var text = input.Replace(Environment.NewLine, " ");
var text = input.Replace(Environment.NewLine, " ");
text = text.FixExtraSpaces();
if (_namesMultiList.Contains(word))
@ -302,6 +302,5 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
}
return false;
}
}
}