support custom pow provider

Archeb · Sep 2, 2023 · 2a14c76 · 2a14c76
1 parent 4759b4d
commit 2a14c76
Show file tree

Hide file tree

Showing 10 changed files with 86 additions and 11 deletions.
diff --git a/NextTraceWrapper.cs b/NextTraceWrapper.cs
@@ -158,6 +158,7 @@ public void Run(string host,bool MTRMode, params string[] extraArgs)
                 if (UserSettings.ChunZhenEndpoint != "") _process.StartInfo.EnvironmentVariables.Add("NEXTTRACE_CHUNZHENURL", UserSettings.ChunZhenEndpoint);
                 if (UserSettings.LeoMoeAPI_HOSTPORT != "") _process.StartInfo.EnvironmentVariables.Add("NEXTTRACE_HOSTPORT", UserSettings.LeoMoeAPI_HOSTPORT);
                 if (UserSettings.NextTraceProxy != "") _process.StartInfo.EnvironmentVariables.Add("NEXTTRACE_PROXY", UserSettings.NextTraceProxy);
+                if (UserSettings.POWProvider != "") _process.StartInfo.EnvironmentVariables.Add("NEXTTRACE_POWPROVIDER", UserSettings.POWProvider);
 
                 if (MTRMode) // 添加环境变量让NextTrace进入持续追踪模式
                     _process.StartInfo.EnvironmentVariables.Add("NEXTTRACE_UNINTERRUPTED", "1");

diff --git a/OpenTrace.csproj b/OpenTrace.csproj
@@ -14,7 +14,7 @@
     <Title>OpenTrace</Title>
     <ApplicationIcon>icon.ico</ApplicationIcon>
     <PackageIcon>icon.png</PackageIcon>
-    <Version>1.3.0.0</Version>
+    <Version>1.3.0.1</Version>
 
   </PropertyGroup>
 

diff --git a/PreferencesDialog.xeto b/PreferencesDialog.xeto
@@ -116,6 +116,13 @@
 											<Label Text="{x:Static resource:Resources.LEOMOEAPI_HOSTPORT}"></Label>
 											<TextBox x:Name="LeoMoeAPI_HOSTPORT" Text=""></TextBox>
 										</TableRow>
+										<TableRow>
+											<Label Text="{x:Static resource:Resources.POW_PROVIDER}"></Label>
+											<DropDown x:Name="POWProvider" SelectedIndex="0">
+												<ListItem Text="{x:Static resource:Resources.POW_PROVIDER_LEOMOE}" Key="api.leo.moe"></ListItem>
+												<ListItem Text="{x:Static resource:Resources.POW_PROVIDER_SAKURA}" Key="sakura"></ListItem>
+											</DropDown>
+										</TableRow>
 										<TableRow>
 											<Label Text="{x:Static resource:Resources.NEXTTRACE_PROXY}"></Label>
 											<TextBox x:Name="NextTraceProxy" PlaceholderText="protocol://username:password@host:port" Text=""></TextBox>

diff --git a/Program.cs b/Program.cs
@@ -2,6 +2,7 @@
 using Eto.Drawing;
 using Eto.Forms;
 using System;
+using System.Collections.ObjectModel;
 using System.Configuration;
 using System.Globalization;
 using System.Runtime.InteropServices;
@@ -20,17 +21,17 @@ static void Main(string[] args)
             {
                 System.Threading.Thread.CurrentThread.CurrentUICulture = new CultureInfo(UserSettings.language);
             }
-            if(UserSettings.mapProvider == "" && UserSettings.mapProvider != null)
+
+            // 本地化设置
+            if (System.Threading.Thread.CurrentThread.CurrentUICulture.Name == "zh-CN" && TimeZoneInfo.Local.Id == "China Standard Time")
+            {
+                if (UserSettings.mapProvider == "" && UserSettings.mapProvider != null) UserSettings.mapProvider = "baidu";
+                if (UserSettings.POWProvider == "" && UserSettings.POWProvider != null) UserSettings.POWProvider = "sakura";
+            }
+            else
             {
-                // 本地化地图供应商设置
-                if (System.Threading.Thread.CurrentThread.CurrentUICulture.Name == "zh-CN")
-                {
-                    UserSettings.mapProvider = "baidu"; 
-                }
-                else
-                {
-                    UserSettings.mapProvider = "google";
-                }
+                if (UserSettings.mapProvider == "" && UserSettings.mapProvider != null) UserSettings.mapProvider = "google";
+                if (UserSettings.POWProvider == "" && UserSettings.POWProvider != null) UserSettings.POWProvider = "api.leo.moe";
             }
 
             new Application(Eto.Platform.Detect).Run(new MainForm());

diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
@@ -333,6 +333,15 @@ To use an offline database, please refer to the NextTrace documentation to set i
   <data name="PARALLEL_REQ" xml:space="preserve">
     <value>Parallel Requests</value>
   </data>
+  <data name="POW_PROVIDER" xml:space="preserve">
+    <value>LeoMoeAPI PoW Provider</value>
+  </data>
+  <data name="POW_PROVIDER_LEOMOE" xml:space="preserve">
+    <value>api.leo.moe (Default)</value>
+  </data>
+  <data name="POW_PROVIDER_SAKURA" xml:space="preserve">
+    <value>Nya Labs (China Mainland Optimized)</value>
+  </data>
   <data name="PREFERENCES" xml:space="preserve">
     <value>Preferences</value>
   </data>

diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx
@@ -327,6 +327,15 @@ sudo chmod +sx /path/to/nexttrace
   <data name="PARALLEL_REQ" xml:space="preserve">
     <value>并行请求数</value>
   </data>
+  <data name="POW_PROVIDER" xml:space="preserve">
+    <value>LeoMoeAPI PoW 服务器</value>
+  </data>
+  <data name="POW_PROVIDER_LEOMOE" xml:space="preserve">
+    <value>api.leo.moe (默认)</value>
+  </data>
+  <data name="POW_PROVIDER_SAKURA" xml:space="preserve">
+    <value>Nya Labs (中国大陆优化)</value>
+  </data>
   <data name="PREFERENCES" xml:space="preserve">
     <value>设置</value>
   </data>

diff --git a/Properties/Resources.zh-HK.resx b/Properties/Resources.zh-HK.resx
@@ -324,6 +324,15 @@ sudo chmod +sx /path/to/nexttrace
   <data name="PARALLEL_REQ" xml:space="preserve">
     <value>並行請求數</value>
   </data>
+  <data name="POW_PROVIDER" xml:space="preserve">
+    <value>LeoMoeAPI PoW 服務器</value>
+  </data>
+  <data name="POW_PROVIDER_LEOMOE" xml:space="preserve">
+    <value>api.leo.moe (默認)</value>
+  </data>
+  <data name="POW_PROVIDER_SAKURA" xml:space="preserve">
+    <value>Nya Labs (中國大陸優化)</value>
+  </data>
   <data name="PREFERENCES" xml:space="preserve">
     <value>設置</value>
   </data>

diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx
@@ -324,6 +324,15 @@ sudo chmod +sx /path/to/nexttrace
   <data name="PARALLEL_REQ" xml:space="preserve">
     <value>並行請求數</value>
   </data>
+  <data name="POW_PROVIDER" xml:space="preserve">
+    <value>LeoMoeAPI PoW 伺服器</value>
+  </data>
+  <data name="POW_PROVIDER_LEOMOE" xml:space="preserve">
+    <value>api.leo.moe (默認)</value>
+  </data>
+  <data name="POW_PROVIDER_SAKURA" xml:space="preserve">
+    <value>Nya Labs (中國大陸優化)</value>
+  </data>
   <data name="PREFERENCES" xml:space="preserve">
     <value>設定</value>
   </data>

diff --git a/UserSettings.cs b/UserSettings.cs
@@ -90,5 +90,8 @@ internal class UserSettings : Advexp.Settings<UserSettings>
 
         [Setting(Name = "customDNSResolvers", Default = "8.8.8.8#Google DNS\nhttps://cloudflare-dns.com/dns-query#CloudFlare DoH")]
         public static string customDNSResolvers { get; set; }
+
+        [Setting(Name = "POWProvider", Default = "")]
+        public static string POWProvider { get; set; }
     }
 }