Fixes; refactoring

Author: Decimation

SmartImage.Lib/Clients/Booru/BaseBooruClient.cs

@@ -1,14 +1,17 @@
-using SmartImage.Lib.Utilities;
+
+using SmartImage.Lib.Utilities;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using SmartImage.Lib.Utilities.Diagnostics;
 
 namespace SmartImage.Lib.Clients.Booru;
-// TODO
 
+// TODO
+[Experimental(AppSupport.DIAG_SMRTIMG_EXP001)]
 public abstract class BaseBooruClient : IDisposable
 {
 

SmartImage.Lib/Clients/Booru/BaseGelbooruClient.cs

@@ -2,11 +2,13 @@
 using System.Reflection;
 using Flurl.Http;
 using SmartImage.Lib.Utilities;
+using SmartImage.Lib.Utilities.Diagnostics;
 
 namespace SmartImage.Lib.Clients.Booru;
 
 // TODO
 
+[Experimental(AppSupport.DIAG_SMRTIMG_EXP001)]
 public abstract class BaseGelbooruClient : BaseBooruClient
 {
 

SmartImage.Lib/Clients/Booru/Rule34Booru.cs

@@ -3,10 +3,12 @@
 
 using System.Diagnostics.CodeAnalysis;
 using SmartImage.Lib.Utilities;
+using SmartImage.Lib.Utilities.Diagnostics;
 
 namespace SmartImage.Lib.Clients.Booru;
 // TODO
 
+[Experimental(AppSupport.DIAG_SMRTIMG_EXP001)]
 public class Rule34Booru : BaseGelbooruClient
 {
 

SmartImage.Lib/Clients/HydrusClient.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;

SmartImage.Lib/Results/Data/BrowserCookiesProvider.cs renamed to SmartImage.Lib/Cookies/BrowserCookiesProvider.cs

@@ -2,17 +2,10 @@
 
 using System.Data;
 using System.Diagnostics;
-using System.Net;
 using System.Runtime.Caching;
-using System.Runtime.CompilerServices;
-using AngleSharp.Css.Dom;
-using Flurl.Http;
 using Kantan.Net.Web;
 
-namespace SmartImage.Lib.Results.Data;
-
-using System.Runtime.Caching;
-using Results.Data;
+namespace SmartImage.Lib.Cookies;
 
 public class BrowserCookiesProvider : ICookiesProvider
 {

SmartImage.Lib/Results/Data/DefaultCookiesProvider.cs renamed to SmartImage.Lib/Cookies/DefaultCookiesProvider.cs

@@ -3,7 +3,7 @@
 
 using Kantan.Net.Web;
 
-namespace SmartImage.Lib.Results.Data;
+namespace SmartImage.Lib.Cookies;
 
 public class DefaultCookiesProvider : ICookiesProvider
 {

SmartImage.Lib/Results/Data/ICookiesEngine.cs renamed to SmartImage.Lib/Cookies/ICookiesEngine.cs

@@ -2,10 +2,8 @@
 // Date: 2024/06/06 @ 17:06:56
 
 using Flurl.Http;
-using Kantan.Net.Web;
-using SmartImage.Lib.Utilities;
 
-namespace SmartImage.Lib.Results.Data;
+namespace SmartImage.Lib.Cookies;
 
 public interface ICookiesEngine
 {

SmartImage.Lib/Results/Data/ICookiesProvider.cs renamed to SmartImage.Lib/Cookies/ICookiesProvider.cs

@@ -1,12 +1,10 @@
 // Author: Deci | Project: SmartImage.Lib | Name: ICookieProvider.cs
 // Date: 2024/10/15 @ 12:10:00
 
-using System.Net;
-using Flurl.Http;
 using Kantan.Net.Web;
 using SmartImage.Lib.Utilities.Integration;
 
-namespace SmartImage.Lib.Results.Data;
+namespace SmartImage.Lib.Cookies;
 
 public interface ICookiesProvider : IDisposable
 {

SmartImage.Lib/Engines/BaseSearchEngine.cs

@@ -4,10 +4,12 @@
 global using R1 = SmartImage.Lib.Resources;
 global using Url = Flurl.Url;
 using System.Diagnostics;
+using System.Net.Http.Headers;
 using Flurl.Http;
 using Kantan.Diagnostics;
 using Kantan.Net.Utilities;
 using Microsoft.Extensions.Logging;
+using Microsoft.Net.Http.Headers;
 using SmartImage.Lib.Engines.Impl.Search;
 using SmartImage.Lib.Engines.Impl.Search.Other;
 using SmartImage.Lib.Results;
@@ -17,14 +19,23 @@
 namespace SmartImage.Lib.Engines;
 #nullable enable
 
+
+public interface ISearchQueryVerifiable
+{
+
+	public ValueTask<bool> VerifyQueryAsync(SearchQuery query);
+
+}
+
 public abstract class BaseSearchEngine : IDisposable, IEquatable<BaseSearchEngine>
 {
 
 	static BaseSearchEngine()
 	{
 		Client = (FlurlClient) FlurlHttp.Clients.GetOrAdd(nameof(BaseSearchEngine), null, builder =>
 		{
-			builder.Headers.AddOrReplace("User-Agent", HttpUtilities.UserAgent);
+
+			builder.Headers.AddOrReplace(HeaderNames.UserAgent, HttpUtilities.UserAgent);
 
 			// builder.Settings.JsonSerializer = new DefaultJsonSerializer();
 
@@ -41,11 +52,9 @@ static BaseSearchEngine()
 		});
 	}
 
-	protected BaseSearchEngine(Url baseUrl, Url? endpoint = null)
+	protected BaseSearchEngine([NN] Url baseUrl)
 	{
-		BaseUrl     = baseUrl;
-		EndpointUrl = endpoint;
-		MaxSize     = null;
+		BaseUrl = baseUrl;
 	}
 
 	protected static readonly ILogger Logger = AppSupport.Factory.CreateLogger(nameof(BaseSearchEngine));
@@ -61,12 +70,13 @@ protected BaseSearchEngine(Url baseUrl, Url? endpoint = null)
 	/// </summary>
 	public virtual string Name => EngineOption.ToString();
 
+	/// <summary>
+	/// Base URI
+	/// </summary>
 	public virtual Url BaseUrl { get; }
 
 	[JI]
-	public TimeSpan Timeout { get; set; } = TimeSpan.FromSeconds(15);
-
-	public Url? EndpointUrl { get; }
+	public virtual TimeSpan Timeout { get; set; } = TimeSpan.FromSeconds(15);
 
 	[JI]
 	protected long? MaxSize { get; set; }
@@ -131,45 +141,49 @@ public static IEnumerable<BaseSearchEngine> GetSelectedEngines(SearchEngineOptio
 
 	}
 
-	public virtual async Task<SearchResult> GetResultAsync(SearchQuery query, CancellationToken token = default)
+	/*public Task<SearchResult> GetTaskAsync(SearchQuery query, CancellationToken token = default)
 	{
-		var b = await VerifyQueryAsync(query);
+		// TODO
 
-		/*
-		if (!b) {
-			// throw new SmartImageException($"{query}");
-			Debug.WriteLine($"{query} : Verification error", LogCategories.C_ERROR);
+		Task ops;
+		if (this is ISearchQueryVerifiable sq) {
+			ops = sq.VerifyQueryAsync(query);
 		}
-		*/
+
+		var task = GetResultAsync(query, token);
+
+	}*/
+
+	public virtual async Task<SearchResult> GetResultAsync(SearchQuery query, CancellationToken token = default)
+	{
+		var b = await TryVerifyQueryAsync(query);
 
 		var srs = b ? SearchResultStatus.None : SearchResultStatus.IllegalInput;
 
 		var res = new SearchResult(this)
 		{
-			RawUrl       = GetRawUrl(query),
-			ErrorMessage = null,
-			Status       = srs
+			RawUrl = GetRawUrl(query),
+			Status = srs
 		};
 
 		lock (res.Results) {
 			res.Results.Add(res.RawResultItem);
 		}
 
-		Debug.WriteLine($"{Name} | {query} - {res.Status}", LogCategories.C_INFO);
-
+		Logger.LogInformation("{Engine} with {Query} returned {Status}", Name, query, res.Status);
 		return res;
 	}
 
 
 	protected virtual Url GetRawUrl(SearchQuery query)
 	{
 		//
-		Url u = ((BaseUrl + query.Upload));
+		Url u = (BaseUrl + query.Upload);
 
 		return u;
 	}
 
-	public virtual ValueTask<bool> VerifyQueryAsync(SearchQuery q)
+	public virtual ValueTask<bool> TryVerifyQueryAsync(SearchQuery q)
 	{
 		bool b = true;
 
@@ -230,13 +244,9 @@ public bool Equals(BaseSearchEngine? other)
 	}
 
 	public static bool operator ==(BaseSearchEngine? left, BaseSearchEngine? right)
-	{
-		return Equals(left, right);
-	}
+		=> Equals(left, right);
 
 	public static bool operator !=(BaseSearchEngine? left, BaseSearchEngine? right)
-	{
-		return !Equals(left, right);
-	}
+		=> !Equals(left, right);
 
 }

SmartImage.Lib/Engines/IEndpointEngine.cs

@@ -0,0 +1,17 @@
+// Author: Deci | Project: SmartImage.Lib | Name: IEndpointEngine.cs
+// Date: 2025/03/27 @ 12:03:18
+
+using Flurl.Http;
+
+namespace SmartImage.Lib.Engines;
+
+#pragma warning disable CS0649
+
+public interface IEndpointEngine
+{
+
+	public Url EndpointUrl { get; }
+
+	// public IFlurlClient Client { get; }
+
+}