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

Merge branch 'master' of https://github.com/SubtitleEdit/subtitleedit

Browse Source
This commit is contained in:
Nikolaj Olsson 2019-11-11 12:07:21 +01:00
commit 8b89d3a958
7 changed files with 981 additions and 923 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libse/LibSE.csproj
View File

@ -611,8 +611,8 @@
<Compile Include="TransportStream\Teletext.cs" />
<Compile Include="TransportStream\TransportStreamParser.cs" />
<Compile Include="TransportStream\TransportStreamSubtitle.cs" />
<Compile Include="UknownFormatImporterJson.cs" />
<Compile Include="UknownFormatImporter.cs" />
<Compile Include="UnknownFormatImporterJson.cs" />
<Compile Include="UnknownFormatImporter.cs" />
<Compile Include="Utilities.cs" />
<Compile Include="VideoInfo.cs" />
<Compile Include="VobSub\Helper.cs" />

1885
libse/UknownFormatImporter.cs → libse/UnknownFormatImporter.cs
View File

File diff suppressed because it is too large Load Diff

3
libse/UknownFormatImporterJson.cs → libse/UnknownFormatImporterJson.cs
View File

@ -7,9 +7,8 @@ using System.Text;
namespace Nikse.SubtitleEdit.Core
{
public class UknownFormatImporterJson
public class UnknownFormatImporterJson
{
public Subtitle AutoGuessImport(List<string> lines)
{

2
src/Forms/BatchConvert.cs
View File

@ -672,7 +672,7 @@ namespace Nikse.SubtitleEdit.Forms
s = rtb.Text;
}
}
var unknownFormatImporter = new UknownFormatImporter { UseFrames = true };
var unknownFormatImporter = new UnknownFormatImporter { UseFrames = true };
var genericParseSubtitle = unknownFormatImporter.AutoGuessImport(s.SplitToLines());
if (genericParseSubtitle.Paragraphs.Count > 1)
{

2
src/Forms/ImportUnknownFormat.cs
View File

@ -45,7 +45,7 @@ namespace Nikse.SubtitleEdit.Forms
private void GeneratePreviewReal()
{
var uknownFormatImporter = new UknownFormatImporter { UseFrames = radioButtonTimeCodeFrames.Checked };
var uknownFormatImporter = new UnknownFormatImporter { UseFrames = radioButtonTimeCodeFrames.Checked };
ImportedSubitle = uknownFormatImporter.AutoGuessImport(textBoxText.Lines.ToList());
groupBoxImportResult.Text = string.Format(Configuration.Settings.Language.ImportText.PreviewLinesModifiedX, ImportedSubitle.Paragraphs.Count);
SubtitleListview1.Fill(ImportedSubitle);

2
src/Forms/Main.cs
View File

@ -2811,7 +2811,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
var uknownFormatImporter = new UknownFormatImporter { UseFrames = true };
var uknownFormatImporter = new UnknownFormatImporter { UseFrames = true };
var genericParseSubtitle = uknownFormatImporter.AutoGuessImport(s.SplitToLines());
if (genericParseSubtitle.Paragraphs.Count > 1)
{

6
src/Test/Logic/UknownFormatImporterJsonTest.cs
View File

@ -70,7 +70,7 @@ namespace Test.Logic
}]
}";
var importer = new UknownFormatImporterJson();
var importer = new UnknownFormatImporterJson();
var subtitle = importer.AutoGuessImport(raw.Replace('\'', '"').SplitToLines());
Assert.AreEqual(11, subtitle.Paragraphs.Count);
Assert.AreEqual("development", subtitle.Paragraphs[1].Text);
@ -139,7 +139,7 @@ namespace Test.Logic
}]
}";
var importer = new UknownFormatImporterJson();
var importer = new UnknownFormatImporterJson();
var subtitle = importer.AutoGuessImport(raw.Replace('\'', '"').SplitToLines());
Assert.AreEqual(11, subtitle.Paragraphs.Count);
Assert.AreEqual("Ford" + Environment.NewLine + "BMW" + Environment.NewLine + "Fiat", subtitle.Paragraphs[1].Text);
@ -176,7 +176,7 @@ namespace Test.Logic
}]
}";
var importer = new UknownFormatImporterJson();
var importer = new UnknownFormatImporterJson();
var subtitle = importer.AutoGuessImport(raw.Replace('\'', '"').SplitToLines());
Assert.AreEqual(4, subtitle.Paragraphs.Count);
Assert.AreEqual("Line1", subtitle.Paragraphs[1].Text);