Refactor UpdateService to use instance config and callbacks

2dust · 2dust · commit 091b79f7cf2d · 2025-11-02T21:04:23.000+08:00
diff --git a/v2rayN/ServiceLib/Common/Utils.cs b/v2rayN/ServiceLib/Common/Utils.cs
@@ -9,7 +9,7 @@ public class Utils
 {
     private static readonly string _tag = "Utils";
 
-    #region 转换函数
+    #region Conversion Functions
 
     /// <summary>
     /// Convert to comma-separated string
@@ -462,9 +462,9 @@ private static (string domain, int port) ParseAuthority(string authority)
         return (domain, port);
     }
 
-    #endregion 转换函数
+    #endregion Conversion Functions
 
-    #region 数据检查
+    #region Data Checks
 
     /// <summary>
     /// Determine if the input is a number
@@ -586,9 +586,9 @@ public static bool IsPrivateNetwork(string ip)
         return false;
     }
 
-    #endregion 数据检查
+    #endregion Data Checks
 
-    #region 测速
+    #region Speed Test
 
     private static bool PortInUse(int port)
     {
@@ -641,9 +641,9 @@ public static int GetFreePort(int defaultPort = 0)
         return 59090;
     }
 
-    #endregion 测速
+    #endregion Speed Test
 
-    #region 杂项
+    #region Miscellaneous
 
     public static bool UpgradeAppExists(out string upgradeFileName)
     {
@@ -793,7 +793,7 @@ public static Dictionary<string, string> GetSystemHosts()
         return null;
     }
 
-    #endregion 杂项
+    #endregion Miscellaneous
 
     #region TempPath
 
diff --git a/v2rayN/ServiceLib/Manager/TaskManager.cs b/v2rayN/ServiceLib/Manager/TaskManager.cs
@@ -111,11 +111,10 @@ private async Task UpdateTaskRunGeo(int hours)
         {
             Logging.SaveLog("Execute update geo files");
 
-            var updateHandle = new UpdateService();
-            await updateHandle.UpdateGeoFileAll(_config, async (success, msg) =>
+            await new UpdateService(_config, async (success, msg) =>
             {
                 await _updateFunc?.Invoke(false, msg);
-            });
+            }).UpdateGeoFileAll();
         }
     }
 }
diff --git a/v2rayN/ServiceLib/Services/UpdateService.cs b/v2rayN/ServiceLib/Services/UpdateService.cs
@@ -2,13 +2,19 @@ namespace ServiceLib.Services;
 
 public class UpdateService
 {
-    private Func<bool, string, Task>? _updateFunc;
+    private readonly Config? _config;
+    private readonly Func<bool, string, Task>? _updateFunc;
     private readonly int _timeout = 30;
     private static readonly string _tag = "UpdateService";
 
-    public async Task CheckUpdateGuiN(Config config, Func<bool, string, Task> updateFunc, bool preRelease)
+    public UpdateService(Config config, Func<bool, string, Task> updateFunc)
     {
+        _config = config;
         _updateFunc = updateFunc;
+    }
+
+    public async Task CheckUpdateGuiN(bool preRelease)
+    {
         var url = string.Empty;
         var fileName = string.Empty;
 
@@ -47,9 +53,8 @@ public async Task CheckUpdateGuiN(Config config, Func<bool, string, Task> update
         }
     }
 
-    public async Task CheckUpdateCore(ECoreType type, Config config, Func<bool, string, Task> updateFunc, bool preRelease)
+    public async Task CheckUpdateCore(ECoreType type, bool preRelease)
     {
-        _updateFunc = updateFunc;
         var url = string.Empty;
         var fileName = string.Empty;
 
@@ -101,11 +106,11 @@ public async Task CheckUpdateCore(ECoreType type, Config config, Func<bool, stri
         }
     }
 
-    public async Task UpdateGeoFileAll(Config config, Func<bool, string, Task> updateFunc)
+    public async Task UpdateGeoFileAll()
     {
-        await UpdateGeoFiles(config, updateFunc);
-        await UpdateOtherFiles(config, updateFunc);
-        await UpdateSrsFileAll(config, updateFunc);
+        await UpdateGeoFiles();
+        await UpdateOtherFiles();
+        await UpdateSrsFileAll();
         await UpdateFunc(true, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, "geo"));
     }
 
