GitHub/netch
1
0
Fork 0
mirror of https://github.com/netchx/netch.git synced 2026-03-14 17:43:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor OpenLogFile

Browse Source
This commit is contained in:
ChsBuffer
2021-03-31 19:19:31 +08:00
parent 7ab89b67c5
commit 42b609b597
30 changed files with 215 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Netch/Controllers/Guard.cs
View File

@@ -84,7 +84,7 @@ namespace Netch.Controllers
}
catch (Win32Exception e)
{
Logging.Error($"停止 {MainFile} 错误：\n" + e);
Global.Logger.Error($"停止 {MainFile} 错误：\n" + e);
}
catch
{
@@ -268,7 +268,7 @@ namespace Netch.Controllers
}
catch (Exception exception)
{
Logging.Warning($"写入 {Name} 日志错误：\n" + exception.Message);
Global.Logger.Warning($"写入 {Name} 日志错误：\n" + exception.Message);
}
}
}

12
Netch/Controllers/MainController.cs
View File

@@ -54,7 +54,7 @@ namespace Netch.Controllers
public static void Start(Server server, Mode mode)
{
Logging.Info($"启动主控制器: {server.Type} [{mode.Type}]{mode.Remark}");
Global.Logger.Info($"启动主控制器: {server.Type} [{mode.Type}]{mode.Remark}");
Server = server;
Mode = mode;
@@ -89,8 +89,8 @@ namespace Netch.Controllers
case MessageException:
throw;
default:
Logging.Error(e.ToString());
Utils.Utils.Open(Logging.LogFile);
Global.Logger.Error(e.ToString());
Global.Logger.ShowLog();
throw new MessageException($"未处理异常\n{e.Message}");
}
}
@@ -158,8 +158,8 @@ namespace Netch.Controllers
}
catch (Exception e)
{
Logging.Error(e.ToString());
Utils.Utils.Open(Logging.LogFile);
Global.Logger.Error(e.ToString());
Global.Logger.ShowLog();
}
ModeController = null;
@@ -193,7 +193,7 @@ namespace Netch.Controllers
}
catch (Exception e)
{
Logging.Warning(e.ToString());
Global.Logger.Warning(e.ToString());
continue;
}

16
Netch/Controllers/NFController.cs
View File

