v0.0.2
This commit is contained in:
parent
570fba6e3d
commit
91475708b7
|
@ -13,6 +13,7 @@ namespace N_m3u8DL_RE.Common.Resource
|
||||||
public static string autoBinaryMerge2 { get => GetText("autoBinaryMerge2"); }
|
public static string autoBinaryMerge2 { get => GetText("autoBinaryMerge2"); }
|
||||||
public static string autoBinaryMerge3 { get => GetText("autoBinaryMerge3"); }
|
public static string autoBinaryMerge3 { get => GetText("autoBinaryMerge3"); }
|
||||||
public static string autoBinaryMerge4 { get => GetText("autoBinaryMerge4"); }
|
public static string autoBinaryMerge4 { get => GetText("autoBinaryMerge4"); }
|
||||||
|
public static string autoBinaryMerge5 { get => GetText("autoBinaryMerge5"); }
|
||||||
public static string badM3u8 { get => GetText("badM3u8"); }
|
public static string badM3u8 { get => GetText("badM3u8"); }
|
||||||
public static string binaryMerge { get => GetText("binaryMerge"); }
|
public static string binaryMerge { get => GetText("binaryMerge"); }
|
||||||
public static string checkingLast { get => GetText("checkingLast"); }
|
public static string checkingLast { get => GetText("checkingLast"); }
|
||||||
|
|
|
@ -34,6 +34,12 @@ namespace N_m3u8DL_RE.Common.Resource
|
||||||
zhTW: "檢測到CENC加密方式,自動開啟二進位制合併",
|
zhTW: "檢測到CENC加密方式,自動開啟二進位制合併",
|
||||||
enUS: "When CENC encryption is detected, binary merging is automatically enabled"
|
enUS: "When CENC encryption is detected, binary merging is automatically enabled"
|
||||||
),
|
),
|
||||||
|
["autoBinaryMerge5"] = new TextContainer
|
||||||
|
(
|
||||||
|
zhCN: "检测到杜比视界内容,混流功能已禁用",
|
||||||
|
zhTW: "檢測到杜比視界內容,混流功能已禁用",
|
||||||
|
enUS: "Dolby Vision content is detected, mux after done is automatically disabled"
|
||||||
|
),
|
||||||
["badM3u8"] = new TextContainer
|
["badM3u8"] = new TextContainer
|
||||||
(
|
(
|
||||||
zhCN: "错误的m3u8",
|
zhCN: "错误的m3u8",
|
||||||
|
@ -216,9 +222,9 @@ namespace N_m3u8DL_RE.Common.Resource
|
||||||
),
|
),
|
||||||
["cmd_uiLanguage"] = new TextContainer
|
["cmd_uiLanguage"] = new TextContainer
|
||||||
(
|
(
|
||||||
zhCN: "设置UI语言 (zh-CN, zh-TW, en-US)",
|
zhCN: "设置UI语言",
|
||||||
zhTW: "設置UI語言 (zh-CN, zh-TW, en-US)",
|
zhTW: "設置UI語言",
|
||||||
enUS: "Set UI language (zh-CN, zh-TW, en-US)"
|
enUS: "Set UI language"
|
||||||
),
|
),
|
||||||
["cmd_urlProcessorArgs"] = new TextContainer
|
["cmd_urlProcessorArgs"] = new TextContainer
|
||||||
(
|
(
|
||||||
|
|
|
@ -15,7 +15,7 @@ namespace N_m3u8DL_RE.CommandLine
|
||||||
private readonly static Option<string?> SaveDir = new(new string[] { "--save-dir" }, description: ResString.cmd_saveDir);
|
private readonly static Option<string?> SaveDir = new(new string[] { "--save-dir" }, description: ResString.cmd_saveDir);
|
||||||
private readonly static Option<string?> SaveName = new(new string[] { "--save-name" }, description: ResString.cmd_saveName);
|
private readonly static Option<string?> SaveName = new(new string[] { "--save-name" }, description: ResString.cmd_saveName);
|
||||||
private readonly static Option<string?> SavePattern = new(new string[] { "--save-pattern" }, description: ResString.cmd_savePattern, getDefaultValue: () => "<SaveName>_<Id>_<Codecs>_<Language>_<Ext>");
|
private readonly static Option<string?> SavePattern = new(new string[] { "--save-pattern" }, description: ResString.cmd_savePattern, getDefaultValue: () => "<SaveName>_<Id>_<Codecs>_<Language>_<Ext>");
|
||||||
private readonly static Option<string?> UILanguage = new(new string[] { "--ui-language" }, description: ResString.cmd_uiLanguage);
|
private readonly static Option<string?> UILanguage = new Option<string?>(new string[] { "--ui-language" }, description: ResString.cmd_uiLanguage).FromAmong("en-US", "zh-CN", "zh-TW");
|
||||||
private readonly static Option<string?> UrlProcessorArgs = new(new string[] { "--urlprocessor-args" }, description: ResString.cmd_urlProcessorArgs);
|
private readonly static Option<string?> UrlProcessorArgs = new(new string[] { "--urlprocessor-args" }, description: ResString.cmd_urlProcessorArgs);
|
||||||
private readonly static Option<string[]?> Keys = new(new string[] { "--key" }, description: ResString.cmd_keys) { Arity = ArgumentArity.ZeroOrMore, AllowMultipleArgumentsPerToken = false };
|
private readonly static Option<string[]?> Keys = new(new string[] { "--key" }, description: ResString.cmd_keys) { Arity = ArgumentArity.ZeroOrMore, AllowMultipleArgumentsPerToken = false };
|
||||||
private readonly static Option<string> KeyTextFile = new(new string[] { "--key-text-file" }, description: ResString.cmd_keyText);
|
private readonly static Option<string> KeyTextFile = new(new string[] { "--key-text-file" }, description: ResString.cmd_keyText);
|
||||||
|
@ -32,7 +32,7 @@ namespace N_m3u8DL_RE.CommandLine
|
||||||
private readonly static Option<bool> DelAfterDone = new(new string[] { "--del-after-done" }, description: ResString.cmd_delAfterDone, getDefaultValue: () => true);
|
private readonly static Option<bool> DelAfterDone = new(new string[] { "--del-after-done" }, description: ResString.cmd_delAfterDone, getDefaultValue: () => true);
|
||||||
private readonly static Option<bool> AutoSubtitleFix = new(new string[] { "--auto-subtitle-fix" }, description: ResString.cmd_subtitleFix, getDefaultValue: () => true);
|
private readonly static Option<bool> AutoSubtitleFix = new(new string[] { "--auto-subtitle-fix" }, description: ResString.cmd_subtitleFix, getDefaultValue: () => true);
|
||||||
private readonly static Option<bool> CheckSegmentsCount = new(new string[] { "--check-segments-count" }, description: ResString.cmd_checkSegmentsCount, getDefaultValue: () => true);
|
private readonly static Option<bool> CheckSegmentsCount = new(new string[] { "--check-segments-count" }, description: ResString.cmd_checkSegmentsCount, getDefaultValue: () => true);
|
||||||
private readonly static Option<bool> WriteMetaJson = new(new string[] { "--write-meta-json" }, description: ResString.cmd_writeMetaJson, getDefaultValue: () => true);
|
private readonly static Option<bool> WriteMetaJson = new(new string[] { "--write-meta-json" }, description: ResString.cmd_writeMetaJson, getDefaultValue: () => false);
|
||||||
private readonly static Option<bool> AppendUrlParams = new(new string[] { "--append-url-params" }, description: ResString.cmd_appendUrlParams, getDefaultValue: () => false);
|
private readonly static Option<bool> AppendUrlParams = new(new string[] { "--append-url-params" }, description: ResString.cmd_appendUrlParams, getDefaultValue: () => false);
|
||||||
private readonly static Option<bool> MP4RealTimeDecryption = new (new string[] { "--mp4-real-time-decryption" }, description: ResString.cmd_MP4RealTimeDecryption, getDefaultValue: () => false);
|
private readonly static Option<bool> MP4RealTimeDecryption = new (new string[] { "--mp4-real-time-decryption" }, description: ResString.cmd_MP4RealTimeDecryption, getDefaultValue: () => false);
|
||||||
private readonly static Option<bool> UseShakaPackager = new (new string[] { "--use-shaka-packager" }, description: ResString.cmd_useShakaPackager, getDefaultValue: () => false);
|
private readonly static Option<bool> UseShakaPackager = new (new string[] { "--use-shaka-packager" }, description: ResString.cmd_useShakaPackager, getDefaultValue: () => false);
|
||||||
|
@ -86,7 +86,7 @@ namespace N_m3u8DL_RE.CommandLine
|
||||||
|
|
||||||
|
|
||||||
//以用户选择语言为准优先
|
//以用户选择语言为准优先
|
||||||
if (option.UILanguage != null && new List<string> { "en-US", "zh-CN", "zh-TW" }.Contains(option.UILanguage))
|
if (option.UILanguage != null)
|
||||||
{
|
{
|
||||||
CultureInfo.DefaultThreadCurrentCulture = new CultureInfo(option.UILanguage);
|
CultureInfo.DefaultThreadCurrentCulture = new CultureInfo(option.UILanguage);
|
||||||
Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo(option.UILanguage);
|
Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo(option.UILanguage);
|
||||||
|
|
|
@ -87,6 +87,12 @@ namespace N_m3u8DL_RE.DownloadManager
|
||||||
Logger.WarnMarkUp($"[darkorange3_1]{ResString.autoBinaryMerge2}[/]");
|
Logger.WarnMarkUp($"[darkorange3_1]{ResString.autoBinaryMerge2}[/]");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!DownloaderConfig.MuxAfterDone && mediainfos.Any(m => m.DolbyVison == true))
|
||||||
|
{
|
||||||
|
DownloaderConfig.MuxAfterDone = false;
|
||||||
|
Logger.WarnMarkUp($"[darkorange3_1]{ResString.autoBinaryMerge5}[/]");
|
||||||
|
}
|
||||||
|
|
||||||
if (mediainfos.Where(m => m.Type == "Audio").All(m => m.BaseInfo!.Contains("aac")))
|
if (mediainfos.Where(m => m.Type == "Audio").All(m => m.BaseInfo!.Contains("aac")))
|
||||||
{
|
{
|
||||||
useAACFilter = true;
|
useAACFilter = true;
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<LangVersion>preview</LangVersion>
|
<LangVersion>preview</LangVersion>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<Version>0.0.1</Version>
|
<Version>0.0.2</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
Loading…
Reference in New Issue