deps: remove deprecated dependency

Author: SALTWOOD

CSharp-OpenBMCLAPI/CSharp-OpenBMCLAPI.csproj

@@ -13,7 +13,6 @@
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.3" />
-    <PackageReference Include="SaltWood.TeraIO" Version="1.1.0" />
     <PackageReference Include="ShellProgressBar" Version="5.2.0" />
     <PackageReference Include="SocketIOClient" Version="3.1.2" />
     <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="10.0.0-rc.1.25451.107" />

CSharp-OpenBMCLAPI/Modules/Cluster.cs

@@ -1,7 +1,4 @@
 using CSharpOpenBMCLAPI.Modules.Storage;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Newtonsoft.Json;
 using ShellProgressBar;
@@ -12,8 +9,6 @@
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Text.Json;
-using System.Threading.RateLimiting;
-using TeraIO.Runnable;
 using ZstdSharp;
 
 namespace CSharpOpenBMCLAPI.Modules
@@ -63,8 +58,7 @@ public Cluster(AppContext context)
                     this.storage = new FileStorage(AppContext.Config.clusterFileDirectory);
                     break;
                 case StorageType.WebDav:
-                    this.storage = new WebDavStorage();
-                    break;
+                    throw new Exception("WebDav storage is deprecated, use Alist instead.");
                 case StorageType.Alist:
                     this.storage = new AlistStorage();
                     break;

CSharp-OpenBMCLAPI/Modules/Storage/WebDavStorage.cs

@@ -9,7 +9,6 @@
 using System.Security.Principal;
 using System.Text;
 using System.Text.Json;
-using TeraIO.Runnable;
 
 namespace CSharpOpenBMCLAPI.Modules
 {
@@ -196,11 +195,11 @@ static long ToDecimal(string hex)
         public static Dictionary<string, string> GetQueryStrings(string? query)
         {
             Dictionary<string, string> pairs = new();
-            query?.Split('&').ForEach(s =>
+            if (query is null) return pairs;
+            foreach (var s in query.Split('&'))
             {
-                var pair = s.Split('=');
-                pairs[pair[0]] = pair[1];
-            });
+                pairs[s.Split('=').First()] = s.Split('=').Last();
+            }
             return pairs;
         }
 

CSharp-OpenBMCLAPI/Modules/Utils.cs

@@ -1,58 +1,22 @@
 using CSharpOpenBMCLAPI.Modules;
 using Newtonsoft.Json;
-using TeraIO.Runnable;
 using YamlDotNet.Serialization;
 using AppContext = CSharpOpenBMCLAPI.Modules.AppContext;
 
 namespace CSharpOpenBMCLAPI
 {
-    internal class Program : RunnableBase
+    internal class Program
     {
-        public Program() : base() { }
+        public Program() : base()
+        {
+        }
 
         static void Main(string[] args)
         {
             Logger.Instance.LogSystem($"Starting CSharp-OpenBMCLAPI v{AppContext.Config.clusterVersion}");
             Logger.Instance.LogSystem("高性能、低メモリ占有！");
             Logger.Instance.LogSystem($"运行时环境：{Utils.GetRuntime()}");
-            Program program = new Program();
-            program.Start();
-            program.WaitForStop();
-        }
 
-        protected Config GetConfig()
-        {
-            const string configFileName = "config.yml";
-            string configPath = Path.Combine(AppContext.Config.clusterWorkingDirectory, configFileName);
-            if (!File.Exists(configPath))
-            {
-                Config config = new Config();
-                Serializer serializer = new Serializer();
-                File.WriteAllText(configPath, serializer.Serialize(config));
-                return config;
-            }
-            else
-            {
-                string file = File.ReadAllText(configPath);
-                Deserializer deserializer = new Deserializer();
-                Config? config = deserializer.Deserialize<Config>(file);
-                Config result;
-                if (config != null)
-                {
-                    result = config;
-                }
-                else
-                {
-                    result = new Config();
-                }
-                Serializer serializer = new Serializer();
-                File.WriteAllText(configPath, serializer.Serialize(config));
-                return result;
-            }
-        }
-
-        protected override int Run(string[] args)
-        {
             try
             {
                 Directory.CreateDirectory(AppContext.Config.clusterWorkingDirectory);
@@ -61,14 +25,15 @@ protected override int Run(string[] args)
                 string bsonFilePath = Path.Combine(AppContext.Config.clusterWorkingDirectory, bsonFile);
                 AppContext.Config = GetConfig();
 
-                int returns = 0;
-
                 const string environment = "working/.env.json";
 
-                if (!File.Exists(environment)) throw new FileNotFoundException($"请在程序目录下新建 {environment} 文件，然后填入 \"ClusterId\" 和 \"ClusterSecret\"以启动集群！");
+                if (!File.Exists(environment))
+                    throw new FileNotFoundException(
+                        $"请在程序目录下新建 {environment} 文件，然后填入 \"ClusterId\" 和 \"ClusterSecret\"以启动集群！");
 
                 // 从 .env.json 读取密钥然后 FetchToken
-                ClusterInfo info = JsonConvert.DeserializeObject<ClusterInfo>(File.ReadAllTextAsync(environment).Result);
+                ClusterInfo info =
+                    JsonConvert.DeserializeObject<ClusterInfo>(File.ReadAllTextAsync(environment).Result);
                 AppContext requiredData = new(info);
                 Logger.Instance.LogSystem($"Cluster id: {info.clusterId}");
                 TokenManager token = new TokenManager(info);
@@ -86,14 +51,35 @@ protected override int Run(string[] args)
                 };
 
                 cluster.Start();
-                return returns;
             }
             catch (Exception ex)
             {
                 Console.WriteLine(ex.ExceptionToDetail());
                 Console.ReadKey();
-                return -1;
+            }
+        }
+
+        private static Config GetConfig()
+        {
+            const string configFileName = "config.yml";
+            string configPath = Path.Combine(AppContext.Config.clusterWorkingDirectory, configFileName);
+            if (!File.Exists(configPath))
+            {
+                Config config = new Config();
+                Serializer serializer = new Serializer();
+                File.WriteAllText(configPath, serializer.Serialize(config));
+                return config;
+            }
+            else
+            {
+                string file = File.ReadAllText(configPath);
+                Deserializer deserializer = new Deserializer();
+                Config config = deserializer.Deserialize<Config>(file);
+                var result = config;
+                Serializer serializer = new Serializer();
+                File.WriteAllText(configPath, serializer.Serialize(config));
+                return result;
             }
         }
     }
-}
+}