@@ -176,8 +176,8 @@ namespace Netch.Controllers
var binFileVersion = Utils.Utils.GetFileVersion(BinDriver);
var systemFileVersion = Utils.Utils.GetFileVersion(SystemDriver);
Logging.Info("内置驱动版本: " + binFileVersion);
Logging.Info("系统驱动版本: " + systemFileVersion);
Global.Logger.Info("内置驱动版本: " + binFileVersion);
Global.Logger.Info("系统驱动版本: " + systemFileVersion);
if (!File.Exists(SystemDriver))
{
@@ -207,7 +207,7 @@ namespace Netch.Controllers
if (!reinstall)
return;
Logging.Info("更新驱动");
Global.Logger.Info("更新驱动");
UninstallDriver();
InstallDriver();
}
@@ -218,7 +218,7 @@ namespace Netch.Controllers
/// <returns>驱动是否安装成功</returns>
private static void InstallDriver()
{
Logging.Info("安装 NF 驱动");
Global.Logger.Info("安装 NF 驱动");
if (!File.Exists(BinDriver))
throw new MessageException(i18N.Translate("builtin driver files missing, can't install NF driver"));
@@ -229,7 +229,7 @@ namespace Netch.Controllers
}
catch (Exception e)
{
Logging.Error("驱动复制失败\n" + e);
Global.Logger.Error("驱动复制失败\n" + e);
throw new MessageException($"Copy NF driver file failed\n{e.Message}");
}
@@ -238,11 +238,11 @@ namespace Netch.Controllers
var result = NFAPI.nf_registerDriver("netfilter2");
if (result == NF_STATUS.NF_STATUS_SUCCESS)
{
Logging.Info("驱动安装成功");
Global.Logger.Info("驱动安装成功");
}
else
{
Logging.Error($"注册驱动失败，返回值：{result}");
Global.Logger.Error($"注册驱动失败，返回值：{result}");
throw new MessageException($"Register NF driver failed\n{result}");
}
}
@@ -253,7 +253,7 @@ namespace Netch.Controllers
/// <returns>是否成功卸载</returns>
public static bool UninstallDriver()
{
Logging.Info("卸载 NF 驱动");
Global.Logger.Info("卸载 NF 驱动");
try
{
if (NFService.Status == ServiceControllerStatus.Running)

4
Netch/Controllers/NTTController.cs
View File

@@ -39,7 +39,7 @@ namespace Netch.Controllers
}
catch (Exception e)
{
Logging.Warning($"写入 {Name} 日志错误：\n" + e.Message);
Global.Logger.Warning($"写入 {Name} 日志错误：\n" + e.Message);
}
if (output.IsNullOrWhiteSpace())
@@ -86,7 +86,7 @@ namespace Netch.Controllers
}
catch (Exception e)
{
Logging.Error($"{Name} 控制器出错:\n" + e);
Global.Logger.Error($"{Name} 控制器出错:\n" + e);
try
{
Stop();

32
Netch/Controllers/TUNController.cs
View File

@@ -8,7 +8,9 @@ using System.Threading.Tasks;
using Netch.Models;
using Netch.Servers.Socks5;
using Netch.Utils;
using Vanara.PInvoke;
using static Netch.Interops.TUNInterop;
using static Vanara.PInvoke.Ws2_32;
namespace Netch.Controllers
{
@@ -84,7 +86,7 @@ namespace Netch.Controllers
#endregion
Logging.Debug("tun2socks init");
Global.Logger.Debug("tun2socks init");
Init();
_tunAdapter = new TunAdapter();
@@ -104,8 +106,8 @@ namespace Netch.Controllers
{
var binHash = Utils.Utils.SHA256CheckSum(BinDriver);
var sysHash = Utils.Utils.SHA256CheckSum(SysDriver);
Logging.Info("自带 wintun.dll Hash: " + binHash);
Logging.Info("系统 wintun.dll Hash: " + sysHash);
Global.Logger.Info("自带 wintun.dll Hash: " + binHash);
Global.Logger.Info("系统 wintun.dll Hash: " + sysHash);
if (binHash == sysHash)
return;
@@ -115,7 +117,7 @@ namespace Netch.Controllers
}
catch (Exception e)
{
Logging.Error(e.ToString());
Global.Logger.Error(e.ToString());
throw new MessageException($"Failed to copy wintun.dll to system directory: {e.Message}");
}
}
@@ -142,13 +144,13 @@ namespace Netch.Controllers
private void SetupRouteTable(Mode mode)
{
Global.MainForm.StatusText(i18N.Translate("SetupBypass"));
Logging.Info("设置路由规则");
Global.Logger.Info("设置路由规则");
Logging.Info("绕行 → 服务器 IP");
Global.Logger.Info("绕行 → 服务器 IP");
if (!IPAddress.IsLoopback(_serverAddresses))
RouteAction(Action.Create, $"{_serverAddresses}/32", RouteType.Outbound);
Logging.Info("绕行 → 全局绕过 IP");
Global.Logger.Info("绕行 → 全局绕过 IP");
RouteAction(Action.Create, Global.Settings.TUNTAP.BypassIPs, RouteType.Outbound);
#region Rule IPs
@@ -157,12 +159,12 @@ namespace Netch.Controllers
{
case 1:
// 代理规则 IP
Logging.Info("代理 → 规则 IP");
Global.Logger.Info("代理 → 规则 IP");
RouteAction(Action.Create, mode.FullRule, RouteType.TUNTAP);
if (Global.Settings.TUNTAP.ProxyDNS)
{
Logging.Info("代理 → 自定义 DNS");
Global.Logger.Info("代理 → 自定义 DNS");
if (Global.Settings.TUNTAP.UseCustomDNS)
RouteAction(Action.Create, Global.Settings.TUNTAP.HijackDNS.Select(ip => $"{ip}/32"), RouteType.TUNTAP);
else
@@ -173,7 +175,7 @@ namespace Netch.Controllers
case 2:
// 绕过规则 IP
Logging.Info("绕行 → 规则 IP");
Global.Logger.Info("绕行 → 规则 IP");
RouteAction(Action.Create, mode.FullRule, RouteType.Outbound);
break;
}
@@ -182,7 +184,7 @@ namespace Netch.Controllers
if (mode.Type == 2)
{
Logging.Info("代理 → 全局");
Global.Logger.Info("代理 → 全局");
SetInterface(RouteType.TUNTAP, 0);
RouteAction(Action.Create, "0.0.0.0/0", RouteType.TUNTAP, record: false);
}
@@ -267,11 +269,9 @@ namespace Netch.Controllers
throw new ArgumentOutOfRangeException(nameof(action), action, null);
}
Logging.Debug($"{action}Route(\"{ip}\", {cidr}, \"{gateway}\", {index}, {metric})");
Global.Logger.Debug($"{action}Route(\"{ip}\", {cidr}, \"{gateway}\", {index}, {metric})");
if (!result)
{
Logging.Warning($"Failed to invoke {action}Route(\"{ip}\", {cidr}, \"{gateway}\", {index}, {metric})");
}
Global.Logger.Warning($"Failed to invoke {action}Route(\"{ip}\", {cidr}, \"{gateway}\", {index}, {metric})");
return result;
}
@@ -284,7 +284,7 @@ namespace Netch.Controllers
var s = ipNetwork.Split('/');
if (s.Length != 2)
{
Logging.Warning($"Failed to parse rule {ipNetwork}");
Global.Logger.Warning($"Failed to parse rule {ipNetwork}");
return false;
}

10
Netch/Controllers/UpdateChecker.cs
View File

@@ -47,24 +47,24 @@ namespace Netch.Controllers
var releases = JsonSerializer.Deserialize<List<Release>>(json)!;
LatestRelease = VersionUtil.GetLatestRelease(releases, isPreRelease);
Logging.Info($"Github 最新发布版本: {LatestRelease.tag_name}");
Global.Logger.Info($"Github 最新发布版本: {LatestRelease.tag_name}");
if (VersionUtil.CompareVersion(LatestRelease.tag_name, Version) > 0)
{
Logging.Info("发现新版本");
Global.Logger.Info("发现新版本");
NewVersionFound?.Invoke(null, new EventArgs());
}
else
{
Logging.Info("目前是最新版本");
Global.Logger.Info("目前是最新版本");
NewVersionNotFound?.Invoke(null, new EventArgs());
}
}
catch (Exception e)
{
if (e is WebException)
Logging.Warning($"获取新版本失败: {e.Message}");
Global.Logger.Warning($"获取新版本失败: {e.Message}");
else
Logging.Warning(e.ToString());
Global.Logger.Warning(e.ToString());
NewVersionFoundFailed?.Invoke(null, new EventArgs());
}

10
Netch/Forms/MainForm.cs
View File

@@ -297,7 +297,7 @@ namespace Netch.Forms
catch (Exception e)
{
NotifyTip(i18N.Translate("update servers failed") + "\n" + e.Message, info: false);
Logging.Error("更新服务器 失败！" + e);
Global.Logger.Error("更新服务器 失败！" + e);
}
finally
{
@@ -432,8 +432,8 @@ namespace Netch.Forms
{
if (exception is not MessageException)
{
Logging.Error($"更新失败: {exception}");
Utils.Utils.Open(Logging.LogFile);
Global.Logger.Error($"更新失败: {exception}");
Global.Logger.ShowLog();
}
NotifyTip(exception.Message, info: false);
@@ -1178,7 +1178,7 @@ namespace Netch.Forms
if (!IsWaiting())
{
_resumeFlag = true;
Logging.Info("操作系统即将挂起，自动停止");
Global.Logger.Info("操作系统即将挂起，自动停止");
ControlButton_Click(null, null);
}
@@ -1187,7 +1187,7 @@ namespace Netch.Forms
if (_resumeFlag)
{
_resumeFlag = false;
Logging.Info("操作系统即将从挂起状态继续，自动重启");
Global.Logger.Info("操作系统即将从挂起状态继续，自动重启");
ControlButton_Click(null, null);
}

2
Netch/Forms/SettingForm.cs
View File

@@ -63,7 +63,7 @@ namespace Netch.Forms
}
catch (Exception e)
{
Logging.Warning($"Load stun.txt failed: {e.Message}");
Global.Logger.Warning($"Load stun.txt failed: {e.Message}");
stuns = null;
}

21
Netch/Global.cs
View File

@@ -4,7 +4,9 @@ using System.Text.Encodings.Web;
using System.Text.Json;
using System.Windows.Forms;
using Netch.Forms;
using Netch.Interfaces;
using Netch.Models;
using Netch.Models.Loggers;
namespace Netch
{
@@ -25,6 +27,22 @@ namespace Netch
/// </summary>
public static readonly List<Mode> Modes = new();
public static readonly string NetchDir;
public static readonly string NetchExecutable;
static Global()
{
NetchExecutable = Application.ExecutablePath;
NetchDir = Application.StartupPath;
#if DEBUG
Logger = new ConsoleLogger();
#else
Logger = new FileLogger();
#endif
}
public static ILogger Logger { get; }
/// <summary>
/// 主窗体的静态实例
/// </summary>
@@ -36,8 +54,5 @@ namespace Netch
IgnoreNullValues = true,
Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
};
public static readonly string NetchDir = Application.StartupPath;
public static readonly string NetchExecutable = Application.ExecutablePath;
}
}

