From abf970b783e54f1101c70384d6acbf74de7056bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E5=82=91?= Date: Mon, 26 Jun 2023 22:56:32 +0800 Subject: [PATCH] Update host url check --- Source/GrasscutterTools/Pages/PageOpenCommand.cs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Source/GrasscutterTools/Pages/PageOpenCommand.cs b/Source/GrasscutterTools/Pages/PageOpenCommand.cs index ffb7867..d398be0 100644 --- a/Source/GrasscutterTools/Pages/PageOpenCommand.cs +++ b/Source/GrasscutterTools/Pages/PageOpenCommand.cs @@ -109,14 +109,9 @@ namespace GrasscutterTools.Pages /// 主机地址 private async Task UpdateServerStatus(string host) { - // "http://127.0.0.1/" -> "http://127.0.0.1" - host = host.TrimEnd('/'); var status = await DispatchServerAPI.QueryServerStatus(host); LblServerVersion.Text = status.Version; - if (status.MaxPlayer >= 0) - LblPlayerCount.Text = $"{status.PlayerCount}/{status.MaxPlayer}"; - else - LblPlayerCount.Text = status.PlayerCount.ToString(); + LblPlayerCount.Text = status.MaxPlayer > 0 ? $"{status.PlayerCount}/{status.MaxPlayer}" : status.PlayerCount.ToString(); } /// @@ -137,9 +132,11 @@ namespace GrasscutterTools.Pages btn.Cursor = Cursors.WaitCursor; try { + // "http://127.0.0.1/" -> "http://127.0.0.1" + var host = TxtHost.Text.TrimEnd('/'); try { - await UpdateServerStatus(TxtHost.Text); + await UpdateServerStatus(host); } catch (Exception ex) { @@ -150,7 +147,7 @@ namespace GrasscutterTools.Pages var isOcEnabled = false; try { - Common.OC = new OpenCommandAPI(TxtHost.Text); + Common.OC = new OpenCommandAPI(host); isOcEnabled = await Common.OC.Ping(); } catch (Exception ex)