Merge pull request #30 from zxbmmmmmmmmm/refactor/perf

Refactor/perf
zxbmmmmmmmmm · Feb 3, 2024 · 4a7572f · 4a7572f
2 parents 8283e02 + e86126b
commit 4a7572f
Show file tree

Hide file tree

Showing 71 changed files with 282 additions and 557 deletions.
diff --git a/FluentWeather.OpenMeteoProvider/Models/OpenMeteoAirCondition.cs b/FluentWeather.OpenMeteoProvider/Models/OpenMeteoAirCondition.cs
@@ -4,7 +4,7 @@
 
 namespace FluentWeather.OpenMeteoProvider.Models;
 
-public class OpenMeteoAirCondition : AirConditionBase
+public sealed class OpenMeteoAirCondition : AirConditionBase
 {
     public override string? AqiCategory => UnitConverter.GetAqiCategoryUS(Aqi);
 }
diff --git a/FluentWeather.OpenMeteoProvider/Models/OpenMeteoDailyForecast.cs b/FluentWeather.OpenMeteoProvider/Models/OpenMeteoDailyForecast.cs
@@ -5,6 +5,6 @@
 
 namespace FluentWeather.OpenMeteoProvider.Models;
 
-public class OpenMeteoDailyForecast : WeatherDailyBase
+public sealed class OpenMeteoDailyForecast : WeatherDailyBase
 {
 }
diff --git a/FluentWeather.OpenMeteoProvider/Models/OpenMeteoHourlyForecast.cs b/FluentWeather.OpenMeteoProvider/Models/OpenMeteoHourlyForecast.cs
@@ -3,7 +3,7 @@
 
 namespace FluentWeather.OpenMeteoProvider.Models;
 
-public class OpenMeteoHourlyForecast : WeatherHourlyBase, ICloudAmount
+public sealed class OpenMeteoHourlyForecast : WeatherHourlyBase, ICloudAmount
 {
     public int? CloudAmount { get ; set; }
 }
diff --git a/FluentWeather.OpenMeteoProvider/Models/OpenMeteoWeatherNow.cs b/FluentWeather.OpenMeteoProvider/Models/OpenMeteoWeatherNow.cs
@@ -3,6 +3,6 @@
 
 namespace FluentWeather.OpenMeteoProvider.Models;
 
-public class OpenMeteoWeatherNow : WeatherNowBase
+public sealed class OpenMeteoWeatherNow : WeatherNowBase
 {
 }
diff --git a/FluentWeather.OpenMeteoProvider/OpenMeteoProvider.cs b/FluentWeather.OpenMeteoProvider/OpenMeteoProvider.cs
@@ -13,7 +13,7 @@
 
 namespace FluentWeather.OpenMeteoProvider;
 