11
Netch/Interfaces/ILogger.cs Normal file
View File

@@ -0,0 +1,11 @@
namespace Netch.Interfaces
{
public interface ILogger
{
void Info(string text);
void Warning(string text);
void Error(string text);
void Debug(string s);
void ShowLog();
}
}

2
Netch/Interops/RedirectorInterop.cs
View File

@@ -43,7 +43,7 @@ namespace Netch.Interops
public static bool Dial(NameList name, string value)
{
Logging.Debug($"Dial {name} {value}");
Global.Logger.Debug($"Dial {name} {value}");
return aio_dial(name, value);
}

2
Netch/Interops/TUNInterop.cs
View File

@@ -36,7 +36,7 @@ namespace Netch.Interops
public static bool Dial(NameList name, string value)
{
Logging.Debug($"Dial {name} {value}");
Global.Logger.Debug($"Dial {name} {value}");
return tun_dial(name, Encoding.UTF8.GetBytes(value));
}

52
Netch/Models/Loggers/ConsoleLogger.cs Normal file
View File

@@ -0,0 +1,52 @@
using System;
using Netch.Interfaces;
namespace Netch.Models.Loggers
{
public class ConsoleLogger : ILogger
{
public void Info(string text)
{
Write(text, LogLevel.INFO);
}
public void Warning(string text)
{
Write(text, LogLevel.WARNING);
}
public void Error(string text)
{
Write(text, LogLevel.ERROR);
}
private void Write(string text, LogLevel logLevel)
{
var contents = $@"[{DateTime.Now}][{logLevel.ToString()}] {text}{Constants.EOF}";
switch (logLevel)
{
case LogLevel.DEBUG:
case LogLevel.INFO:
case LogLevel.WARNING:
Console.Write(contents);
break;
case LogLevel.ERROR:
Console.Error.Write(contents);
break;
default:
throw new ArgumentOutOfRangeException(nameof(logLevel), logLevel, null);
}
}
public void Debug(string s)
{
#if DEBUG
Write(s, LogLevel.DEBUG);
#endif
}
public void ShowLog()
{
}
}
}

