From 07291a53133e92337e9d2d06b1e92de3c764362d Mon Sep 17 00:00:00 2001 From: Nikolaj Olsson Date: Wed, 13 Feb 2019 18:37:00 +0100 Subject: [PATCH] Allow dash in number for WebVTT files - thx Maksim :) --- libse/SubtitleFormats/WebVTT.cs | 2 +- libse/SubtitleFormats/WebVTTFileWithLineNumber.cs | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libse/SubtitleFormats/WebVTT.cs b/libse/SubtitleFormats/WebVTT.cs index c51045978..88f92922b 100644 --- a/libse/SubtitleFormats/WebVTT.cs +++ b/libse/SubtitleFormats/WebVTT.cs @@ -185,7 +185,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats { subtitle.Header = "WEBVTT"; } - else if (p != null && hadEmptyLine && Utilities.IsInteger(line) && + else if (p != null && hadEmptyLine && Utilities.IsInteger(line.RemoveChar('-')) && (RegexTimeCodesMiddle.IsMatch(next) || RegexTimeCodesShort.IsMatch(next) || RegexTimeCodes.IsMatch(next))) diff --git a/libse/SubtitleFormats/WebVTTFileWithLineNumber.cs b/libse/SubtitleFormats/WebVTTFileWithLineNumber.cs index 4da6cc865..6d61a38b1 100644 --- a/libse/SubtitleFormats/WebVTTFileWithLineNumber.cs +++ b/libse/SubtitleFormats/WebVTTFileWithLineNumber.cs @@ -60,7 +60,6 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats Paragraph p = null; string positionInfo = string.Empty; bool hadEmptyLine = false; - int numbers = 0; for (var index = 0; index < lines.Count; index++) { string line = lines[index]; @@ -112,12 +111,12 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats { subtitle.Header = "WEBVTT FILE"; } - else if (p != null && hadEmptyLine && Utilities.IsInteger(line) && + else if (p != null && hadEmptyLine && Utilities.IsInteger(line.RemoveChar('-')) && (RegexTimeCodesMiddle.IsMatch(next) || RegexTimeCodesShort.IsMatch(next) || RegexTimeCodes.IsMatch(next))) { - numbers++; + // line number } else if (p != null) {