Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-23 03:33:18 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3424 from ivandrofly/compare

Browse Source 
Compare: Update advanced format detection
This commit is contained in:
Nikolaj Olsson 2019-02-28 10:27:21 +01:00 committed by GitHub
commit 52c9ae8a3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/Forms/Compare.cs
View File

@ -120,70 +120,25 @@ namespace Nikse.SubtitleEdit.Forms
return;
}
_subtitle1 = new Subtitle();
var format = _subtitle1.LoadSubtitle(openFileDialog1.FileName, out _, null);
SubtitleFormat format = _subtitle1.LoadSubtitle(openFileDialog1.FileName, out _, null);
if (format == null)
{
var pac = new Pac();
if (pac.IsMine(null, openFileDialog1.FileName))
// try advanced format (non-text base formats)
foreach (SubtitleFormat advancedFormat in GetAdvancedFormats())
{
pac.BatchMode = true;
pac.LoadSubtitle(_subtitle1, null, openFileDialog1.FileName);
format = pac;
}
}
if (format == null)
{
var cavena890 = new Cavena890();
if (cavena890.IsMine(null, openFileDialog1.FileName))
{
cavena890.LoadSubtitle(_subtitle1, null, openFileDialog1.FileName);
format = cavena890;
}
}
if (format == null)
{
var spt = new Spt();
if (spt.IsMine(null, openFileDialog1.FileName))
{
spt.LoadSubtitle(_subtitle1, null, openFileDialog1.FileName);
format = spt;
}
}
if (format == null)
{
var cheetahCaption = new CheetahCaption();
if (cheetahCaption.IsMine(null, openFileDialog1.FileName))
{
cheetahCaption.LoadSubtitle(_subtitle1, null, openFileDialog1.FileName);
format = cheetahCaption;
}
}
if (format == null)
{
var chk = new Chk();
if (chk.IsMine(null, openFileDialog1.FileName))
{
chk.LoadSubtitle(_subtitle1, null, openFileDialog1.FileName);
format = chk;
}
}
if (format == null)
{
var asc = new TimeLineAscii();
if (asc.IsMine(null, openFileDialog1.FileName))
{
asc.LoadSubtitle(_subtitle1, null, openFileDialog1.FileName);
format = asc;
}
}
if (format == null)
{
var asc = new TimeLineFootageAscii();
if (asc.IsMine(null, openFileDialog1.FileName))
{
asc.LoadSubtitle(_subtitle1, null, openFileDialog1.FileName);
if (!advancedFormat.IsMine(null, openFileDialog1.FileName))
{
continue;
}
if (advancedFormat is Pac pacFormat)
{
pacFormat.BatchMode = true;
}
advancedFormat.LoadSubtitle(_subtitle1, null, openFileDialog1.FileName);
break; // format found, exit the loop
}
}
subtitleListView1.Fill(_subtitle1);
subtitleListView1.SelectIndexAndEnsureVisible(0);
subtitleListView2.SelectIndexAndEnsureVisible(0);
@ -196,6 +151,20 @@ namespace Nikse.SubtitleEdit.Forms
}
}
/// <summary>
/// Get advanced subtitle formats (These formats are not include in SubtitleFormat.AllSubtitleFormats)
/// </summary>
private static IEnumerable<SubtitleFormat> GetAdvancedFormats()
{
yield return new Pac();
yield return new Cavena890();
yield return new Spt();
yield return new CheetahCaption();
yield return new Chk();
yield return new TimeLineAscii();
yield return new TimeLineFootageAscii();
}
private void ButtonOpenSubtitle2Click(object sender, EventArgs e)
{
openFileDialog1.FileName = string.Empty;