48
Netch/Models/Loggers/FileLogger.cs Normal file
View File

@@ -0,0 +1,48 @@
using System;
using System.IO;
using Netch.Interfaces;
namespace Netch.Models.Loggers
{
public class FileLogger : ILogger
{
public string LogFile { get; set; }= Path.Combine(Global.NetchDir, "logging\\application.log");
private readonly object _fileLock = new();
public void Info(string text)
{
Write(text, LogLevel.INFO);
}
public void Warning(string text)
{
Write(text, LogLevel.WARNING);
}
public void Error(string text)
{
Write(text, LogLevel.ERROR);
}
public void Write(string text, LogLevel logLevel)
{
var contents = $@"[{DateTime.Now}][{logLevel.ToString()}] {text}{Constants.EOF}";
lock (_fileLock)
File.AppendAllText(LogFile, contents);
}
public void Debug(string s)
{
#if DEBUG
Write(s, LogLevel.DEBUG);
#endif
}
public void ShowLog()
{
Utils.Utils.Open(LogFile);
}
}
}

4
Netch/Models/OutboundAdapter.cs
View File

@@ -25,8 +25,8 @@ namespace Netch.Models
InterfaceIndex = (int) pRoute.dwForwardIfIndex;
Gateway = new IPAddress(pRoute.dwForwardNextHop.S_un_b);
Logging.Info($"出口 网关 地址：{Gateway}");
Logging.Info($"出口适配器：{NetworkInterface.Name} {NetworkInterface.Id} {NetworkInterface.Description}, index: {InterfaceIndex}");
Global.Logger.Info($"出口 网关 地址：{Gateway}");
Global.Logger.Info($"出口适配器：{NetworkInterface.Name} {NetworkInterface.Id} {NetworkInterface.Description}, index: {InterfaceIndex}");
}
public IPAddress Address { get; }

