From af05878cc545eb1841fd492651d339af1eb1480b Mon Sep 17 00:00:00 2001 From: ChsBuffer <33744752+chsbuffer@users.noreply.github.com> Date: Tue, 6 Oct 2020 01:22:45 +0800 Subject: [PATCH] refactor: load mode head --- Netch/Utils/ModeHelper.cs | 15 +++++++-------- modes | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Netch/Utils/ModeHelper.cs b/Netch/Utils/ModeHelper.cs index 0dd10b24..8ac591d3 100644 --- a/Netch/Utils/ModeHelper.cs +++ b/Netch/Utils/ModeHelper.cs @@ -64,18 +64,17 @@ namespace Netch.Utils if (i == 0) { - var splited = text.Substring(text.IndexOf('#') + 1).Split(',').Select(s => s.Trim()).ToArray(); try { - string tmp; - if ((tmp = splited.ElementAtOrDefault(0)) != null) - mode.Remark = tmp; + var splited = text.Substring(text.IndexOf('#') + 1).Split(',').Select(s => s.Trim()).ToArray(); - tmp = splited.ElementAtOrDefault(1); - mode.Type = tmp != null ? int.Parse(tmp) : 0; + mode.Remark = splited[0]; - if ((tmp = splited.ElementAtOrDefault(2)) != null) - mode.BypassChina = int.Parse(tmp) == 1; + var result = int.TryParse(splited.ElementAtOrDefault(1), out var type); + mode.Type = result ? type : 0; + + var result1 = int.TryParse(splited.ElementAtOrDefault(2), out var bypassChina); + mode.BypassChina = result1 && bypassChina == 1; } catch { diff --git a/modes b/modes index da8f5736..68cf33c4 160000 --- a/modes +++ b/modes @@ -1 +1 @@ -Subproject commit da8f573648dbf7a6343013ca7f16afec2689583b +Subproject commit 68cf33c4762b52fad8600959975fca0c103573f4