noham/N_m3u8DL-RE
1
0
Fork 0
mirror of https://github.com/NohamR/N_m3u8DL-RE.git synced 2025-05-25 06:41:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix #123

Browse Source
This commit is contained in:
nilaoda 2023-06-15 17:58:54 +08:00
parent 76a8b50f36
commit c9ced6571c
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/N_m3u8DL-RE/DownloadManager/SimpleDownloadManager.cs
View File

@ -698,12 +698,15 @@ namespace N_m3u8DL_RE.DownloadManager
if (DownloaderConfig.MyOptions.UseMkvmerge) result = MergeUtil.MuxInputsByMkvmerge(DownloaderConfig.MyOptions.MkvmergeBinaryPath!, OutputFiles.ToArray(), outPath); if (DownloaderConfig.MyOptions.UseMkvmerge) result = MergeUtil.MuxInputsByMkvmerge(DownloaderConfig.MyOptions.MkvmergeBinaryPath!, OutputFiles.ToArray(), outPath);
else result = MergeUtil.MuxInputsByFFmpeg(DownloaderConfig.MyOptions.FFmpegBinaryPath!, OutputFiles.ToArray(), outPath, DownloaderConfig.MyOptions.MuxToMp4, !DownloaderConfig.MyOptions.NoDateInfo); else result = MergeUtil.MuxInputsByFFmpeg(DownloaderConfig.MyOptions.FFmpegBinaryPath!, OutputFiles.ToArray(), outPath, DownloaderConfig.MyOptions.MuxToMp4, !DownloaderConfig.MyOptions.NoDateInfo);
//完成后删除各轨道文件 //完成后删除各轨道文件
if (result && !DownloaderConfig.MyOptions.MuxKeepFiles) if (result)
{ {
Logger.WarnMarkUp("[grey]Cleaning files...[/]"); if (!DownloaderConfig.MyOptions.MuxKeepFiles)
OutputFiles.ForEach(f => File.Delete(f.FilePath)); {
var tmpDir = DownloaderConfig.MyOptions.TmpDir ?? Environment.CurrentDirectory; Logger.WarnMarkUp("[grey]Cleaning files...[/]");
OtherUtil.SafeDeleteDir(tmpDir); OutputFiles.ForEach(f => File.Delete(f.FilePath));
var tmpDir = DownloaderConfig.MyOptions.TmpDir ?? Environment.CurrentDirectory;
OtherUtil.SafeDeleteDir(tmpDir);
}
} }
else else
{ {

13
src/N_m3u8DL-RE/DownloadManager/SimpleLiveRecordManager2.cs
View File

@ -888,12 +888,15 @@ namespace N_m3u8DL_RE.DownloadManager
if (DownloaderConfig.MyOptions.UseMkvmerge) result = MergeUtil.MuxInputsByMkvmerge(DownloaderConfig.MyOptions.MkvmergeBinaryPath!, OutputFiles.ToArray(), outPath); if (DownloaderConfig.MyOptions.UseMkvmerge) result = MergeUtil.MuxInputsByMkvmerge(DownloaderConfig.MyOptions.MkvmergeBinaryPath!, OutputFiles.ToArray(), outPath);
else result = MergeUtil.MuxInputsByFFmpeg(DownloaderConfig.MyOptions.FFmpegBinaryPath!, OutputFiles.ToArray(), outPath, DownloaderConfig.MyOptions.MuxToMp4, !DownloaderConfig.MyOptions.NoDateInfo); else result = MergeUtil.MuxInputsByFFmpeg(DownloaderConfig.MyOptions.FFmpegBinaryPath!, OutputFiles.ToArray(), outPath, DownloaderConfig.MyOptions.MuxToMp4, !DownloaderConfig.MyOptions.NoDateInfo);
//完成后删除各轨道文件 //完成后删除各轨道文件
if (result && !DownloaderConfig.MyOptions.MuxKeepFiles) if (result)
{ {
Logger.WarnMarkUp("[grey]Cleaning files...[/]"); if (!DownloaderConfig.MyOptions.MuxKeepFiles)
OutputFiles.ForEach(f => File.Delete(f.FilePath)); {
var tmpDir = DownloaderConfig.MyOptions.TmpDir ?? Environment.CurrentDirectory; Logger.WarnMarkUp("[grey]Cleaning files...[/]");
OtherUtil.SafeDeleteDir(tmpDir); OutputFiles.ForEach(f => File.Delete(f.FilePath));
var tmpDir = DownloaderConfig.MyOptions.TmpDir ?? Environment.CurrentDirectory;
OtherUtil.SafeDeleteDir(tmpDir);
}
} }
else else
{ {