2
Netch/Models/TunAdapter.cs
View File

@@ -14,7 +14,7 @@ namespace Netch.Models
NetworkInterface = NetworkInterface.GetAllNetworkInterfaces().First(i => i.GetIPProperties().GetIPv4Properties().Index == InterfaceIndex);
Gateway = IPAddress.Parse(Global.Settings.TUNTAP.Gateway);
Logging.Info($"WinTUN 适配器：{NetworkInterface.Name} {NetworkInterface.Id} {NetworkInterface.Description}, index: {InterfaceIndex}");
Global.Logger.Info($"WinTUN 适配器：{NetworkInterface.Name} {NetworkInterface.Id} {NetworkInterface.Description}, index: {InterfaceIndex}");
}

8
Netch/Netch.cs
View File

@@ -80,8 +80,8 @@ namespace Netch
Environment.Exit(2);
}
Logging.Info($"版本: {UpdateChecker.Owner}/{UpdateChecker.Repo}@{UpdateChecker.Version}");
Task.Run(() => { Logging.Info($"主程序 SHA256: {Utils.Utils.SHA256CheckSum(Global.NetchExecutable)}"); });
Global.Logger.Info($"版本: {UpdateChecker.Owner}/{UpdateChecker.Repo}@{UpdateChecker.Version}");
Task.Run(() => { Global.Logger.Info($"主程序 SHA256: {Utils.Utils.SHA256CheckSum(Global.NetchExecutable)}"); });
// 绑定错误捕获
Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
@@ -101,8 +101,8 @@ namespace Netch
public static void Application_OnException(object sender, ThreadExceptionEventArgs e)
{
Logging.Error(e.Exception.ToString());
Utils.Utils.Open(Logging.LogFile);
Global.Logger.Error(e.Exception.ToString());
Global.Logger.ShowLog();
}
private static void SingleInstance_ArgumentsReceived(IEnumerable<string> args)

2
Netch/Servers/Shadowsocks/SSUtil.cs
View File

