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-10-30 14:23:26 +08:00
parent 3a9784a5f9
commit 3013c7895f
2 changed files with 264 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/N_m3u8DL-RE/CommandLine/CommandInvoker.cs
View File

@ -8,6 +8,7 @@ using N_m3u8DL_RE.Util;
using NiL.JS.Expressions; using NiL.JS.Expressions;
using System.CommandLine; using System.CommandLine;
using System.CommandLine.Binding; using System.CommandLine.Binding;
using System.CommandLine.Builder;
using System.CommandLine.Parsing; using System.CommandLine.Parsing;
using System.Globalization; using System.Globalization;
using System.Net; using System.Net;
@ -17,7 +18,7 @@ namespace N_m3u8DL_RE.CommandLine
{ {
internal partial class CommandInvoker internal partial class CommandInvoker
{ {
public const string VERSION_INFO = "N_m3u8DL-RE (Beta version) 20221029"; public const string VERSION_INFO = "N_m3u8DL-RE (Beta version) 20221030";
[GeneratedRegex("((best|worst)\\d*|all)")] [GeneratedRegex("((best|worst)\\d*|all)")]
private static partial Regex ForStrRegex(); private static partial Regex ForStrRegex();
@ -450,7 +451,22 @@ namespace N_m3u8DL_RE.CommandLine
rootCommand.TreatUnmatchedTokensAsErrors = true; rootCommand.TreatUnmatchedTokensAsErrors = true;
rootCommand.SetHandler(async (myOption) => await action(myOption), new MyOptionBinder()); rootCommand.SetHandler(async (myOption) => await action(myOption), new MyOptionBinder());
return await rootCommand.InvokeAsync(args); var parser = new CommandLineBuilder(rootCommand)
.UseDefaults()
.EnablePosixBundling(false)
.UseExceptionHandler((ex, context) =>
{
try { Console.CursorVisible = true; } catch { }
string msg = Logger.LogLevel == Common.Log.LogLevel.DEBUG ? ex.ToString() : ex.Message;
#if DEBUG
msg = ex.ToString();
#endif
Logger.Error(msg);
Thread.Sleep(3000);
}, 1)
.Build();
return await parser.InvokeAsync(args);
} }
} }
} }

12
src/N_m3u8DL-RE/Program.cs
View File

@ -78,8 +78,6 @@ namespace N_m3u8DL_RE
HTTPUtil.HttpClientHandler.UseProxy = true; HTTPUtil.HttpClientHandler.UseProxy = true;
} }
try
{
//检查互斥的选项 //检查互斥的选项
if (!option.MuxAfterDone && option.MuxImports != null && option.MuxImports.Count > 0) if (!option.MuxAfterDone && option.MuxImports != null && option.MuxImports.Count > 0)
@ -336,15 +334,5 @@ namespace N_m3u8DL_RE
Logger.ErrorMarkUp("[white on red]Faild[/]"); Logger.ErrorMarkUp("[white on red]Faild[/]");
} }
} }
catch (Exception ex)
{
string msg = Logger.LogLevel == LogLevel.DEBUG ? ex.ToString() : ex.Message;
#if DEBUG
msg = ex.ToString();
#endif
Logger.Error(msg);
await Task.Delay(3000);
}
}
} }
} }