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

Refact cmd line (minor)

Browse Source
This commit is contained in:
niksedk 2019-12-05 06:44:02 +01:00
parent 30e4cdc899
commit 57ae834c23
2 changed files with 14 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libse/MergeShortLinesUtils.cs
View File

@ -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)
{

48
src/Logic/CommandLineConvert/CommandLineConverter.cs
View File

@ -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);
if (argument.Equals("/" + actionName, StringComparison.OrdinalIgnoreCase) ||
argument.Equals("-" + actionName, StringComparison.OrdinalIgnoreCase))
{
actions.Add((BatchAction)Enum.Parse(typeof(BatchAction), actionName));
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);
}
}
actions.Reverse();