perf: Filtering empty data in the configuration

ZGGSONG · Mar 4, 2024 · e8c588b · e8c588b
1 parent cbd4078
commit e8c588b
Show file tree

Hide file tree

Showing 15 changed files with 114 additions and 6 deletions.
diff --git a/STranslate/ViewModels/Preference/Services/TranslatorAli.cs b/STranslate/ViewModels/Preference/Services/TranslatorAli.cs
@@ -6,6 +6,7 @@
 using STranslate.Model;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -60,14 +61,20 @@ public TranslatorAli(
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _url = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _AppID = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _appKey = string.Empty;
 
         [JsonIgnore]
@@ -120,6 +127,7 @@ private void ShowEncryptInfo(string? obj)
          * @return Client
          * @throws Exception
          */
+
         public static Client CreateClient(string accessKeyId, string accessKeySecret, string url)
         {
             if (url.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
@@ -175,4 +183,4 @@ public Task TranslateAsync(object request, Action<string> OnDataReceived, Cancel
             throw new NotImplementedException();
         }
     }
-}
+}
diff --git a/STranslate/ViewModels/Preference/Services/TranslatorApi.cs b/STranslate/ViewModels/Preference/Services/TranslatorApi.cs
@@ -4,6 +4,7 @@
 using STranslate.Util;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -57,14 +58,20 @@ public TranslatorApi(
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _url = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _AppID = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _appKey = string.Empty;
 
         [JsonIgnore]
@@ -76,7 +83,8 @@ public TranslatorApi(
         public List<IconType> Icons { get; private set; } = Enum.GetValues(typeof(IconType)).OfType<IconType>().ToList();
 
         [JsonIgnore]
-        public string Tips { get; set; } = @"请求:
+        public string Tips { get; set; } =
+            @"请求:
 {
     ""text"": ""test"",
     ""source_lang"": ""auto"",

diff --git a/STranslate/ViewModels/Preference/Services/TranslatorBaidu.cs b/STranslate/ViewModels/Preference/Services/TranslatorBaidu.cs
@@ -5,6 +5,7 @@
 using STranslate.Util;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -58,14 +59,20 @@ public TranslatorBaidu(
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _url = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _AppID = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _appKey = string.Empty;
 
         [JsonIgnore]

diff --git a/STranslate/ViewModels/Preference/Services/TranslatorCaiyun.cs b/STranslate/ViewModels/Preference/Services/TranslatorCaiyun.cs
@@ -6,6 +6,7 @@
 using STranslate.Util;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -59,14 +60,20 @@ public TranslatorCaiyun(
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _url = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _AppID = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _appKey = string.Empty;
 
         [JsonIgnore]
@@ -123,10 +130,7 @@ public async Task<TranslationResult> TranslateAsync(object request, Cancellation
                     detect = true
                 };
 
-                var headers = new Dictionary<string, string>
-                {
-                    { "X-Authorization", $"token {AppKey}" },
-                };
+                var headers = new Dictionary<string, string> { { "X-Authorization", $"token {AppKey}" }, };
 
                 string resp = await HttpUtil.PostAsync(Url, JsonConvert.SerializeObject(body), null, headers, token);
                 if (string.IsNullOrEmpty(resp))

diff --git a/STranslate/ViewModels/Preference/Services/TranslatorEcdict.cs b/STranslate/ViewModels/Preference/Services/TranslatorEcdict.cs
@@ -7,6 +7,7 @@
 using STranslate.Util;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
@@ -68,14 +69,20 @@ public TranslatorEcdict(
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _url = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _AppID = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _appKey = string.Empty;
 
         [JsonIgnore]
@@ -147,6 +154,7 @@ private void ShowEncryptInfo(string? obj)
         private string _dbFileSize = "";
 
         [RelayCommand]
+        [property: JsonIgnore]
         private async Task DownloadResource()
         {
             ProcessValue = 0;
@@ -223,6 +231,7 @@ private void ProcessDownloadedFile()
         }
 
         [RelayCommand]
+        [property: JsonIgnore]
         private void DeleteResource()
         {
             try

diff --git a/STranslate/ViewModels/Preference/Services/TranslatorGemini.cs b/STranslate/ViewModels/Preference/Services/TranslatorGemini.cs
@@ -5,6 +5,7 @@
 using STranslate.Util;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -59,14 +60,20 @@ public TranslatorGemini(
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _url = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _AppID = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _appKey = string.Empty;
 
         [JsonIgnore]

diff --git a/STranslate/ViewModels/Preference/Services/TranslatorMicrosoft.cs b/STranslate/ViewModels/Preference/Services/TranslatorMicrosoft.cs
@@ -5,6 +5,7 @@
 using STranslate.Util;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -58,14 +59,20 @@ public TranslatorMicrosoft(
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _url = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _AppID = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _appKey = string.Empty;
 
         [JsonIgnore]

diff --git a/STranslate/ViewModels/Preference/Services/TranslatorNiutrans.cs b/STranslate/ViewModels/Preference/Services/TranslatorNiutrans.cs
@@ -6,6 +6,7 @@
 using STranslate.Util;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -59,14 +60,20 @@ public TranslatorNiutrans(
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _url = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _AppID = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _appKey = string.Empty;
 
         [JsonIgnore]

diff --git a/STranslate/ViewModels/Preference/Services/TranslatorOpenAI.cs b/STranslate/ViewModels/Preference/Services/TranslatorOpenAI.cs
@@ -6,6 +6,7 @@
 using STranslate.Util;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -59,18 +60,26 @@ public TranslatorOpenAI(
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _url = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _AppID = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _appKey = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         private string _model = "gpt-3.5-turbo";
 
         [JsonIgnore]

diff --git a/STranslate/ViewModels/Preference/Services/TranslatorSTranslate.cs b/STranslate/ViewModels/Preference/Services/TranslatorSTranslate.cs
@@ -6,6 +6,7 @@
 using STranslate.Util;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading;
@@ -60,14 +61,20 @@ public TranslatorSTranslate(
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _url = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _AppID = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _appKey = string.Empty;
 
         [JsonIgnore]

diff --git a/STranslate/ViewModels/Preference/Services/TranslatorTencent.cs b/STranslate/ViewModels/Preference/Services/TranslatorTencent.cs
@@ -4,6 +4,7 @@
 using STranslate.Model;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -62,14 +63,20 @@ public TranslatorTencent(
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _url = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _AppID = string.Empty;
 
         [JsonIgnore]
         [ObservableProperty]
+        [property: DefaultValue("")]
+        [property: JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string _appKey = string.Empty;
 
         [JsonIgnore]