Mirror-Tools
/
N_m3u8DL-RE
mirror of https://github.com/nilaoda/N_m3u8DL-RE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

优化合并成功判断

This commit is contained in:
nilaoda 2022-12-02 14:30:41 +08:00
parent 6e93bbd698
commit 9cd8cec5cd
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/N_m3u8DL-RE/Util/MergeUtil.cs
View File

@ -49,7 +49,7 @@ namespace N_m3u8DL_RE.Util
} }
} }
private static void InvokeFFmpeg(string binary, string command, string workingDirectory) private static int InvokeFFmpeg(string binary, string command, string workingDirectory)
{ {
Logger.DebugMarkUp($"{binary}: {command}"); Logger.DebugMarkUp($"{binary}: {command}");
@ -73,6 +73,7 @@ namespace N_m3u8DL_RE.Util
p.Start(); p.Start();
p.BeginErrorReadLine(); p.BeginErrorReadLine();
p.WaitForExit(); p.WaitForExit();
return p.ExitCode;
} }
public static string[] PartialCombineMultipleFiles(string[] files) public static string[] PartialCombineMultipleFiles(string[] files)
@ -167,12 +168,9 @@ namespace N_m3u8DL_RE.Util
break; break;
} }
InvokeFFmpeg(binary, command.ToString(), Path.GetDirectoryName(files[0])!); var code = InvokeFFmpeg(binary, command.ToString(), Path.GetDirectoryName(files[0])!);
if (File.Exists($"{outputPath}.{muxFormat}") && new FileInfo($"{outputPath}.{muxFormat}").Length > 0) return code == 0;
return true;
return false;
} }
public static bool MuxInputsByFFmpeg(string binary, OutputFile[] files, string outputPath, bool mp4, bool dateinfo) public static bool MuxInputsByFFmpeg(string binary, OutputFile[] files, string outputPath, bool mp4, bool dateinfo)
@ -227,12 +225,9 @@ namespace N_m3u8DL_RE.Util
command.Append($" -ignore_unknown -copy_unknown "); command.Append($" -ignore_unknown -copy_unknown ");
command.Append($" \"{outputPath}.{ext}\""); command.Append($" \"{outputPath}.{ext}\"");
InvokeFFmpeg(binary, command.ToString(), Environment.CurrentDirectory); var code = InvokeFFmpeg(binary, command.ToString(), Environment.CurrentDirectory);
if (File.Exists($"{outputPath}.{ext}") && new FileInfo($"{outputPath}.{ext}").Length > 1024) return code == 0;
return true;
return false;
} }
public static bool MuxInputsByMkvmerge(string binary, OutputFile[] files, string outputPath) public static bool MuxInputsByMkvmerge(string binary, OutputFile[] files, string outputPath)
@ -252,12 +247,9 @@ namespace N_m3u8DL_RE.Util
command.Append($" \"{files[i].FilePath}\" "); command.Append($" \"{files[i].FilePath}\" ");
} }
InvokeFFmpeg(binary, command.ToString(), Environment.CurrentDirectory); var code = InvokeFFmpeg(binary, command.ToString(), Environment.CurrentDirectory);
if (File.Exists($"{outputPath}.mkv") && new FileInfo($"{outputPath}.mkv").Length > 1024) return code == 0;
return true;
return false;
} }
/// <summary> /// <summary>