v4.1.0

Author: Decimation

.gitignore

@@ -457,6 +457,10 @@ Test/
 Test/*
 /Test/Test.csproj
 /Test/Program.cs
+SmartImage.Test/
+SmartImage.Test/*
+/SmartImage.Test/Test.csproj
+/SmartImage.Test/Program.cs
 SmartImage.Lib.UnitTest/
 SmartImage.Lib.UnitTest/*
 SmartImage.Benchmark/

SmartImage.Lib/Clients/Booru/BaseBooruClient.cs

@@ -1,15 +1,18 @@
-using System;
+using SmartImage.Lib.Utilities;
+using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace SmartImage.Lib.Clients.Booru;
+// TODO
 
 public abstract class BaseBooruClient : IDisposable
 {
 
-	public Url BaseUrl { get;}
+	public Url BaseUrl { get; }
 
 	public abstract string Name { get; }
 
@@ -18,9 +21,6 @@ protected BaseBooruClient(Url baseUrl)
 		BaseUrl = baseUrl;
 	}
 
-	public virtual void Dispose()
-	{
-			
-	}
+	public virtual void Dispose() { }
 
 }

SmartImage.Lib/Clients/Booru/BaseGelbooruClient.cs

@@ -1,9 +1,12 @@
-using System.Reflection;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
 using Flurl.Http;
+using SmartImage.Lib.Utilities;
 
 namespace SmartImage.Lib.Clients.Booru;
 
 // TODO
+
 public abstract class BaseGelbooruClient : BaseBooruClient
 {
 

SmartImage.Lib/Clients/Booru/Rule34Booru.cs

@@ -1,7 +1,11 @@
 // Author: Deci | Project: SmartImage.Lib | Name: Rule34Booru.cs
 // Date: 2024/06/18 @ 14:06:04
 
+using System.Diagnostics.CodeAnalysis;
+using SmartImage.Lib.Utilities;
+
 namespace SmartImage.Lib.Clients.Booru;
+// TODO
 
 public class Rule34Booru : BaseGelbooruClient
 {

SmartImage.Lib/Clients/FlareSolverrClient.cs

@@ -9,8 +9,6 @@ namespace SmartImage.Lib.Clients;
 public sealed class FlareSolverrClient : IDisposable
 {
 
-	public ClearanceHandler Clearance { get; private set; }
-
 	[MNNW(true, nameof(Client))]
 	public bool HasClient => Client != null;
 
@@ -20,26 +18,27 @@ public sealed class FlareSolverrClient : IDisposable
 	[MNNW(true, nameof(Clearance), nameof(Client))]
 	public bool IsInitialized => HasClearance && HasClient;
 
+	public ClearanceHandler Clearance { get; private set; }
+
 	public HttpClient Client { get; private set; }
 
 	public bool Configure(string api)
 	{
-		Clearance?.Dispose();
-		Client?.Dispose();
+		Dispose();
 
 		Clearance = new ClearanceHandler(api)
 		{
 			EnsureResponseIntegrity = false
 		};
+		
 		Client = new HttpClient(Clearance);
+
 		return HasClient;
 	}
 
 	private FlareSolverrClient() { }
 
-	public static FlareSolverrClient Value { get; private set; } = new FlareSolverrClient();
-
-	#region IDisposable
+	public static FlareSolverrClient Value { get; private set; } = new();
 
 	public void Dispose()
 	{
@@ -49,6 +48,4 @@ public void Dispose()
 		Client    = null;
 	}
 
-	#endregion
-
 }

SmartImage.Lib/Clients/HydrusClient.cs

@@ -16,15 +16,15 @@
 using System.Threading.Tasks;
 using Flurl.Http;
 using Novus.Streams;
+using SmartImage.Lib.Utilities;
 using JsonObject = System.Json.JsonObject;
 using JsonValue = System.Json.JsonValue;
 
 namespace SmartImage.Lib.Clients;
 
 public class HydrusClient : INotifyPropertyChanged, IDisposable
 {
-
-	private const string HDR_HYDRUS_KEY = "Hydrus-Client-API-Access-Key";
+	private const string HDR_HYDRUS_KEY  = "Hydrus-Client-API-Access-Key";
 
 	public FlurlClient Client { get; }
 

SmartImage.Lib/Engines/BaseSearchEngine.cs

@@ -115,7 +115,7 @@ public override string ToString()
 		return $"{Name}: {BaseUrl} {Timeout}";
 	}
 
-	public virtual async Task<SearchResult> GetResultAsync(SearchQuery query, CancellationToken token = default)
+	public virtual Task<SearchResult> GetResultAsync(SearchQuery query, CancellationToken token = default)
 	{
 		var b = VerifyQuery(query);
 
@@ -141,7 +141,7 @@ public virtual async Task<SearchResult> GetResultAsync(SearchQuery query, Cancel
 
 		Debug.WriteLine($"{Name} | {query} - {res.Status}", LogCategories.C_INFO);
 
-		return res;
+		return Task.FromResult(res);
 	}
 
 	protected virtual Url GetRawUrl(SearchQuery query)

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

@@ -262,7 +262,7 @@ protected override ValueTask<SearchResultItem> ParseResultItem(INode nx, SearchR
 		return ValueTask.FromResult(sri);
 	}
 
-	public async ValueTask<bool> ApplyCookiesAsync(ICookiesProvider provider, CancellationToken ct = default)
+	public async ValueTask<bool> ApplyCookiesAsync(ICookiesProvider provider, CancellationToken ct)
 	{
 		if (FlareSolverrClient.Value.IsInitialized) {
 			return false;