From eb6b87e4aaf5386e5f66aedb64002161058ef060 Mon Sep 17 00:00:00 2001 From: ChsBuffer <33744752+chsbuffer@users.noreply.github.com> Date: Wed, 14 Oct 2020 17:19:03 +0800 Subject: [PATCH] refacotr: StartServer --- Netch/Controllers/MainController.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Netch/Controllers/MainController.cs b/Netch/Controllers/MainController.cs index 1490857f..888cdfc4 100644 --- a/Netch/Controllers/MainController.cs +++ b/Netch/Controllers/MainController.cs @@ -56,7 +56,7 @@ namespace Netch.Controllers try { - if (!await StartServer(server, mode)) + if (!await StartServer(server, mode, ServerController)) { throw new StartFailedException(); } @@ -100,22 +100,22 @@ namespace Netch.Controllers } } - private static async Task StartServer(Server server, Mode mode) + private static async Task StartServer(Server server, Mode mode, IServerController controller) { - ServerController = ServerHelper.GetUtilByTypeName(server.Type).GetController(); + controller = ServerHelper.GetUtilByTypeName(server.Type).GetController(); - if (ServerController is Guard instanceController) + if (controller is Guard instanceController) { Utils.Utils.KillProcessByName(instanceController.MainFile); } - PortCheckAndShowMessageBox(Global.Settings.Socks5LocalPort, "Socks5"); + PortCheckAndShowMessageBox(controller.Socks5LocalPort(), "Socks5"); - Global.MainForm.StatusText(i18N.TranslateFormat("Starting {0}", ServerController.Name)); - if (await Task.Run(() => ServerController.Start(server, mode))) + Global.MainForm.StatusText(i18N.TranslateFormat("Starting {0}", controller.Name)); + if (await Task.Run(() => controller.Start(server, mode))) { - UsingPorts.Add(StatusPortInfoText.Socks5Port = Global.Settings.Socks5LocalPort); - StatusPortInfoText.ShareLan = Global.Settings.LocalAddress == "0.0.0.0"; + UsingPorts.Add(StatusPortInfoText.Socks5Port = controller.Socks5LocalPort()); + StatusPortInfoText.ShareLan = controller.LocalAddress == "0.0.0.0"; return true; }