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

Speedup small mkv files in "Batch convert" - thx lambdan :)

Browse Source 
Fix #4211
This commit is contained in:
nikolaj.olsson 2020-05-31 13:13:31 +02:00
parent 8d92cf6095
commit 9ea9b82b8b
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libse/FileUtil.cs
View File

@ -558,5 +558,11 @@ namespace Nikse.SubtitleEdit.Core
File.WriteAllText(fileName, contents, encoding.Encoding); File.WriteAllText(fileName, contents, encoding.Encoding);
} }
} }
public static bool IsMatroskaFile(string fileName)
{
var validator = new MatroskaFile(fileName);
return validator.IsValid;
}
} }
} }

17
src/Forms/BatchConvert.cs
View File

@ -2,9 +2,13 @@
using Nikse.SubtitleEdit.Core.BluRaySup; using Nikse.SubtitleEdit.Core.BluRaySup;
using Nikse.SubtitleEdit.Core.ContainerFormats.Matroska; using Nikse.SubtitleEdit.Core.ContainerFormats.Matroska;
using Nikse.SubtitleEdit.Core.Forms; using Nikse.SubtitleEdit.Core.Forms;
using Nikse.SubtitleEdit.Core.Interfaces;
using Nikse.SubtitleEdit.Core.SubtitleFormats; using Nikse.SubtitleEdit.Core.SubtitleFormats;
using Nikse.SubtitleEdit.Core.VobSub;
using Nikse.SubtitleEdit.Forms.Ocr;
using Nikse.SubtitleEdit.Forms.Styles; using Nikse.SubtitleEdit.Forms.Styles;
using Nikse.SubtitleEdit.Logic; using Nikse.SubtitleEdit.Logic;
using Nikse.SubtitleEdit.Logic.CommandLineConvert;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@ -14,11 +18,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using Nikse.SubtitleEdit.Core.VobSub;
using Nikse.SubtitleEdit.Forms.Ocr;
using Idx = Nikse.SubtitleEdit.Core.VobSub.Idx; using Idx = Nikse.SubtitleEdit.Core.VobSub.Idx;
using Nikse.SubtitleEdit.Core.Interfaces;
using Nikse.SubtitleEdit.Logic.CommandLineConvert;
namespace Nikse.SubtitleEdit.Forms namespace Nikse.SubtitleEdit.Forms
{ {
@ -529,7 +529,7 @@ namespace Nikse.SubtitleEdit.Forms
} }
var fi = new FileInfo(fileName); var fi = new FileInfo(fileName);
var ext = fi.Extension; var ext = fi.Extension.ToLowerInvariant();
var item = new ListViewItem(fileName); var item = new ListViewItem(fileName);
item.SubItems.Add(Utilities.FormatBytesToDisplayFileSize(fi.Length)); item.SubItems.Add(Utilities.FormatBytesToDisplayFileSize(fi.Length));
var isMkv = false; var isMkv = false;
@ -545,7 +545,8 @@ namespace Nikse.SubtitleEdit.Forms
var sub = new Subtitle(); var sub = new Subtitle();
if (fi.Length < ConvertMaxFileSize) if (fi.Length < ConvertMaxFileSize)
{ {
if (!FileUtil.IsBluRaySup(fileName) && !FileUtil.IsVobSub(fileName)) if (!FileUtil.IsBluRaySup(fileName) && !FileUtil.IsVobSub(fileName) &&
!((ext == ".mkv" || ext == ".mks") && FileUtil.IsMatroskaFile(fileName)))
{ {
format = sub.LoadSubtitle(fileName, out _, null); format = sub.LoadSubtitle(fileName, out _, null);
@ -589,7 +590,7 @@ namespace Nikse.SubtitleEdit.Forms
{ {
item.SubItems.Add("VobSub"); item.SubItems.Add("VobSub");
} }
else if (ext.Equals(".mkv", StringComparison.OrdinalIgnoreCase) || ext.Equals(".mks", StringComparison.OrdinalIgnoreCase)) else if (ext == ".mkv" || ext == ".mks")
{ {
isMkv = true; isMkv = true;
using (var matroska = new MatroskaFile(fileName)) using (var matroska = new MatroskaFile(fileName))
@ -626,7 +627,7 @@ namespace Nikse.SubtitleEdit.Forms
item.SubItems.Add(Configuration.Settings.Language.UnknownSubtitle.Title); item.SubItems.Add(Configuration.Settings.Language.UnknownSubtitle.Title);
} }
} }
else if ((ext.Equals(".ts", StringComparison.OrdinalIgnoreCase) || ext.Equals(".m2ts", StringComparison.OrdinalIgnoreCase)) && else if ((ext == ".ts" || ext == ".m2ts" || ext == ".mts") &&
(FileUtil.IsTransportStream(fileName) || FileUtil.IsM2TransportStream(fileName))) (FileUtil.IsTransportStream(fileName) || FileUtil.IsM2TransportStream(fileName)))
{ {
isTs = true; isTs = true;