Refactor V2rayUpgrade

2dust · Sep 6, 2024 · d5f1cc9 · d5f1cc9
1 parent d03a862
commit d5f1cc9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs b/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
@@ -234,21 +234,7 @@ private void UpgradeN()
                 {
                     return;
                 }
-
-                Process process = new()
-                {
-                    StartInfo = new ProcessStartInfo
-                    {
-                        FileName = "v2rayUpgrade",
-                        Arguments = fileName.AppendQuotes(),
-                        WorkingDirectory = Utils.StartupPath()
-                    }
-                };
-                process.Start();
-                if (process.Id > 0)
-                {
-                    Locator.Current.GetService<MainWindowViewModel>()?.MyAppExitAsync(false);
-                }
+                Locator.Current.GetService<MainWindowViewModel>()?.V2rayUpgrade(fileName);
             }
             catch (Exception ex)
             {

diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -428,6 +428,24 @@ public async Task MyAppExitAsync(bool blWindowsShutDown)
             }
         }
 
+        public async Task V2rayUpgrade(string fileName)
+        {
+            Process process = new()
+            {
+                StartInfo = new ProcessStartInfo
+                {
+                    FileName = "v2rayUpgrade",
+                    Arguments = fileName.AppendQuotes(),
+                    WorkingDirectory = Utils.StartupPath()
+                }
+            };
+            process.Start();
+            if (process.Id > 0)
+            {
+                await MyAppExitAsync(false);
+            }
+        }
+
         #endregion Actions
 
         #region Servers && Groups