@@ -330,13 +335,11 @@ private async Task<RetResult> ParseDownloadUrl(ECoreType type, SemanticVersion v
 
     #region Geo private
 
-    private async Task UpdateGeoFiles(Config config, Func<bool, string, Task> updateFunc)
+    private async Task UpdateGeoFiles()
     {
-        _updateFunc = updateFunc;
-
-        var geoUrl = string.IsNullOrEmpty(config?.ConstItem.GeoSourceUrl)
+        var geoUrl = string.IsNullOrEmpty(_config?.ConstItem.GeoSourceUrl)
             ? Global.GeoUrl
-            : config.ConstItem.GeoSourceUrl;
+            : _config.ConstItem.GeoSourceUrl;
 
         List<string> files = ["geosite", "geoip"];
         foreach (var geoName in files)
@@ -345,33 +348,29 @@ private async Task UpdateGeoFiles(Config config, Func<bool, string, Task> update
             var targetPath = Utils.GetBinPath($"{fileName}");
             var url = string.Format(geoUrl, geoName);
 
-            await DownloadGeoFile(url, fileName, targetPath, updateFunc);
+            await DownloadGeoFile(url, fileName, targetPath);
         }
     }
 
-    private async Task UpdateOtherFiles(Config config, Func<bool, string, Task> updateFunc)
+    private async Task UpdateOtherFiles()
     {
         //If it is not in China area, no update is required
-        if (config.ConstItem.GeoSourceUrl.IsNotEmpty())
+        if (_config.ConstItem.GeoSourceUrl.IsNotEmpty())
         {
             return;
         }
 
-        _updateFunc = updateFunc;
-
         foreach (var url in Global.OtherGeoUrls)
         {
             var fileName = Path.GetFileName(url);
             var targetPath = Utils.GetBinPath($"{fileName}");
 
-            await DownloadGeoFile(url, fileName, targetPath, updateFunc);
+            await DownloadGeoFile(url, fileName, targetPath);
         }
     }
 
-    private async Task UpdateSrsFileAll(Config config, Func<bool, string, Task> updateFunc)
+    private async Task UpdateSrsFileAll()
     {
-        _updateFunc = updateFunc;
-
         var geoipFiles = new List<string>();
         var geoSiteFiles = new List<string>();
 
@@ -414,29 +413,29 @@ private async Task UpdateSrsFileAll(Config config, Func<bool, string, Task> upda
         }
         foreach (var item in geoipFiles.Distinct())
         {
-            await UpdateSrsFile("geoip", item, config, updateFunc);
+            await UpdateSrsFile("geoip", item);
         }
 
         foreach (var item in geoSiteFiles.Distinct())
         {
-            await UpdateSrsFile("geosite", item, config, updateFunc);
+            await UpdateSrsFile("geosite", item);
         }
     }
 
-    private async Task UpdateSrsFile(string type, string srsName, Config config, Func<bool, string, Task> updateFunc)
+    private async Task UpdateSrsFile(string type, string srsName)
     {
-        var srsUrl = string.IsNullOrEmpty(config.ConstItem.SrsSourceUrl)
+        var srsUrl = string.IsNullOrEmpty(_config.ConstItem.SrsSourceUrl)
                         ? Global.SingboxRulesetUrl
-                        : config.ConstItem.SrsSourceUrl;
+                        : _config.ConstItem.SrsSourceUrl;
 
         var fileName = $"{type}-{srsName}.srs";
         var targetPath = Path.Combine(Utils.GetBinPath("srss"), fileName);
         var url = string.Format(srsUrl, type, $"{type}-{srsName}", srsName);
 
-        await DownloadGeoFile(url, fileName, targetPath, updateFunc);
+        await DownloadGeoFile(url, fileName, targetPath);
     }
 
-    private async Task DownloadGeoFile(string url, string fileName, string targetPath, Func<bool, string, Task> updateFunc)
+    private async Task DownloadGeoFile(string url, string fileName, string targetPath)
     {
         var tmpFileName = Utils.GetTempPath(Utils.GetGuid());
 
diff --git a/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs b/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
@@ -148,7 +148,7 @@ async Task _updateUI(bool success, string msg)
                 UpdatedPlusPlus(_geo, "");
             }
         }
-        await new UpdateService().UpdateGeoFileAll(_config, _updateUI)
+        await new UpdateService(_config, _updateUI).UpdateGeoFileAll()
             .ContinueWith(t => UpdatedPlusPlus(_geo, ""));
     }
 
@@ -163,7 +163,7 @@ async Task _updateUI(bool success, string msg)
                 UpdatedPlusPlus(_v2rayN, msg);
             }
         }
