***

Author: Decimation

SmartImage.Benchmark/Benchmark1.cs

@@ -7,7 +7,7 @@
 using SmartImage.Lib;
 
 namespace SmartImage.Benchmark;
-
+#pragma warning disable CS8618
 public class Benchmark1
 {
 

SmartImage.Lib 3/Clients/HydrusClient.cs

@@ -12,6 +12,7 @@
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
 using System.Threading.Tasks;
 using Flurl.Http;
 using Novus.Streams;
@@ -164,6 +165,7 @@ public string EndpointUrl
 
     public void Dispose()
     {
+        GC.SuppressFinalize(this);
         Client.Dispose();
     }
 
@@ -182,6 +184,7 @@ protected bool SetField<T>(ref T field, T value, [CallerMemberName] string prope
         return true;
     }
 }
+#pragma warning disable IL2026
 
 public partial class FileRelationship
 {
@@ -212,7 +215,7 @@ public partial class FileRelationship
     public static Dictionary<string, FileRelationship> Deserialize(JsonValue v)
     {
         var vs = ((JsonObject)v)["file_relationships"];
-
+        
         var re = JsonSerializer.Deserialize<Dictionary<string, FileRelationship>>(vs.ToString());
 
         return re;

SmartImage.Lib 3/Engines/BaseSearchEngine.cs

@@ -39,7 +39,7 @@ public abstract class BaseSearchEngine : IDisposable
 
 	protected long     MaxSize  { get; set; } = NA_SIZE;
 
-	protected virtual string[] ErrorBodyMessages { get; } = Array.Empty<string>();
+	protected virtual string[] ErrorBodyMessages { get; } = [];
 
 	protected BaseSearchEngine(string baseUrl)
 	{

SmartImage.Lib 3/Engines/Impl/Search/Ascii2DEngine.cs

@@ -130,11 +130,11 @@ private async Task<IFlurlResponse> GetResponseByUrlAsync(Url origin, Cancellatio
 	}
 
 	protected override string[] ErrorBodyMessages
-		=> new[]
-		{
+		=>
+		[
 			"検索できるのは 縦 10000px での画像です。",
 			"ごく最近、このURLからのダウンロードに失敗しています。少し時間を置いてください。"
-		};
+		];
 
 	protected override ValueTask<SearchResultItem> ParseResultItem(INode nx, SearchResult r)
 	{

SmartImage.Lib 3/Engines/Impl/Search/EHentaiEngine.cs

@@ -419,7 +419,7 @@ public static EhResult Parse(INode n)
 								eh.Tags[tag].Add(val);
 							}
 							else {
-								eh.Tags.TryAdd(tag, new() { val });
+								eh.Tags.TryAdd(tag, [val]);
 
 							}
 						}

SmartImage.Lib 3/Engines/Impl/Search/IqdbEngine.cs

@@ -167,7 +167,7 @@ private async Task<IDocument> GetDocumentAsync(SearchQuery query, CancellationTo
 		}
 	}
 
-	protected override string[] ErrorBodyMessages => new[] { "Can't read query result!", "too large" };
+	protected override string[] ErrorBodyMessages => ["Can't read query result!", "too large"];
 
 	public override async Task<SearchResult> GetResultAsync(SearchQuery query, CancellationToken token = default)
 	{
@@ -198,7 +198,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 
 		var err = doc.Body.GetElementsByClassName("err");
 
-		if (err.Any()) {
+		if (err.Length!=0) {
 			var fe = err[0];
 			sr.Status       = SearchResultStatus.Failure;
 			sr.ErrorMessage = $"{fe.TextContent}";
@@ -249,7 +249,11 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 
 	#region
 
-	public override void Dispose() { }
+	public override void Dispose()
+	{
+		// base.Dispose();
+		GC.SuppressFinalize(this);
+	}
 
 	#endregion
 

SmartImage.Lib 3/Engines/Impl/Search/SauceNaoEngine.cs

@@ -41,9 +41,9 @@ internal static class Constants
 		public const string Material = "Material:";
 		public const string Source   = "Source:";
 
-		public static readonly string[] Syn_Artists    = { "Creator(s):", "Creator:", "Member:", "Artist:", "Author:" };
+		public static readonly string[] Syn_Artists    = ["Creator(s):", "Creator:", "Member:", "Artist:", "Author:"];
 
-		public static readonly string[] Syn_Characters = { "Characters:" };
+		public static readonly string[] Syn_Characters = ["Characters:"];
 	}
 
 	private const string BASE_URL = "https://saucenao.com/";
@@ -108,7 +108,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 			// .OrderByDescending(e => e.Similarity)
 			.ToList();
 
-		if (!imageResults.Any()) {
+		if (imageResults.Count == 0) {
 			// No good results
 			//return sresult;
 			result.Status = SearchResultStatus.NoResults;
@@ -504,9 +504,9 @@ public SearchResultItem Convert(SearchResult r)
 
 			string[] urls = (Urls != null)
 				                ? Urls.Distinct().Where(s => !string.IsNullOrWhiteSpace(s)).ToArray()
-				                : Array.Empty<string>();
+				                : [];
 
-			string[] meta = Array.Empty<string>();
+			string[] meta = [];
 
 			if ((urls.Length >= 2)) {
 				meta = urls[1..].Where(u => !((Url) u).QueryParams.Contains("lookup_type")).ToArray();

SmartImage.Lib 3/Engines/Impl/Search/YandexEngine.cs

@@ -42,7 +42,7 @@ private static string GetAnalysis(IDocument doc)
 
 		nodes.AddRange(nodes2);
 
-		if (!nodes.Any()) {
+		if (nodes.Count==0) {
 			return null;
 		}
 
@@ -199,7 +199,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 	/// <summary>
 	/// Parses <em>Similar images</em>
 	/// </summary>
-	private IEnumerable<SearchResultItem> ParseSimilarImages(IDocument doc, SearchResult r)
+	private List<SearchResultItem> ParseSimilarImages(IParentNode doc, SearchResult r)
 	{
 		var nodes   = doc.QuerySelectorAll(Serialization.S_Yandex_SimilarImages);
 		var results = new List<SearchResultItem>(nodes.Length);
@@ -225,15 +225,15 @@ private IEnumerable<SearchResultItem> ParseSimilarImages(IDocument doc, SearchRe
 	/// <summary>
 	/// Parses <em>Sites containing information about the image</em>
 	/// </summary>
-	private static IEnumerable<SearchResultItem> ParseExternalInfo(IDocument doc, SearchResult r)
+	private static List<SearchResultItem> ParseExternalInfo(IDocument doc, SearchResult r)
 	{
 		var items = doc.Body.SelectNodes(Serialization.S_Yandex_ExtInfo);
 		var rg    = new List<SearchResultItem>(items.Count);
 
 		foreach (INode item in items) {
 			if (item is IHtmlElement elem) {
 				var title1 = elem.QuerySelector(".CbirSites-ItemTitle");
-				var href1 = title1.Children[0].Attributes["href"];
+				// var href1 = title1.Children[0].Attributes["href"];
 			}
 			// var thumb = item.ChildNodes[0];
 			var info  = item.ChildNodes[1];
@@ -263,18 +263,18 @@ private static IEnumerable<SearchResultItem> ParseExternalInfo(IDocument doc, Se
 	public override void Dispose() { }
 
 	protected override string[] ErrorBodyMessages
-		=> new[]
-		{
+		=>
+		[
 			"Please confirm that you and not a robot are sending requests",
-			"Изображение не загрузилось, попробуйте загрузить другое.",
+			"Изображение не загрузилось, попробуйте загрузить другое."
 			// "No matching images found"
-		};
+		];
 
 	protected override async ValueTask<INode[]> GetNodes(IDocument doc)
 	{
 		var tagsItem = doc.Body.SelectNodes(NodesSelector);
 
-		if (!tagsItem.Any()) {
+		if (tagsItem.Count==0) {
 			// return await Task.FromResult(Enumerable.Empty<INode>());
 			return await Task.FromResult(tagsItem.ToArray()).ConfigureAwait(false);
 			// return tagsItem;

SmartImage.Lib 3/Engines/Impl/Upload/BaseUploadEngine.cs

@@ -114,7 +114,7 @@ protected virtual async Task<UploadResult> ProcessResultAsync(IFlurlResponse res
 
 		}
 
-		ret:
+	ret:
 
 		return new()
 		{
@@ -147,7 +147,9 @@ protected void Verify(string file)
 }*/
 	public static BaseUploadEngine Default { get; set; } = PomfEngine.Instance;
 
-	public void Dispose() { }
-
-}
+	public void Dispose()
+	{
+		GC.SuppressFinalize(this);
+	}
 
+}

SmartImage.Lib 3/Model/BaseImageHost.cs

@@ -21,10 +21,10 @@ public class GenericImageHost : BaseImageHost
 	public static readonly BaseImageHost Instance = new GenericImageHost();
 
 	public override string[] Illegal
-		=> new[]
-		{
+		=>
+		[
 			"thumbnail", "avatar", "error", "logo"
-		};
+		];
 
 	public override bool Refine(string b)
 	{