mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 14:32:35 +01:00
Refact cmd line (minor)
This commit is contained in:
parent
30e4cdc899
commit
57ae834c23
@ -2,7 +2,7 @@
|
||||
|
||||
namespace Nikse.SubtitleEdit.Core
|
||||
{
|
||||
public class MergeShortLinesUtils
|
||||
public static class MergeShortLinesUtils
|
||||
{
|
||||
public static Subtitle MergeShortLinesInSubtitle(Subtitle subtitle, double maxMillisecondsBetweenLines, int maxCharacters, bool onlyContinuousLines)
|
||||
{
|
||||
@ -17,7 +17,7 @@ namespace Nikse.SubtitleEdit.Core
|
||||
p = new Paragraph(subtitle.GetParagraphOrDefault(i - 1));
|
||||
mergedSubtitle.Paragraphs.Add(p);
|
||||
}
|
||||
Paragraph next = subtitle.GetParagraphOrDefault(i);
|
||||
var next = subtitle.GetParagraphOrDefault(i);
|
||||
if (next != null)
|
||||
{
|
||||
if (Utilities.QualifiesForMerge(p, next, maxMillisecondsBetweenLines, maxCharacters, onlyContinuousLines))
|
||||
@ -69,7 +69,7 @@ namespace Nikse.SubtitleEdit.Core
|
||||
return string.Empty;
|
||||
}
|
||||
|
||||
string endTag = string.Empty;
|
||||
var endTag = string.Empty;
|
||||
int start = text.LastIndexOf("</", StringComparison.Ordinal);
|
||||
if (start > 0 && start >= text.Length - 8)
|
||||
{
|
||||
@ -91,7 +91,7 @@ namespace Nikse.SubtitleEdit.Core
|
||||
return string.Empty;
|
||||
}
|
||||
|
||||
string startTag = string.Empty;
|
||||
var startTag = string.Empty;
|
||||
int end = text.IndexOf('>');
|
||||
if (end > 0 && end < 25)
|
||||
{
|
||||
|
@ -123,12 +123,12 @@ namespace Nikse.SubtitleEdit.Logic.CommandLineConvert
|
||||
_stdOutWriter.WriteLine(" The following operations are applied in command line order");
|
||||
_stdOutWriter.WriteLine(" from left to right, and can be specified multiple times.");
|
||||
_stdOutWriter.WriteLine(" /FixCommonErrors");
|
||||
_stdOutWriter.WriteLine(" /MergeSameTimeCodes");
|
||||
_stdOutWriter.WriteLine(" /MergeShortLines");
|
||||
_stdOutWriter.WriteLine(" /ReverseRtlStartEnd");
|
||||
_stdOutWriter.WriteLine(" /RemoveFormatting");
|
||||
_stdOutWriter.WriteLine(" /RemoveTextForHI");
|
||||
_stdOutWriter.WriteLine(" /RedoCasing");
|
||||
_stdOutWriter.WriteLine(" /MergeSameTimeCodes");
|
||||
_stdOutWriter.WriteLine(" /MergeShortLines");
|
||||
_stdOutWriter.WriteLine();
|
||||
_stdOutWriter.WriteLine(" example: SubtitleEdit /convert *.srt sami");
|
||||
_stdOutWriter.WriteLine(" show this usage message: SubtitleEdit /help");
|
||||
@ -942,50 +942,18 @@ namespace Nikse.SubtitleEdit.Logic.CommandLineConvert
|
||||
private static List<BatchAction> GetArgumentActions(IList<string> commandLineArguments)
|
||||
{
|
||||
var actions = new List<BatchAction>();
|
||||
var actionNames = typeof(BatchAction).GetEnumNames();
|
||||
for (int i = commandLineArguments.Count - 1; i >= 0; i--)
|
||||
{
|
||||
var argument = commandLineArguments[i];
|
||||
if (argument.Equals("/fixcommonerrors", StringComparison.OrdinalIgnoreCase) ||
|
||||
argument.Equals("-fixcommonerrors", StringComparison.OrdinalIgnoreCase))
|
||||
foreach (var actionName in actionNames)
|
||||
{
|
||||
actions.Add(BatchAction.FixCommonErrors);
|
||||
commandLineArguments.RemoveAt(i);
|
||||
}
|
||||
else if (argument.Equals("/reversertlstartend", StringComparison.OrdinalIgnoreCase) ||
|
||||
argument.Equals("-reversertlstartend", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
actions.Add(BatchAction.ReverseRtlStartEnd);
|
||||
commandLineArguments.RemoveAt(i);
|
||||
}
|
||||
else if (argument.Equals("/redocasing", StringComparison.OrdinalIgnoreCase) ||
|
||||
argument.Equals("-redocasing", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
actions.Add(BatchAction.ReDoCasing);
|
||||
commandLineArguments.RemoveAt(i);
|
||||
}
|
||||
else if (argument.Equals("/removetextforhi", StringComparison.OrdinalIgnoreCase) ||
|
||||
argument.Equals("-removetextforhi", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
actions.Add(BatchAction.RemoveTextForHI);
|
||||
commandLineArguments.RemoveAt(i);
|
||||
}
|
||||
else if (argument.Equals("/removeformatting", StringComparison.OrdinalIgnoreCase) ||
|
||||
argument.Equals("-removeformatting", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
actions.Add(BatchAction.RemoveFormatting);
|
||||
commandLineArguments.RemoveAt(i);
|
||||
}
|
||||
else if (argument.Equals("/mergeshortlines", StringComparison.OrdinalIgnoreCase) ||
|
||||
argument.Equals("-mergeshortlines", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
actions.Add(BatchAction.MergeShortLines);
|
||||
commandLineArguments.RemoveAt(i);
|
||||
}
|
||||
else if (argument.Equals("/mergesametimecodes", StringComparison.OrdinalIgnoreCase) ||
|
||||
argument.Equals("-mergesametimecodes", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
actions.Add(BatchAction.MergeSameTimeCodes);
|
||||
commandLineArguments.RemoveAt(i);
|
||||
if (argument.Equals("/" + actionName, StringComparison.OrdinalIgnoreCase) ||
|
||||
argument.Equals("-" + actionName, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
actions.Add((BatchAction)Enum.Parse(typeof(BatchAction), actionName));
|
||||
commandLineArguments.RemoveAt(i);
|
||||
}
|
||||
}
|
||||
}
|
||||
actions.Reverse();
|
||||
|
Loading…
Reference in New Issue
Block a user