-        await new UpdateService().CheckUpdateGuiN(_config, _updateUI, preRelease)
+        await new UpdateService(_config, _updateUI).CheckUpdateGuiN(preRelease)
             .ContinueWith(t => UpdatedPlusPlus(_v2rayN, ""));
     }
 
@@ -180,7 +180,7 @@ async Task _updateUI(bool success, string msg)
             }
         }
         var type = (ECoreType)Enum.Parse(typeof(ECoreType), model.CoreType);
-        await new UpdateService().CheckUpdateCore(type, _config, _updateUI, preRelease)
+        await new UpdateService(_config, _updateUI).CheckUpdateCore(type, preRelease)
             .ContinueWith(t => UpdatedPlusPlus(model.CoreType, ""));
     }
 
diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -596,7 +596,7 @@ public async Task ApplyRegionalPreset(EPresetType type)
         AppEvents.RoutingsMenuRefreshRequested.Publish();
 
         await ConfigHandler.SaveConfig(_config);
-        await new UpdateService().UpdateGeoFileAll(_config, UpdateTaskHandler);
+        await new UpdateService(_config, UpdateTaskHandler).UpdateGeoFileAll();
         await Reload();
     }
 
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs
@@ -90,7 +90,7 @@ private void LstProfiles_LoadingRow(object? sender, DataGridRowEventArgs e)
 
     private void LstProfiles_DoubleTapped(object? sender, TappedEventArgs e)
     {
-        // 忽略表头区域的双击
+        // Ignore double-taps on the column header area
         if (e.Source is Control src)
         {
             if (src.FindAncestorOfType<DataGridColumnHeader>() != null)
@@ -99,7 +99,7 @@ private void LstProfiles_DoubleTapped(object? sender, TappedEventArgs e)
                 return;
             }
 
-            // 仅当在数据行或其子元素上双击时才触发选择
+            // Only trigger selection when double-tapped on a data row or its child element
             if (src.FindAncestorOfType<DataGridRow>() != null)
             {
                 ViewModel?.SelectFinish();
@@ -110,7 +110,7 @@ private void LstProfiles_DoubleTapped(object? sender, TappedEventArgs e)
 
     private void LstProfiles_Sorting(object? sender, DataGridColumnEventArgs e)
     {
-        // 自定义排序，防止默认行为导致误触发
+        // Custom sort to prevent unintended default behavior
         e.Handled = true;
         if (ViewModel != null && e.Column?.Tag?.ToString() != null)
         {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public class Utils`
`9`	`9`	`{`
`10`	`10`	`private static readonly string _tag = "Utils";`
`11`	`11`
`12`		`- #region 转换函数`
	`12`	`+ #region Conversion Functions`
`13`	`13`
`14`	`14`	`/// <summary>`
`15`	`15`	`/// Convert to comma-separated string`
`@@ -462,9 +462,9 @@ private static (string domain, int port) ParseAuthority(string authority)`
`462`	`462`	`return (domain, port);`
`463`	`463`	`}`
`464`	`464`
`465`		`- #endregion 转换函数`
	`465`	`+ #endregion Conversion Functions`
`466`	`466`
`467`		`- #region 数据检查`
	`467`	`+ #region Data Checks`
`468`	`468`
`469`	`469`	`/// <summary>`
`470`	`470`	`/// Determine if the input is a number`
`@@ -586,9 +586,9 @@ public static bool IsPrivateNetwork(string ip)`
`586`	`586`	`return false;`
`587`	`587`	`}`
`588`	`588`
`589`		`- #endregion 数据检查`
	`589`	`+ #endregion Data Checks`
`590`	`590`
`591`		`- #region 测速`
	`591`	`+ #region Speed Test`
`592`	`592`
`593`	`593`	`private static bool PortInUse(int port)`
`594`	`594`	`{`
`@@ -641,9 +641,9 @@ public static int GetFreePort(int defaultPort = 0)`
`641`	`641`	`return 59090;`
`642`	`642`	`}`
`643`	`643`
`644`		`- #endregion 测速`
	`644`	`+ #endregion Speed Test`
`645`	`645`
`646`		`- #region 杂项`
	`646`	`+ #region Miscellaneous`
`647`	`647`
`648`	`648`	`public static bool UpgradeAppExists(out string upgradeFileName)`
`649`	`649`	`{`
`@@ -793,7 +793,7 @@ public static Dictionary<string, string> GetSystemHosts()`
`793`	`793`	`return null;`
`794`	`794`	`}`
`795`	`795`
`796`		`- #endregion 杂项`
	`796`	`+ #endregion Miscellaneous`
`797`	`797`
`798`	`798`	`#region TempPath`
`799`	`799`
Original file line number	Diff line number	Diff line change
`@@ -111,11 +111,10 @@ private async Task UpdateTaskRunGeo(int hours)`
`111`	`111`	`{`
`112`	`112`	`Logging.SaveLog("Execute update geo files");`
`113`	`113`
`114`		`- var updateHandle = new UpdateService();`
`115`		`- await updateHandle.UpdateGeoFileAll(_config, async (success, msg) =>`
	`114`	`+ await new UpdateService(_config, async (success, msg) =>`
`116`	`115`	`{`
`117`	`116`	`await _updateFunc?.Invoke(false, msg);`
`118`		`- });`
	`117`	`+ }).UpdateGeoFileAll();`
`119`	`118`	`}`
`120`	`119`	`}`
`121`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,19 @@ namespace ServiceLib.Services;`
`2`	`2`
`3`	`3`	`public class UpdateService`
`4`	`4`	`{`
`5`		`- private Func<bool, string, Task>? _updateFunc;`
	`5`	`+ private readonly Config? _config;`
	`6`	`+ private readonly Func<bool, string, Task>? _updateFunc;`
`6`	`7`	`private readonly int _timeout = 30;`
`7`	`8`	`private static readonly string _tag = "UpdateService";`
`8`	`9`
`9`		`- public async Task CheckUpdateGuiN(Config config, Func<bool, string, Task> updateFunc, bool preRelease)`
	`10`	`+ public UpdateService(Config config, Func<bool, string, Task> updateFunc)`
`10`	`11`	`{`
	`12`	`+ _config = config;`
`11`	`13`	`_updateFunc = updateFunc;`
	`14`	`+ }`
	`15`	`+`
	`16`	`+ public async Task CheckUpdateGuiN(bool preRelease)`
	`17`	`+ {`
`12`	`18`	`var url = string.Empty;`
`13`	`19`	`var fileName = string.Empty;`
`14`	`20`
`@@ -47,9 +53,8 @@ public async Task CheckUpdateGuiN(Config config, Func<bool, string, Task> update`
`47`	`53`	`}`
`48`	`54`	`}`
`49`	`55`
`50`		`- public async Task CheckUpdateCore(ECoreType type, Config config, Func<bool, string, Task> updateFunc, bool preRelease)`
	`56`	`+ public async Task CheckUpdateCore(ECoreType type, bool preRelease)`
`51`	`57`	`{`
`52`		`- _updateFunc = updateFunc;`
`53`	`58`	`var url = string.Empty;`
`54`	`59`	`var fileName = string.Empty;`
`55`	`60`
`@@ -101,11 +106,11 @@ public async Task CheckUpdateCore(ECoreType type, Config config, Func<bool, stri`
`101`	`106`	`}`
`102`	`107`	`}`
`103`	`108`
`104`		`- public async Task UpdateGeoFileAll(Config config, Func<bool, string, Task> updateFunc)`
	`109`	`+ public async Task UpdateGeoFileAll()`
`105`	`110`	`{`
`106`		`- await UpdateGeoFiles(config, updateFunc);`
`107`		`- await UpdateOtherFiles(config, updateFunc);`
`108`		`- await UpdateSrsFileAll(config, updateFunc);`
	`111`	`+ await UpdateGeoFiles();`
	`112`	`+ await UpdateOtherFiles();`
	`113`	`+ await UpdateSrsFileAll();`
`109`	`114`	`await UpdateFunc(true, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, "geo"));`
`110`	`115`	`}`
`111`	`116`
`@@ -330,13 +335,11 @@ private async Task<RetResult> ParseDownloadUrl(ECoreType type, SemanticVersion v`
`330`	`335`
`331`	`336`	`#region Geo private`
`332`	`337`
`333`		`- private async Task UpdateGeoFiles(Config config, Func<bool, string, Task> updateFunc)`
	`338`	`+ private async Task UpdateGeoFiles()`
`334`	`339`	`{`
`335`		`- _updateFunc = updateFunc;`
`336`		`-`
`337`		`- var geoUrl = string.IsNullOrEmpty(config?.ConstItem.GeoSourceUrl)`
	`340`	`+ var geoUrl = string.IsNullOrEmpty(_config?.ConstItem.GeoSourceUrl)`
`338`	`341`	`? Global.GeoUrl`
`339`		`- : config.ConstItem.GeoSourceUrl;`
	`342`	`+ : _config.ConstItem.GeoSourceUrl;`
`340`	`343`
`341`	`344`	`List<string> files = ["geosite", "geoip"];`
`342`	`345`	`foreach (var geoName in files)`
`@@ -345,33 +348,29 @@ private async Task UpdateGeoFiles(Config config, Func<bool, string, Task> update`
`345`	`348`	`var targetPath = Utils.GetBinPath($"{fileName}");`
`346`	`349`	`var url = string.Format(geoUrl, geoName);`
`347`	`350`
`348`		`- await DownloadGeoFile(url, fileName, targetPath, updateFunc);`
	`351`	`+ await DownloadGeoFile(url, fileName, targetPath);`
`349`	`352`	`}`
`350`	`353`	`}`
`351`	`354`
`352`		`- private async Task UpdateOtherFiles(Config config, Func<bool, string, Task> updateFunc)`
	`355`	`+ private async Task UpdateOtherFiles()`
`353`	`356`	`{`
`354`	`357`	`//If it is not in China area, no update is required`
`355`		`- if (config.ConstItem.GeoSourceUrl.IsNotEmpty())`
	`358`	`+ if (_config.ConstItem.GeoSourceUrl.IsNotEmpty())`
`356`	`359`	`{`
`357`	`360`	`return;`
`358`	`361`	`}`
`359`	`362`
`360`		`- _updateFunc = updateFunc;`
`361`		`-`
`362`	`363`	`foreach (var url in Global.OtherGeoUrls)`
`363`	`364`	`{`
`364`	`365`	`var fileName = Path.GetFileName(url);`
`365`	`366`	`var targetPath = Utils.GetBinPath($"{fileName}");`
`366`	`367`
`367`		`- await DownloadGeoFile(url, fileName, targetPath, updateFunc);`
	`368`	`+ await DownloadGeoFile(url, fileName, targetPath);`
`368`	`369`	`}`
`369`	`370`	`}`
`370`	`371`
`371`		`- private async Task UpdateSrsFileAll(Config config, Func<bool, string, Task> updateFunc)`
	`372`	`+ private async Task UpdateSrsFileAll()`
`372`	`373`	`{`
`373`		`- _updateFunc = updateFunc;`
`374`		`-`
`375`	`374`	`var geoipFiles = new List<string>();`
`376`	`375`	`var geoSiteFiles = new List<string>();`
`377`	`376`
`@@ -414,29 +413,29 @@ private async Task UpdateSrsFileAll(Config config, Func<bool, string, Task> upda`
`414`	`413`	`}`
`415`	`414`	`foreach (var item in geoipFiles.Distinct())`
`416`	`415`	`{`
`417`		`- await UpdateSrsFile("geoip", item, config, updateFunc);`
	`416`	`+ await UpdateSrsFile("geoip", item);`
`418`	`417`	`}`
`419`	`418`
`420`	`419`	`foreach (var item in geoSiteFiles.Distinct())`
`421`	`420`	`{`
`422`		`- await UpdateSrsFile("geosite", item, config, updateFunc);`
	`421`	`+ await UpdateSrsFile("geosite", item);`
`423`	`422`	`}`
`424`	`423`	`}`
`425`	`424`
`426`		`- private async Task UpdateSrsFile(string type, string srsName, Config config, Func<bool, string, Task> updateFunc)`
	`425`	`+ private async Task UpdateSrsFile(string type, string srsName)`
`427`	`426`	`{`
`428`		`- var srsUrl = string.IsNullOrEmpty(config.ConstItem.SrsSourceUrl)`
	`427`	`+ var srsUrl = string.IsNullOrEmpty(_config.ConstItem.SrsSourceUrl)`
`429`	`428`	`? Global.SingboxRulesetUrl`
`430`		`- : config.ConstItem.SrsSourceUrl;`
	`429`	`+ : _config.ConstItem.SrsSourceUrl;`
`431`	`430`
`432`	`431`	`var fileName = $"{type}-{srsName}.srs";`
`433`	`432`	`var targetPath = Path.Combine(Utils.GetBinPath("srss"), fileName);`
`434`	`433`	`var url = string.Format(srsUrl, type, $"{type}-{srsName}", srsName);`
`435`	`434`
`436`		`- await DownloadGeoFile(url, fileName, targetPath, updateFunc);`
	`435`	`+ await DownloadGeoFile(url, fileName, targetPath);`
`437`	`436`	`}`
`438`	`437`
`439`		`- private async Task DownloadGeoFile(string url, string fileName, string targetPath, Func<bool, string, Task> updateFunc)`
	`438`	`+ private async Task DownloadGeoFile(string url, string fileName, string targetPath)`
`440`	`439`	`{`
`441`	`440`	`var tmpFileName = Utils.GetTempPath(Utils.GetGuid());`
`442`	`441`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ async Task _updateUI(bool success, string msg)`
`148`	`148`	`UpdatedPlusPlus(_geo, "");`
`149`	`149`	`}`
`150`	`150`	`}`
`151`		`- await new UpdateService().UpdateGeoFileAll(_config, _updateUI)`
	`151`	`+ await new UpdateService(_config, _updateUI).UpdateGeoFileAll()`
`152`	`152`	`.ContinueWith(t => UpdatedPlusPlus(_geo, ""));`
`153`	`153`	`}`
`154`	`154`
`@@ -163,7 +163,7 @@ async Task _updateUI(bool success, string msg)`
`163`	`163`	`UpdatedPlusPlus(_v2rayN, msg);`
`164`	`164`	`}`
`165`	`165`	`}`
`166`		`- await new UpdateService().CheckUpdateGuiN(_config, _updateUI, preRelease)`
	`166`	`+ await new UpdateService(_config, _updateUI).CheckUpdateGuiN(preRelease)`
`167`	`167`	`.ContinueWith(t => UpdatedPlusPlus(_v2rayN, ""));`
`168`	`168`	`}`
`169`	`169`
`@@ -180,7 +180,7 @@ async Task _updateUI(bool success, string msg)`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`	`var type = (ECoreType)Enum.Parse(typeof(ECoreType), model.CoreType);`
`183`		`- await new UpdateService().CheckUpdateCore(type, _config, _updateUI, preRelease)`
	`183`	`+ await new UpdateService(_config, _updateUI).CheckUpdateCore(type, preRelease)`
