From b7a600483034c1154ad35c0dfbe77e093cbffbed Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:48:57 +0800
Subject: [PATCH] some improvements

---
 v2rayN/v2rayN/Handler/SpeedtestHandler.cs | 10 +++++-----
 v2rayN/v2rayN/Handler/UpdateHandle.cs     |  2 +-
 v2rayN/v2rayN/Handler/V2rayHandler.cs     | 21 ++++++++++-----------
 v2rayN/v2rayN/Mode/ESpeedActionType.cs    | 11 +++++++++++
 v2rayN/v2rayN/v2rayN.csproj               |  1 +
 5 files changed, 28 insertions(+), 17 deletions(-)
 create mode 100644 v2rayN/v2rayN/Mode/ESpeedActionType.cs

diff --git a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
index c6faabd2..df0eee21 100644
--- a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
+++ b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
@@ -21,7 +21,7 @@ namespace v2rayN.Handler
             _config = config;
         }
 
-        public SpeedtestHandler(ref Config config, ref V2rayHandler v2rayHandler, List<VmessItem> selecteds, string actionType, Action<string, string> update)
+        public SpeedtestHandler(ref Config config, V2rayHandler v2rayHandler, List<VmessItem> selecteds, ESpeedActionType actionType, Action<string, string> update)
         {
             _config = config;
             _v2rayHandler = v2rayHandler;
@@ -40,19 +40,19 @@ namespace v2rayN.Handler
                 });
             }
 
-            if (actionType == "ping")
+            if (actionType == ESpeedActionType.Ping)
             {
                 Task.Run(() => RunPing());
             }
-            if (actionType == "tcping")
+            else if (actionType == ESpeedActionType.Tcping)
             {
                 Task.Run(() => RunTcping());
             }
-            else if (actionType == "realping")
+            else if (actionType == ESpeedActionType.Realping)
             {
                 Task.Run(() => RunRealPing());
             }
-            else if (actionType == "speedtest")
+            else if (actionType == ESpeedActionType.Speedtest)
             {
                 Task.Run(() => RunSpeedTest());
             }
diff --git a/v2rayN/v2rayN/Handler/UpdateHandle.cs b/v2rayN/v2rayN/Handler/UpdateHandle.cs
index 5b280883..62c795f4 100644
--- a/v2rayN/v2rayN/Handler/UpdateHandle.cs
+++ b/v2rayN/v2rayN/Handler/UpdateHandle.cs
@@ -182,7 +182,7 @@ namespace v2rayN.Handler
                 string url = config.subItem[k - 1].url.TrimEx();
                 string userAgent = config.subItem[k - 1].userAgent.TrimEx();
                 string groupId = config.subItem[k - 1].groupId.TrimEx();
-                string hashCode = $"{k}->";
+                string hashCode = $"{k}){config.subItem[k - 1].remarks}->";
                 if (config.subItem[k - 1].enabled == false)
                 {
                     continue;
diff --git a/v2rayN/v2rayN/Handler/V2rayHandler.cs b/v2rayN/v2rayN/Handler/V2rayHandler.cs
index 7db95a8a..bb4e4435 100644
--- a/v2rayN/v2rayN/Handler/V2rayHandler.cs
+++ b/v2rayN/v2rayN/Handler/V2rayHandler.cs
@@ -21,7 +21,7 @@ namespace v2rayN.Handler
     class V2rayHandler
     {
         private static string v2rayConfigRes = Global.v2rayConfigFileName;
-        private List<string> lstV2ray;
+        private List<string> lstCore;
         private string coreUrl;
         private string coreArguments;
         public event ProcessDelegate ProcessEvent;
@@ -106,7 +106,7 @@ namespace v2rayN.Handler
                 }
                 else
                 {
-                    foreach (string vName in lstV2ray)
+                    foreach (string vName in lstCore)
                     {
                         Process[] existing = Process.GetProcessesByName(vName);
                         foreach (Process p in existing)
@@ -163,12 +163,10 @@ namespace v2rayN.Handler
             }
         }
 
-        private string V2rayFindexe()
+        private string V2rayFindexe(List<string> lstCoreTemp)
         {
-            //查找v2ray文件是否存在
             string fileName = string.Empty;
-            //lstV2ray.Reverse();
-            foreach (string name in lstV2ray)
+            foreach (string name in lstCoreTemp)
             {
                 string vName = string.Format("{0}.exe", name);
                 vName = Utils.GetPath(vName);
@@ -195,7 +193,7 @@ namespace v2rayN.Handler
 
             try
             {
-                string fileName = V2rayFindexe();
+                string fileName = V2rayFindexe(lstCore);
                 if (fileName == "") return;
 
                 Process p = new Process
@@ -249,7 +247,8 @@ namespace v2rayN.Handler
 
             try
             {
-                string fileName = V2rayFindexe();
+                coreUrl = Global.xrayCoreUrl;
+                string fileName = V2rayFindexe(new List<string> { "xray" });
                 if (fileName == "") return -1;
 
                 Process p = new Process
@@ -336,7 +335,7 @@ namespace v2rayN.Handler
 
             if (coreType == ECoreType.v2fly)
             {
-                lstV2ray = new List<string>
+                lstCore = new List<string>
                 {
                     "wv2ray",
                     "v2ray"
@@ -346,7 +345,7 @@ namespace v2rayN.Handler
             }
             else if (coreType == ECoreType.Xray)
             {
-                lstV2ray = new List<string>
+                lstCore = new List<string>
                 {
                     "xray"
                 };
@@ -355,7 +354,7 @@ namespace v2rayN.Handler
             }
             else if (coreType == ECoreType.clash)
             {
-                lstV2ray = new List<string>
+                lstCore = new List<string>
                 {
                     "clash-windows-amd64",
                     "clash-windows-386",
diff --git a/v2rayN/v2rayN/Mode/ESpeedActionType.cs b/v2rayN/v2rayN/Mode/ESpeedActionType.cs
new file mode 100644
index 00000000..3e9bc3b6
--- /dev/null
+++ b/v2rayN/v2rayN/Mode/ESpeedActionType.cs
@@ -0,0 +1,11 @@
+
+namespace v2rayN.Mode
+{
+    public enum ESpeedActionType
+    {
+        Ping,
+        Tcping,
+        Realping,
+        Speedtest
+    }
+}
diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj
index fe6e948d..a6623b5d 100644
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -199,6 +199,7 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Handler\SysProxyHandle.cs" />
+    <Compile Include="Mode\ESpeedActionType.cs" />
     <Compile Include="Mode\EGlobalHotkey.cs" />
     <Compile Include="Mode\ECoreType.cs" />
     <Compile Include="Mode\ESysProxyType.cs" />