@@ -65,7 +65,7 @@ namespace Netch.Servers.Shadowsocks
var server = (Shadowsocks) s;
if (!SSGlobal.EncryptMethods.Contains(server.EncryptMethod))
{
Logging.Error($"不支持的 SS 加密方式：{server.EncryptMethod}");
Global.Logger.Error($"不支持的 SS 加密方式：{server.EncryptMethod}");
{
return false;
}

6
Netch/Servers/ShadowsocksR/SSRUtil.cs
View File

@@ -146,19 +146,19 @@ namespace Netch.Servers.ShadowsocksR
var server = (ShadowsocksR) s;
if (!SSRGlobal.EncryptMethods.Contains(server.EncryptMethod))
{
Logging.Error($"不支持的 SSR 加密方式：{server.EncryptMethod}");
Global.Logger.Error($"不支持的 SSR 加密方式：{server.EncryptMethod}");
return false;
}
if (!SSRGlobal.Protocols.Contains(server.Protocol))
{
Logging.Error($"不支持的 SSR 协议：{server.Protocol}");
Global.Logger.Error($"不支持的 SSR 协议：{server.Protocol}");
return false;
}
if (!SSRGlobal.OBFSs.Contains(server.OBFS))
{
Logging.Error($"不支持的 SSR 混淆：{server.OBFS}");
Global.Logger.Error($"不支持的 SSR 混淆：{server.OBFS}");
return false;
}

2
Netch/Updater/Updater.cs
View File

@@ -161,7 +161,7 @@ namespace Netch.Updater
}
catch
{
Logging.Error($"failed to rename file \"{file}\"");
Global.Logger.Error($"failed to rename file \"{file}\"");
throw;
}
}

2
Netch/Utils/Bandwidth.cs
View File

@@ -78,7 +78,7 @@ namespace Netch.Utils
var processList = instances.Select(instance => instance.Id).ToList();
Logging.Info("流量统计进程:" + string.Join(",", instances.Select(instance => $"({instance.Id})" + instance.ProcessName).ToArray()));
Global.Logger.Info("流量统计进程:" + string.Join(",", instances.Select(instance => $"({instance.Id})" + instance.ProcessName).ToArray()));
received = 0;

4
Netch/Utils/Configuration.cs
View File

@@ -42,8 +42,8 @@ namespace Netch.Utils
}
catch (Exception e)
{
Logging.Error(e.ToString());
Utils.Open(Logging.LogFile);
Global.Logger.Error(e.ToString());
Global.Logger.ShowLog();
Environment.Exit(-1);
Global.Settings = null!;
}

6
Netch/Utils/Firewall.cs
View File

@@ -17,7 +17,7 @@ namespace Netch.Utils
{
if (!FirewallWAS.IsSupported)
{
Logging.Warning("不支持防火墙");
Global.Logger.Warning("不支持防火墙");
return;
}
@@ -37,7 +37,7 @@ namespace Netch.Utils
}
catch (Exception e)
{
Logging.Warning("添加防火墙规则错误(如已关闭防火墙则可无视此错误)\n" + e);
Global.Logger.Warning("添加防火墙规则错误(如已关闭防火墙则可无视此错误)\n" + e);
}
}
@@ -57,7 +57,7 @@ namespace Netch.Utils
}
catch (Exception e)
{
Logging.Warning("清除防火墙规则错误\n" + e);
Global.Logger.Warning("清除防火墙规则错误\n" + e);
}
}

70
Netch/Utils/Logging.cs
View File

@@ -1,70 +0,0 @@
using System;
using System.IO;
using Netch.Models;
namespace Netch.Utils
{
public static class Logging
{
public const string LogFile = "logging\\application.log";
private static readonly object FileLock = new();
/// <summary>
/// 信息
/// </summary>
/// <param name="text">内容</param>
public static void Info(string text)
{
Write(text, LogLevel.INFO);
}
/// <summary>
/// 信息
/// </summary>
/// <param name="text">内容</param>
public static void Warning(string text)
{
Write(text, LogLevel.WARNING);
}
/// <summary>
/// 错误
/// </summary>
/// <param name="text">内容</param>
public static void Error(string text)
{
Write(text, LogLevel.ERROR);
}
private static void Write(string text, LogLevel logLevel)
{
var contents = $@"[{DateTime.Now}][{logLevel.ToString()}] {text}{Constants.EOF}";
#if DEBUG
switch (logLevel)
{
case LogLevel.DEBUG:
case LogLevel.INFO:
case LogLevel.WARNING:
Console.Write(contents);
break;
case LogLevel.ERROR:
Console.Error.Write(contents);
break;
default:
throw new ArgumentOutOfRangeException(nameof(logLevel), logLevel, null);
}
#else
lock (FileLock)
File.AppendAllText(LogFile, contents);
#endif
}
public static void Debug(string s)
{
#if DEBUG
Write(s, LogLevel.DEBUG);
#endif
}
}
}