`184`	`184`	`.ContinueWith(t => UpdatedPlusPlus(model.CoreType, ""));`
`185`	`185`	`}`
`186`	`186`
Original file line number	Diff line number	Diff line change
`@@ -596,7 +596,7 @@ public async Task ApplyRegionalPreset(EPresetType type)`
`596`	`596`	`AppEvents.RoutingsMenuRefreshRequested.Publish();`
`597`	`597`
`598`	`598`	`await ConfigHandler.SaveConfig(_config);`
`599`		`- await new UpdateService().UpdateGeoFileAll(_config, UpdateTaskHandler);`
	`599`	`+ await new UpdateService(_config, UpdateTaskHandler).UpdateGeoFileAll();`
`600`	`600`	`await Reload();`
`601`	`601`	`}`
`602`	`602`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ private void LstProfiles_LoadingRow(object? sender, DataGridRowEventArgs e)`
`90`	`90`
`91`	`91`	`private void LstProfiles_DoubleTapped(object? sender, TappedEventArgs e)`
`92`	`92`	`{`
`93`		`- // 忽略表头区域的双击`
	`93`	`+ // Ignore double-taps on the column header area`
`94`	`94`	`if (e.Source is Control src)`
`95`	`95`	`{`
`96`	`96`	`if (src.FindAncestorOfType<DataGridColumnHeader>() != null)`
`@@ -99,7 +99,7 @@ private void LstProfiles_DoubleTapped(object? sender, TappedEventArgs e)`
`99`	`99`	`return;`
`100`	`100`	`}`
`101`	`101`
`102`		`- // 仅当在数据行或其子元素上双击时才触发选择`
	`102`	`+ // Only trigger selection when double-tapped on a data row or its child element`
`103`	`103`	`if (src.FindAncestorOfType<DataGridRow>() != null)`
`104`	`104`	`{`
`105`	`105`	`ViewModel?.SelectFinish();`
`@@ -110,7 +110,7 @@ private void LstProfiles_DoubleTapped(object? sender, TappedEventArgs e)`
`110`	`110`
`111`	`111`	`private void LstProfiles_Sorting(object? sender, DataGridColumnEventArgs e)`
`112`	`112`	`{`
`113`		`- // 自定义排序，防止默认行为导致误触发`
	`113`	`+ // Custom sort to prevent unintended default behavior`
`114`	`114`	`e.Handled = true;`
`115`	`115`	`if (ViewModel != null && e.Column?.Tag?.ToString() != null)`
`116`	`116`	`{`