Update subscription using Task.Run

2025-08-28 13:56:20 +00:00 · 2025-08-27 17:14:24 +08:00 · 2025-08-27 17:14:24 +08:00 · fe7c505cc9
commit fe7c505cc9
parent 0d5afa4ff5
9 changed files with 534 additions and 497 deletions
--- a/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs
+++ b/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs
@ -197,6 +197,8 @@ public static class SubscriptionHandler
            updateFunc?.Invoke(false, $"{hashCode}{result}");
        }

+        updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgStartParsingSubscription}");
+
        // Add servers to configuration
        var ret = await ConfigHandler.AddBatchServers(config, result, id, true);
        if (ret <= 0)
--- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@ -1860,6 +1860,15 @@ namespace ServiceLib.Resx {
            }
        }
        
+        /// <summary>
+        ///   查找类似 Start parsing and processing subscription content 的本地化字符串。
+        /// </summary>
+        public static string MsgStartParsingSubscription {
+            get {
+                return ResourceManager.GetString("MsgStartParsingSubscription", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 Started updating {0}... 的本地化字符串。
        /// </summary>
@ -3736,28 +3745,9 @@ namespace ServiceLib.Resx {
        ///   查找类似 Auto Route 的本地化字符串。
        /// </summary>
        public static string TbSettingsTunAutoRoute {
-            get { return ResourceManager.GetString("TbSettingsTunAutoRoute", resourceCulture); }
-        }
-
-        /// <summary>
-        ///   查找类似 Strict Route 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsTunStrictRoute {
-            get { return ResourceManager.GetString("TbSettingsTunStrictRoute", resourceCulture); }
-        }
-
-        /// <summary>
-        ///   查找类似 Stack 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsTunStack {
-            get { return ResourceManager.GetString("TbSettingsTunStack", resourceCulture); }
-        }
-
-        /// <summary>
-        ///   查找类似 MTU 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsTunMtu {
-            get { return ResourceManager.GetString("TbSettingsTunMtu", resourceCulture); }
+            get {
+                return ResourceManager.GetString("TbSettingsTunAutoRoute", resourceCulture);
+            }
        }
        
        /// <summary>
@ -3769,6 +3759,33 @@ namespace ServiceLib.Resx {
            }
        }
        
+        /// <summary>
+        ///   查找类似 MTU 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsTunMtu {
+            get {
+                return ResourceManager.GetString("TbSettingsTunMtu", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Stack 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsTunStack {
+            get {
+                return ResourceManager.GetString("TbSettingsTunStack", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Strict Route 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsTunStrictRoute {
+            get {
+                return ResourceManager.GetString("TbSettingsTunStrictRoute", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   查找类似 Enable UDP 的本地化字符串。
        /// </summary>
--- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@ -1509,4 +1509,7 @@
  <data name="TbFullConfigTemplateDesc" xml:space="preserve">
    <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
  </data>
+  <data name="MsgStartParsingSubscription" xml:space="preserve">
+    <value>Start parsing and processing subscription content</value>
+  </data>
 </root>
--- a/v2rayN/ServiceLib/Resx/ResUI.hu.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
@ -1509,4 +1509,7 @@
  <data name="TbFullConfigTemplateDesc" xml:space="preserve">
    <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
  </data>
+  <data name="MsgStartParsingSubscription" xml:space="preserve">
+    <value>Start parsing and processing subscription content</value>
+  </data>
 </root>
--- a/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.resx
@ -1509,4 +1509,7 @@
  <data name="TbFullConfigTemplateDesc" xml:space="preserve">
    <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
  </data>
+  <data name="MsgStartParsingSubscription" xml:space="preserve">
+    <value>Start parsing and processing subscription content</value>
+  </data>
 </root>
--- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@ -1509,4 +1509,7 @@
  <data name="TbFullConfigTemplateDesc" xml:space="preserve">
    <value>Эта функция предназначена для продвинутых пользователей и особых случаев. После включения игнорируются базовые настройки ядра, DNS и маршрутизации. Вы должны самостоятельно корректно задать порт системного прокси, учёт трафика и другие связанные параметры — всё настраивается вручную.</value>
  </data>
+  <data name="MsgStartParsingSubscription" xml:space="preserve">
+    <value>Start parsing and processing subscription content</value>
+  </data>
 </root>
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@ -1506,4 +1506,7 @@
  <data name="TbFullConfigTemplateDesc" xml:space="preserve">
    <value>此功能供高级用户和有特殊需求的用户使用。 启用此功能后，将忽略 Core 的基础设置，DNS 设置 ，路由设置。你需要保证系统代理的端口和流量统计等功能的配置正确，一切都由你来设置。</value>
  </data>
+  <data name="MsgStartParsingSubscription" xml:space="preserve">
+    <value>开始解析和处理订阅内容</value>
+  </data>
 </root>
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@ -1506,4 +1506,7 @@
  <data name="TbFullConfigTemplateDesc" xml:space="preserve">
    <value>This feature is intended for advanced users and those with special requirements. Once enabled, it will ignore the Core's basic settings, DNS settings, and routing settings. You must ensure that the system proxy port, traffic statistics, and other related configurations are set correctly — everything will be configured by you.</value>
  </data>
+  <data name="MsgStartParsingSubscription" xml:space="preserve">
+    <value>開始解析和處理訂閱內容</value>
+  </data>
 </root>
--- a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@ -477,7 +477,7 @@ public class MainWindowViewModel : MyReactiveObject

    public async Task UpdateSubscriptionProcess(string subId, bool blProxy)
    {
-        await SubscriptionHandler.UpdateProcess(_config, subId, blProxy, UpdateTaskHandler);
+        await Task.Run(async () => await SubscriptionHandler.UpdateProcess(_config, subId, blProxy, UpdateTaskHandler));
    }

    #endregion Subscription