4
Netch/Utils/ModeHelper.cs
View File

@@ -85,7 +85,7 @@ namespace Netch.Utils
}
catch (Exception e)
{
Logging.Warning($"Load mode \"{file}\" failed: {e.Message}");
Global.Logger.Warning($"Load mode \"{file}\" failed: {e.Message}");
}
}
catch
@@ -142,7 +142,7 @@ namespace Netch.Utils
case 6:
return new PcapController();
default:
Logging.Error("未知模式类型");
Global.Logger.Error("未知模式类型");
throw new MessageException("未知模式类型");
}
}

2
Netch/Utils/PortHelper.cs
View File

@@ -24,7 +24,7 @@ namespace Netch.Utils
}
catch (Exception e)
{
Logging.Error("获取保留端口失败: " + e);
Global.Logger.Error("获取保留端口失败: " + e);
}
}

29
Netch/Utils/ShareLink.cs
View File

@@ -32,17 +32,16 @@ namespace Netch.Utils
try
{
list.AddRange(JsonSerializer.Deserialize<List<ShadowsocksConfig>>(text)!
.Select(server => new Shadowsocks
{
Hostname = server.server,
Port = server.server_port,
EncryptMethod = server.method,
Password = server.password,
Remark = server.remarks,
Plugin = server.plugin,
PluginOption = server.plugin_opts
}));
list.AddRange(JsonSerializer.Deserialize<List<ShadowsocksConfig>>(text)!.Select(server => new Shadowsocks
{
Hostname = server.server,
Port = server.server_port,
EncryptMethod = server.method,
Password = server.password,
Remark = server.remarks,
Plugin = server.plugin,
PluginOption = server.plugin_opts
}));
}
catch (JsonException)
{
@@ -56,16 +55,16 @@ namespace Netch.Utils
catch (Exception e)
{
errorFlag = true;
Logging.Error(e.ToString());
Global.Logger.Error(e.ToString());
}
}
if (errorFlag)
Utils.Open(Logging.LogFile);
Global.Logger.ShowLog();
}
catch (Exception e)
{
Logging.Error(e.ToString());
Global.Logger.Error(e.ToString());
}
return list;
@@ -90,7 +89,7 @@ namespace Netch.Utils
if (util != null)
list.AddRange(util.ParseUri(text));
else
Logging.Warning($"无法处理 {scheme} 协议订阅链接");
Global.Logger.Warning($"无法处理 {scheme} 协议订阅链接");
}
foreach (var node in list.Where(node => !node.Remark.IsNullOrWhiteSpace()))

2
Netch/Utils/Subscription.cs
View File

@@ -53,7 +53,7 @@ namespace Netch.Utils
catch (Exception e)
{
Global.MainForm.NotifyTip($"{i18N.TranslateFormat("Update servers error from {0}", item.Remark)}\n{e.Message}", info: false);
Logging.Error(e.ToString());
Global.Logger.Error(e.ToString());
}
}
}

2
Netch/Utils/Utils.cs
View File

@@ -243,7 +243,7 @@ namespace Netch.Utils
}
};
Logging.Debug($"{fileName} {arguments}");
Global.Logger.Debug($"{fileName} {arguments}");
p.Start();
var output = await p.StandardOutput.ReadToEndAsync();

4
Netch/Utils/i18N.cs
View File

@@ -41,7 +41,7 @@ namespace Netch.Utils
{
var oldLangCode = LangCode;
LangCode = languages.FirstOrDefault(s => GetLanguage(s).Equals(GetLanguage(LangCode))) ?? "en-US";
Logging.Info($"找不到语言 {oldLangCode}, 使用 {LangCode}");
Global.Logger.Info($"找不到语言 {oldLangCode}, 使用 {LangCode}");
}
switch (LangCode)
@@ -61,7 +61,7 @@ namespace Netch.Utils
if (!dictionary.Any())
{
Logging.Error($"{LangCode} 语言文件错误");
Global.Logger.Error($"{LangCode} 语言文件错误");
return;
}