From 4c608198d7f960f3033aa0955a6be116e3d30102 Mon Sep 17 00:00:00 2001
From: nilaoda <nilaoda@live.com>
Date: Sun, 18 Jun 2023 12:29:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=90=AF=E4=B8=8B=E8=BD=BD=E5=AE=8C?=
=?UTF-8?q?=E6=88=90=E5=90=8E=E6=B7=B7=E6=B5=81=E6=97=B6=20=E8=87=AA?=
=?UTF-8?q?=E5=8A=A8=E5=90=AF=E7=94=A8=E4=BA=8C=E8=BF=9B=E5=88=B6=E5=90=88?=
=?UTF-8?q?=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/N_m3u8DL-RE.Common/Resource/ResString.cs | 1 +
src/N_m3u8DL-RE.Common/Resource/StaticText.cs | 6 ++++++
src/N_m3u8DL-RE/Program.cs | 7 +++++++
3 files changed, 14 insertions(+)
diff --git a/src/N_m3u8DL-RE.Common/Resource/ResString.cs b/src/N_m3u8DL-RE.Common/Resource/ResString.cs
index c872c04..9e2c6e5 100644
--- a/src/N_m3u8DL-RE.Common/Resource/ResString.cs
+++ b/src/N_m3u8DL-RE.Common/Resource/ResString.cs
@@ -15,6 +15,7 @@ namespace N_m3u8DL_RE.Common.Resource
public static string autoBinaryMerge3 { get => GetText("autoBinaryMerge3"); }
public static string autoBinaryMerge4 { get => GetText("autoBinaryMerge4"); }
public static string autoBinaryMerge5 { get => GetText("autoBinaryMerge5"); }
+ public static string autoBinaryMerge6 { get => GetText("autoBinaryMerge6"); }
public static string badM3u8 { get => GetText("badM3u8"); }
public static string binaryMerge { get => GetText("binaryMerge"); }
public static string checkingLast { get => GetText("checkingLast"); }
diff --git a/src/N_m3u8DL-RE.Common/Resource/StaticText.cs b/src/N_m3u8DL-RE.Common/Resource/StaticText.cs
index 9cffb7c..ff63767 100644
--- a/src/N_m3u8DL-RE.Common/Resource/StaticText.cs
+++ b/src/N_m3u8DL-RE.Common/Resource/StaticText.cs
@@ -70,6 +70,12 @@ namespace N_m3u8DL_RE.Common.Resource
zhTW: "檢測到杜比視界內容，混流功能已禁用",
enUS: "Dolby Vision content is detected, mux after done is automatically disabled"
),
+ ["autoBinaryMerge6"] = new TextContainer
+ (
+ zhCN: "你已开启下载完成后混流，自动开启二进制合并",
+ zhTW: "你已開啟下載完成後混流，自動開啟二進制合併",
+ enUS: "MuxAfterDone is detected, binary merging is automatically enabled"
+ ),
["badM3u8"] = new TextContainer
(
zhCN: "错误的m3u8",
diff --git a/src/N_m3u8DL-RE/Program.cs b/src/N_m3u8DL-RE/Program.cs
index 967ed0d..0c4ca8c 100644
--- a/src/N_m3u8DL-RE/Program.cs
+++ b/src/N_m3u8DL-RE/Program.cs
@@ -319,6 +319,13 @@ namespace N_m3u8DL_RE
Logger.InfoMarkUp(ResString.saveName + $"[deepskyblue1]{option.SaveName.EscapeMarkup()}[/]");
+ //开始MuxAfterDone后自动使用二进制版
+ if (!option.BinaryMerge && option.MuxAfterDone)
+ {
+ option.BinaryMerge = true;
+ Logger.WarnMarkUp($"[darkorange3_1]{ResString.autoBinaryMerge6}[/]");
+ }
+
//下载配置
var downloadConfig = new DownloaderConfig()
{