-public class OpenMeteoProvider : ProviderBase, ICurrentWeatherProvider, IAirConditionProvider, IDailyForecastProvider, IHourlyForecastProvider
+public sealed class OpenMeteoProvider : ProviderBase, ICurrentWeatherProvider, IAirConditionProvider, IDailyForecastProvider, IHourlyForecastProvider
 {
     public override string Name => "OpenMeteo";
     public override string Id => "open-meteo";

diff --git a/FluentWeather.QGeoApi/ApiContracts/GeolocationApi.cs b/FluentWeather.QGeoApi/ApiContracts/GeolocationApi.cs
@@ -7,6 +7,7 @@
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using FluentWeather.QGeoApi.Bases;
+using System;
 
 namespace FluentWeather.QGeoApi.ApiContracts
 {
@@ -27,7 +28,7 @@ public Task<HttpRequestMessage> GenerateRequestMessageAsync(ApiHandlerOption opt
             {
                 query = $"?key={option.Token}&location={byName.Name}";
             }
-            if(option.Language is not null)
+            if (option.Language is not null)
                 query += $"&lang={option.Language}";
             var requestMessage = new HttpRequestMessage(Method, Url + query);
 

diff --git a/FluentWeather.QGeoProvider/Models/QGeolocation.cs b/FluentWeather.QGeoProvider/Models/QGeolocation.cs
@@ -4,7 +4,7 @@
 
 namespace FluentWeather.QGeoProvider.Models
 {
-    public class QGeolocation : GeolocationBase
+    public sealed class QGeolocation : GeolocationBase
     {
         public QGeolocation(string name,double lon, double lat):base(name,lon,lat)
         {

diff --git a/FluentWeather.QGeoProvider/QGeoProvider.cs b/FluentWeather.QGeoProvider/QGeoProvider.cs
@@ -32,7 +32,7 @@ public void GetSettings()
             Option.Token = settingsHelper?.ReadLocalSetting(Id + "." + QGeoSettings.Token, "");
             var language = settingsHelper?.ReadLocalSetting<string>(QGeoSettings.Language.ToString(), null);
             if (language is null) return;
-            if (language.Contains("-") && !language.Contains("zh"))
+            if (language.Contains("-") && !language.Contains("zh-hant"))
             {
                 Option.Language = language.Remove(language.IndexOf("-", StringComparison.Ordinal));
             }

diff --git a/FluentWeather.QWeatherApi/ApiContracts/AirConditionApi.cs b/FluentWeather.QWeatherApi/ApiContracts/AirConditionApi.cs
@@ -7,13 +7,13 @@
 
 namespace FluentWeather.QWeatherApi.ApiContracts
 {
-    public class AirConditionApi : QApiContractBase<AirConditionResponse>
+    public sealed class AirConditionApi : QApiContractBase<AirConditionResponse>
     {
         public override HttpMethod Method => HttpMethod.Get;
 
         public override string Path => ApiConstants.Weather.AirCondition;
     }
-    public class AirConditionResponse:QWeatherResponseBase
+    public sealed class AirConditionResponse:QWeatherResponseBase
     {
         [JsonPropertyName("now")]
         public AirConditionItem AirConditionNow { get; set; }

diff --git a/FluentWeather.QWeatherApi/ApiContracts/PrecipitationApi.cs b/FluentWeather.QWeatherApi/ApiContracts/PrecipitationApi.cs
@@ -7,13 +7,13 @@
 
 namespace FluentWeather.QWeatherApi.ApiContracts
 {
-    public class PrecipitationApi : QApiContractBase<PrecipitationResponse>
+    public sealed class PrecipitationApi : QApiContractBase<PrecipitationResponse>
     {
         public override HttpMethod Method => HttpMethod.Get;
 
         public override string Path => ApiConstants.Weather.MinutelyPrecipitation;
     }
-    public class PrecipitationResponse:QWeatherResponseBase
+    public sealed class PrecipitationResponse:QWeatherResponseBase
     {
         [JsonPropertyName("minutely")]
         public List<PrecipitationItem> MinutelyPrecipitations { get; set; }

diff --git a/FluentWeather.QWeatherApi/ApiContracts/TyphoonForecastApi.cs b/FluentWeather.QWeatherApi/ApiContracts/TyphoonForecastApi.cs
@@ -9,7 +9,7 @@
 
 namespace FluentWeather.QWeatherApi.ApiContracts
 {
-    public class TyphoonForecastApi : QApiContractBase<TyphoonForecastRequest, TyphoonForecastResponse>
+    public sealed class TyphoonForecastApi : QApiContractBase<TyphoonForecastRequest, TyphoonForecastResponse>
     {
         public override HttpMethod Method => HttpMethod.Get;
 
@@ -19,11 +19,11 @@ public async override Task<HttpRequestMessage> GenerateRequestMessageAsync(ApiHa
             return (await base.GenerateRequestMessageAsync(option)).AddQuery($"&stormid={Request.TyphoonId}");
         }
     }
-    public class TyphoonForecastRequest : RequestBase
+    public sealed class TyphoonForecastRequest : RequestBase
     {
         public string TyphoonId { get; set; }
     }
-    public class TyphoonForecastResponse
+    public sealed class TyphoonForecastResponse
     {
         [JsonPropertyName("forecast")]
         public List<TyphoonForecastItem> Forecasts { get; set; }

diff --git a/FluentWeather.QWeatherApi/ApiContracts/TyphoonListApi.cs b/FluentWeather.QWeatherApi/ApiContracts/TyphoonListApi.cs
@@ -8,7 +8,7 @@
 
 namespace FluentWeather.QWeatherApi.ApiContracts;
 
-public class TyphoonListApi : QApiContractBase<RequestBase,TyphoonListResponse>
+public sealed class TyphoonListApi : QApiContractBase<RequestBase,TyphoonListResponse>
 {
     public override HttpMethod Method => HttpMethod.Get;
 
@@ -22,7 +22,7 @@ public async override Task<HttpRequestMessage> GenerateRequestMessageAsync(ApiHa
         return res;
     }
 }
-public class TyphoonListResponse
+public sealed class TyphoonListResponse
 {
     [JsonPropertyName("storm")]
     public List<TyphoonListItem> Typhoons { get; set; }

diff --git a/FluentWeather.QWeatherApi/ApiContracts/TyphoonTrackApi.cs b/FluentWeather.QWeatherApi/ApiContracts/TyphoonTrackApi.cs
@@ -13,7 +13,7 @@ namespace FluentWeather.QWeatherApi.ApiContracts;
 /// <summary>
 /// 台风当前情况和历史
 /// </summary>
-public class TyphoonTrackApi : QApiContractBase<TyphoonTrackRequest, TyphoonTrackResponse>
+public sealed class TyphoonTrackApi : QApiContractBase<TyphoonTrackRequest, TyphoonTrackResponse>
 {
     public override HttpMethod Method => HttpMethod.Get;
 
@@ -23,11 +23,11 @@ public async override Task<HttpRequestMessage> GenerateRequestMessageAsync(ApiHa
         return (await base.GenerateRequestMessageAsync(option)).AddQuery($"&stormid={Request.TyphoonId}");
     }
 }
-public class TyphoonTrackRequest:RequestBase
+public sealed class TyphoonTrackRequest:RequestBase
 {
     public string TyphoonId { get; set; }
 }
-public class TyphoonTrackResponse
+public sealed class TyphoonTrackResponse
 {
     [JsonPropertyName("isActive")]
     public string IsActive { get;set; }
@@ -38,7 +38,7 @@ public class TyphoonTrackResponse
     [JsonPropertyName("track")]
     public List<TyphoonTrackItem> Tracks { get; set; }
 }
-public class TyphoonTrackItem
+public sealed class TyphoonTrackItem
 {
     [JsonPropertyName("pubTime")]
     private string _pubTime 
@@ -83,7 +83,7 @@ private string _pubTime
     public WindRadiusItem WindRadius12 { get; set; }
 
 
-    public class WindRadiusItem
+    public sealed class WindRadiusItem
     {
         [JsonPropertyName("neRadius")]
         public string NeRadius { get; set; }

diff --git a/FluentWeather.QWeatherApi/ApiContracts/WeatherDailyApi.cs b/FluentWeather.QWeatherApi/ApiContracts/WeatherDailyApi.cs
@@ -7,7 +7,7 @@
 
 namespace FluentWeather.QWeatherApi.ApiContracts;
 
-public class WeatherDailyApi:QApiContractBase<WeatherDailyResponse>
+public sealed class WeatherDailyApi:QApiContractBase<WeatherDailyResponse>
 {
     public override HttpMethod Method => HttpMethod.Get;
     public override string Path => ApiConstants.Weather.DailyForecast7D;
@@ -23,7 +23,7 @@ public async override Task<HttpRequestMessage> GenerateRequestMessageAsync(ApiHa
     }
 }
 
-public class WeatherDailyResponse : QWeatherResponseBase
+public sealed class WeatherDailyResponse : QWeatherResponseBase
 {
     [JsonPropertyName("daily")]
     public List<DailyForecastItem> DailyForecasts { get; set; }

diff --git a/FluentWeather.QWeatherApi/ApiContracts/WeatherHourlyApi.cs b/FluentWeather.QWeatherApi/ApiContracts/WeatherHourlyApi.cs
@@ -6,7 +6,7 @@
 
 namespace FluentWeather.QWeatherApi.ApiContracts;
 
-public class WeatherHourlyApi: QApiContractBase<WeatherHourlyResponse>
+public sealed class WeatherHourlyApi: QApiContractBase<WeatherHourlyResponse>
 {
     public override HttpMethod Method => HttpMethod.Get;
     public override string Path => ApiConstants.Weather.HourlyForecast24H;
@@ -21,10 +21,10 @@ public async override Task<HttpRequestMessage> GenerateRequestMessageAsync(ApiHa
         return res;
     }
 }
-public class WeatherHourlyResponse : QWeatherResponseBase
+public sealed class WeatherHourlyResponse : QWeatherResponseBase
 {
     [JsonPropertyName("hourly")] public List<HourlyForecastItem> HourlyForecasts { get; set; }
-    public class HourlyForecastItem
+    public sealed class HourlyForecastItem
     {
         [JsonPropertyName("fxTime")]
         public string FxTime { get; set; }

diff --git a/FluentWeather.QWeatherApi/ApiContracts/WeatherIndicesApi.cs b/FluentWeather.QWeatherApi/ApiContracts/WeatherIndicesApi.cs
@@ -6,7 +6,7 @@
 
 namespace FluentWeather.QWeatherApi.ApiContracts;
 
-public class WeatherIndicesApi : QApiContractBase<WeatherIndicesResponse>
+public sealed class WeatherIndicesApi : QApiContractBase<WeatherIndicesResponse>
 {
     public override HttpMethod Method => HttpMethod.Get;
     public override string Path => ApiConstants.Weather.WeatherIndices1D;
@@ -19,7 +19,7 @@ public override async Task<HttpRequestMessage> GenerateRequestMessageAsync(ApiHa
         return res;
     }
 }
-public class WeatherIndicesResponse : QWeatherResponseBase
+public sealed class WeatherIndicesResponse : QWeatherResponseBase
 {
     [JsonPropertyName("daily")] public List<IndicesItem> Indices { get; set; }
     public class IndicesItem

diff --git a/FluentWeather.QWeatherApi/ApiContracts/WeatherNowApi.cs b/FluentWeather.QWeatherApi/ApiContracts/WeatherNowApi.cs
@@ -4,16 +4,16 @@
 
 namespace FluentWeather.QWeatherApi.ApiContracts;
 
-public class WeatherNowApi: QApiContractBase<WeatherNowResponse>
+public sealed class WeatherNowApi: QApiContractBase<WeatherNowResponse>
 {
     public override HttpMethod Method => HttpMethod.Get;
     public override string Path => ApiConstants.Weather.Now;
 }
-public class WeatherNowResponse : QWeatherResponseBase
+public sealed class WeatherNowResponse : QWeatherResponseBase
 {
     [JsonPropertyName("now")]
     public WeatherNowItem WeatherNow { get; set; }
-    public class WeatherNowItem
+    public sealed class WeatherNowItem
     {
         [JsonPropertyName("obsTime")]
         public string ObsTime { get; set; }

diff --git a/FluentWeather.QWeatherApi/ApiContracts/WeatherWarningApi.cs b/FluentWeather.QWeatherApi/ApiContracts/WeatherWarningApi.cs
@@ -5,16 +5,16 @@
 
 namespace FluentWeather.QWeatherApi.ApiContracts;
 
-public class WeatherWarningApi: QApiContractBase<WeatherWarningResponse>
+public sealed class WeatherWarningApi: QApiContractBase<WeatherWarningResponse>
 {
     public override HttpMethod Method => HttpMethod.Get;
     public override string Path => ApiConstants.Weather.WarningNow;
 }
-public class WeatherWarningResponse : QWeatherResponseBase
+public sealed class WeatherWarningResponse : QWeatherResponseBase
 {
     [JsonPropertyName("warning")]
     public List<WeatherWarningItem> Warnings { get; set; }
-    public class WeatherWarningItem
+    public sealed class WeatherWarningItem
     {
         [JsonPropertyName("id")]
         public string Id { get; set; }

diff --git a/FluentWeather.QWeatherProvider/Models/QAirCondition.cs b/FluentWeather.QWeatherProvider/Models/QAirCondition.cs
@@ -6,7 +6,7 @@
 
 namespace FluentWeather.QWeatherProvider.Models
 {
-    public class QAirCondition:AirConditionBase,IAirPollutants
+    public sealed class QAirCondition:AirConditionBase,IAirPollutants
     {
         public string Link{ get; set; }
     }

diff --git a/FluentWeather.QWeatherProvider/Models/QTyphoon.cs b/FluentWeather.QWeatherProvider/Models/QTyphoon.cs
@@ -6,10 +6,10 @@
 
 namespace FluentWeather.QWeatherProvider.Models
 {
-    public class QTyphoon:TyphoonBase
+    public sealed class QTyphoon:TyphoonBase
     {
     }
-    public class QTyphoonTrack : TyphoonTrackBase, IWindRadius
+    public sealed class QTyphoonTrack : TyphoonTrackBase, IWindRadius
     {
         public WindRadius WindRadius7 { get ; set ; }
         public WindRadius WindRadius10 { get ; set ; }

diff --git a/FluentWeather.QWeatherProvider/Models/QWeatherDailyForecast.cs b/FluentWeather.QWeatherProvider/Models/QWeatherDailyForecast.cs
@@ -5,7 +5,7 @@
 using FluentWeather.QWeatherProvider.Helpers;
 
 namespace FluentWeather.QWeatherProvider.Models;
-public class QWeatherDailyForecast : WeatherDailyBase
+public sealed class QWeatherDailyForecast : WeatherDailyBase
 {
     public override WeatherCode WeatherType => WeatherTypeConverter.GetWeatherTypeByDescription(Description);
 }
diff --git a/FluentWeather.QWeatherProvider/Models/QWeatherHourlyForecast.cs b/FluentWeather.QWeatherProvider/Models/QWeatherHourlyForecast.cs
@@ -5,7 +5,7 @@
 
 namespace FluentWeather.QWeatherProvider.Models;
 
-public class QWeatherHourlyForecast :WeatherHourlyBase,  ICloudAmount
+public sealed class QWeatherHourlyForecast :WeatherHourlyBase,  ICloudAmount
 {
     public override WeatherCode WeatherType => WeatherTypeConverter.GetWeatherTypeByDescription(Description);
     public int? CloudAmount { get; set; }

diff --git a/FluentWeather.QWeatherProvider/Models/QWeatherIndices.cs b/FluentWeather.QWeatherProvider/Models/QWeatherIndices.cs
@@ -3,7 +3,7 @@
 
 namespace FluentWeather.QWeatherProvider.Models;
 
-public class QWeatherIndices : IndicesBase
+public sealed class QWeatherIndices : IndicesBase
 {
     public DateTime Date { get; set; }
 

diff --git a/FluentWeather.QWeatherProvider/Models/QWeatherNight.cs b/FluentWeather.QWeatherProvider/Models/QWeatherNight.cs
@@ -4,7 +4,7 @@
 
 namespace FluentWeather.QWeatherProvider.Models;
 
-public class QWeatherNight : WeatherBase, IWind
+public sealed class QWeatherNight : WeatherBase, IWind
 {
     public override WeatherCode WeatherType => WeatherTypeConverter.GetWeatherTypeByDescription(Description);
     public string WindDirectionDescription { get; set; }

diff --git a/FluentWeather.QWeatherProvider/Models/QWeatherNow.cs b/FluentWeather.QWeatherProvider/Models/QWeatherNow.cs
@@ -4,7 +4,7 @@
 
 namespace FluentWeather.QWeatherProvider.Models;
 
-public class QWeatherNow : WeatherNowBase
+public sealed class QWeatherNow : WeatherNowBase
 {
     public override WeatherCode WeatherType => WeatherTypeConverter.GetWeatherTypeByDescription(Description);
 }
diff --git a/FluentWeather.QWeatherProvider/Models/QWeatherPrecipitation.cs b/FluentWeather.QWeatherProvider/Models/QWeatherPrecipitation.cs
@@ -6,11 +6,11 @@
 
 namespace FluentWeather.QWeatherProvider.Models
 {
-    public class QWeatherPrecipitation : PrecipitationBase
+    public sealed class QWeatherPrecipitation : PrecipitationBase
     {
     }
 
-    public class QWeatherPrecipitationItem:PrecipitationItemBase
+    public sealed class QWeatherPrecipitationItem:PrecipitationItemBase
     {
     }
 }
diff --git a/FluentWeather.QWeatherProvider/Models/QWeatherWarning.cs b/FluentWeather.QWeatherProvider/Models/QWeatherWarning.cs
@@ -2,7 +2,7 @@
 
 namespace FluentWeather.QWeatherProvider.Models;
 
-public class QWeatherWarning:WeatherWarningBase
+public sealed class QWeatherWarning:WeatherWarningBase
 {
 
 }