More refactoring

Decimation · Decimation · commit 4fdd882c7714 · 2026-01-09T22:36:35.000-06:00
diff --git a/SmartImage.Lib/Clients/Booru/BaseBooruClient.cs b/SmartImage.Lib/Clients/Booru/BaseBooruClient.cs
@@ -6,21 +6,22 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using SmartImage.Lib.Model;
 
 namespace SmartImage.Lib.Clients.Booru;
 
 // TODO
 [Experimental(AppSupport.DIAG_ID_EXPERIMENTAL)]
-public abstract class BaseBooruClient : IDisposable
+public abstract class BaseBooruClient : IDisposable, IUrl
 {
 
-	public Url BaseUrl { get; }
+	public Url Url { get; }
 
 	public abstract string Name { get; }
 
-	protected BaseBooruClient(Url baseUrl)
+	protected BaseBooruClient(Url url)
 	{
-		BaseUrl = baseUrl;
+		Url = url;
 	}
 
 	public virtual void Dispose()
diff --git a/SmartImage.Lib/Clients/Booru/BaseGelbooruClient.cs b/SmartImage.Lib/Clients/Booru/BaseGelbooruClient.cs
@@ -21,12 +21,12 @@ public abstract class BaseGelbooruClient : BaseBooruClient
 	[CBN]
 	public string Id { get; set; }
 
-	protected BaseGelbooruClient(Url baseUrl) : base(baseUrl)
+	protected BaseGelbooruClient(Url url) : base(url)
 	{
 
 		Client = new FlurlClient()
 		{
-			BaseUrl = baseUrl,
+			BaseUrl = url,
 			Settings =
 			{
 				JsonSerializer = { }
diff --git a/SmartImage.Lib/Clients/FlareSolverrClient.cs b/SmartImage.Lib/Clients/FlareSolverrClient.cs
@@ -44,10 +44,10 @@ public bool Configure(string api)
 
 		s_logger.LogTrace("Init with {Api}", api);
 
-		return HasClient;
+		return IsInitialized;
 	}
 
-	public FlareSolverrClient([CBN] string api = SearchConfig.FLARE_SOLVERR_API_URL_DEFAULT)
+	public FlareSolverrClient([CBN] string api = FLARE_SOLVERR_API_URL_DEFAULT)
 	{
 		Configure(api);
 	}
@@ -72,6 +72,7 @@ public ValueTask<bool> ApplyConfigAsync(SearchConfig cfg, CancellationToken ct =
 		return ValueTask.FromResult(ok);
 	}
 
-	
+
+	public const string FLARE_SOLVERR_API_URL_DEFAULT = "http://localhost:8191";
 
 }
diff --git a/SmartImage.Lib/Engines/BaseSearchEngine.cs b/SmartImage.Lib/Engines/BaseSearchEngine.cs
@@ -22,15 +22,15 @@ namespace SmartImage.Lib.Engines;
 #pragma warning disable CA1822
 #nullable disable
 
-public abstract class BaseSearchEngine : IDisposable, IEquatable<BaseSearchEngine>, ISearchEngine
+public abstract class BaseSearchEngine : IDisposable, IEquatable<BaseSearchEngine>, ISearchEngine, IUrl
 {
 
 	protected static readonly ILogger Logger = AppSupport.Factory.CreateLogger(nameof(BaseSearchEngine));
 
 	/// <summary>
 	/// Base URI
 	/// </summary>
-	public virtual Url BaseUrl { get; }
+	public virtual Url Url { get; }
 
 	public virtual string Name => EngineOption.ToString();
 
@@ -72,9 +72,9 @@ static BaseSearchEngine()
 		});
 	}
 
-	protected BaseSearchEngine([NN] Url baseUrl)
+	protected BaseSearchEngine([NN] Url url)
 	{
-		BaseUrl           = baseUrl;
+		Url           = url;
 		Timeout           = TimeSpan.FromSeconds(30);
 		ErrorBodyMessages = [];
 		MaxLength           = null;
@@ -111,7 +111,7 @@ protected virtual Url GetRawUrl(SearchQuery query)
 			throw new SmartImageException($"{query} not uploaded");
 		}
 
-		Url u = (BaseUrl + query.Upload);
+		Url u = (Url + query.Upload);
 
 		return u;
 	}
@@ -135,7 +135,7 @@ public virtual bool VerifyQuery(SearchQuery q)
 
 	public override string ToString()
 	{
-		return $"{Name}: {BaseUrl} {Timeout}";
+		return $"{Name}: {Url} {Timeout}";
 	}
 
 
diff --git a/SmartImage.Lib/Engines/ParsedSearchEngine.cs b/SmartImage.Lib/Engines/ParsedSearchEngine.cs
@@ -19,7 +19,7 @@ public abstract class ParsedSearchEngine<TItem, TIntermediate, TSource> : BaseSe
 	where TItem : SearchResultItem
 {
 
-	protected ParsedSearchEngine([NN] Url baseUrl) : base(baseUrl) { }
+	protected ParsedSearchEngine([NN] Url url) : base(url) { }
 
 
 	public override async Task<SearchResult> GetResultAsync(SearchQuery query, CancellationToken token = default)
diff --git a/SmartImage.Lib/Engines/Search/ArchiveMoeEngine.cs b/SmartImage.Lib/Engines/Search/ArchiveMoeEngine.cs
@@ -28,16 +28,16 @@ public partial class ArchiveMoeEngine : WebSearchEngine<ChanPost, IList<INode>>
 
 	public ArchiveMoeEngine() : this("https://archived.moe/_/search/") { }
 
-	protected ArchiveMoeEngine(Url baseUrl) : base(baseUrl) { }
+	protected ArchiveMoeEngine(Url url) : base(url) { }
 
 	protected override Url GetRawUrl(SearchQuery query)
 	{
 		Base64MD5Hash = GetBase64MD5Hash(query.Source.Bytes);
 
-		var r = Url.Combine(BaseUrl, "image", Base64MD5Hash);
+		var r = Url.Combine(Url, "image", Base64MD5Hash);
 		return r;
 
-		// return (BaseUrl.AppendPathSegments("image").AppendPathSegment(Base64Hash));
+		// return (Url.AppendPathSegments("image").AppendPathSegment(Base64Hash));
 	}
 
 
diff --git a/SmartImage.Lib/Engines/Search/Ascii2DEngine.cs b/SmartImage.Lib/Engines/Search/Ascii2DEngine.cs
@@ -44,13 +44,14 @@ public sealed class Ascii2DEngine : WebSearchEngine<Ascii2DItem, IList<INode>>,
 
 	public const string MAIN_URL = "https://ascii2d.net/search/url/";
 
-	private FlareSolverrClient m_fsClient;
+	private readonly FlareSolverrClient m_fsClient;
 
 	public Ascii2DEngine() : base(MAIN_URL)
 	{
 		Timeout   = TimeSpan.FromSeconds(30);
 		MaxLength = 10_000_000;
 		Jar       = new CookieJar();
+		m_fsClient = new FlareSolverrClient();
 	}
 
 
@@ -204,7 +205,7 @@ public async ValueTask<bool> ApplyCookiesAsync(ICookiesSource source, Cancellati
 			var ck = bck.AsCookie();
 
 			if (ck.Domain.Contains("ascii2d")) {
-				Jar.AddOrReplace(new FlurlCookie(ck.Name, ck.Value, BaseUrl));
+				Jar.AddOrReplace(new FlurlCookie(ck.Name, ck.Value, Url));
 			}
 		}
 
@@ -215,10 +216,10 @@ public async ValueTask<bool> ApplyCookiesAsync(ICookiesSource source, Cancellati
 	public ValueTask<bool> ApplyConfigAsync(SearchConfig cfg, CancellationToken ct = default)
 	{
 		if (cfg.FlareSolverr) {
-			m_fsClient = new FlareSolverrClient(cfg.FlareSolverrApiUrl);
+			m_fsClient.Configure(cfg.FlareSolverrApiUrl);
 		}
 
-		return ValueTask.FromResult(m_fsClient is not null);
+		return ValueTask.FromResult(m_fsClient.IsInitialized);
 	}
 
 }
@@ -242,7 +243,7 @@ public static Ascii2DItem ParseSource(INode nx, SearchResult r)
 		var imgBox = nxe.Children[0];
 		var thumb  = imgBox.Children[0].Attributes["src"];
 
-		sri.Thumbnail = Url.Combine(r.Engine.BaseUrl.Root, thumb?.Value);
+		sri.Thumbnail = Url.Combine(r.Engine.Url.Root, thumb?.Value);
 
 		var info = n.ChildNodes.Where(static n1 => !string.IsNullOrWhiteSpace(n1.TextContent))
 			.ToArray();
diff --git a/SmartImage.Lib/Engines/Search/EHentaiEngine.cs b/SmartImage.Lib/Engines/Search/EHentaiEngine.cs
@@ -30,34 +30,31 @@ static EHentaiEngine() { }
 
 	public EHentaiEngine(bool useExHentai = true) : base(EHentaiBase)
 	{
-		IsLoggedIn = false;
-
+		IsLoggedIn  = false;
 		UseExHentai = useExHentai;
-
-		Jar = new CookieJar();
+		Jar         = new CookieJar();
 	}
 
 	// NOTE: a separate HttpClient is used for EHentai because of special network requests and other unique requirements...
 
 #region
 
-	public static readonly Url EHentaiIndex  = "https://forums.e-hentai.org/index.php";
-	public static readonly Url EHentaiBase   = "https://e-hentai.org/";
-	public static readonly Url EHentaiLookup = "https://upld.e-hentai.org/image_lookup.php";
-
+	public static readonly Url EHentaiIndex   = "https://forums.e-hentai.org/index.php";
+	public static readonly Url EHentaiBase    = "https://e-hentai.org/";
 	public static readonly Url ExHentaiBase   = "https://exhentai.org/";
+	public static readonly Url EHentaiLookup  = "https://upld.e-hentai.org/image_lookup.php";
 	public static readonly Url ExHentaiLookup = "https://upld.exhentai.org/upld/image_lookup.php";
 
 #region
 
-	public override Url BaseUrl => IsLoggedIn ? ExHentaiBase : EHentaiBase;
-
-	private Url BaseUrl2 => UseExHentai ? ExHentaiBase : EHentaiBase;
+	public override Url Url => IsLoggedIn ? ExHentaiBase : EHentaiBase;
 
-	private Url LookupUrl =>
+	private Url Url2 => UseExHentai ? ExHentaiBase : EHentaiBase;
 
-		// todo: handle UseExHentai
-		IsLoggedIn ? ExHentaiLookup : EHentaiLookup;
+	/// <summary>
+	/// todo: handle UseExHentai
+	/// </summary>
+	private Url LookupUrl => IsLoggedIn ? ExHentaiLookup : EHentaiLookup;
 
 	private const string HOST_EH = ".e-hentai.org";
 	private const string HOST_EX = ".exhentai.org";
@@ -74,7 +71,7 @@ public EHentaiEngine(bool useExHentai = true) : base(EHentaiBase)
 
 	private Task<IFlurlResponse> GetSessionAsync()
 	{
-		return Client.Request(BaseUrl2)
+		return Client.Request(Url2)
 			.WithCookies(Jar)
 			.WithTimeout(Timeout)
 			.WithHeaders(new
@@ -234,7 +231,7 @@ public async ValueTask<bool> ApplyCookiesAsync(ICookiesSource source, Cancellati
 			c |= isEh;
 
 			if (c) {
-				Jar.AddOrReplace(cookie.Name, cookie.Value, BaseUrl2);
+				Jar.AddOrReplace(cookie.Name, cookie.Value, Url2);
 			}
 		}
 
diff --git a/SmartImage.Lib/Engines/Search/GoogleLensEngine.cs b/SmartImage.Lib/Engines/Search/GoogleLensEngine.cs
@@ -33,7 +33,7 @@ public class GoogleLensEngine : WebSearchEngine<GoogleLensItem, IList<INode>>, I
 	public override SearchEngineOptions EngineOption => SearchEngineOptions.GoogleLens;
 
 
-	public override Url BaseUrl => URL_BASE;
+	public override Url Url => URL_BASE;
 
 	public Url Endpoint => URL_BASE;
 
diff --git a/SmartImage.Lib/Engines/Search/IqdbEngine.cs b/SmartImage.Lib/Engines/Search/IqdbEngine.cs
@@ -188,7 +188,7 @@ public static IqdbItem ParseSource(IHtmlCollection<IElement> tr, SearchResult r)
 		var src     = tr[2];
 
 		var img2         = img.Children[0].Children[0].Children[0].Attributes["src"];
-		var thumbnail    = img2 != null ? Url.Combine(r.Engine.BaseUrl.Root, img2.Value) : null;
+		var thumbnail    = img2 != null ? Url.Combine(r.Engine.Url.Root, img2.Value) : null;
 		var thumbnail1   = img.Children[0].Children[0].Attributes["alt"];
 		var thumbnailAlt = thumbnail1?.Value;
 
diff --git a/SmartImage.Lib/Engines/Search/TraceMoeEngine.cs b/SmartImage.Lib/Engines/Search/TraceMoeEngine.cs
@@ -73,7 +73,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 			}
 
 			sr.Status = SearchResultStatus.Success;
-			sr.RawUrl = new Url(BaseUrl + query.Upload);
+			sr.RawUrl = new Url(Url + query.Upload);
 		}
 		catch (Exception e) {
 			sr.ErrorMessage = e.Message;
diff --git a/SmartImage.Lib/Engines/Search/YandexEngine.cs b/SmartImage.Lib/Engines/Search/YandexEngine.cs
@@ -49,7 +49,7 @@ public YandexEngine() : base("https://yandex.com/images/search?rpt=imageview&url
 
 	protected override Url GetRawUrl(SearchQuery query)
 	{
-		var url = BaseUrl.Clone();
+		var url = Url.Clone();
 
 		url.QueryParams.AddOrReplace("url", query.Upload);
 		url.QueryParams.AddOrReplace("cbir_page", "sites");
diff --git a/SmartImage.Lib/Engines/WebSearchEngine.cs b/SmartImage.Lib/Engines/WebSearchEngine.cs
@@ -13,7 +13,7 @@ public abstract class WebSearchEngine<TItem, TIntermediate> : ParsedSearchEngine
 	where TItem : SearchResultItem
 {
 
-	protected WebSearchEngine(Url baseUrl) : base(baseUrl) { }
+	protected WebSearchEngine(Url url) : base(url) { }
 
 	[ICBN]
 	[MURV]
diff --git a/SmartImage.Lib/Images/ImageScanner.cs b/SmartImage.Lib/Images/ImageScanner.cs
@@ -50,6 +50,8 @@
 using System.Threading.Tasks;
 using System.Web;
 
+// ReSharper disable SuggestVarOrType_Elsewhere
+
 // ReSharper disable InconsistentNaming
 
 namespace SmartImage.Lib.Images;
@@ -201,7 +203,7 @@ async ValueTask Body(string s, CancellationToken token)
 			}
 
 			if (uni != UniImage.Null && uni.HasImageFormat) {
-				s_logger.LogTrace("{Name} {Uni}", nameof(ScanForImagesAsync), uni);
+				s_logger.LogTrace("Scan: {Uni}", uni);
 
 				// await cw.WriteAsync(uni, token);
 				await cw.WaitToWriteAsync(token);
@@ -251,10 +253,10 @@ public static IEnumerable<string> ParseImageUrlsByRegex(string html, Url url, bo
 
 			// return baseUrl + URL_DELIM + u;
 			return Url.Combine(baseUrl, URL_DELIM.ToString(), u);
-		}).Select(u => Url.Decode(u, true)).Where(Url.IsValid).Distinct();
+		}).Select(static u => Url.Decode(u, true)).Where(Url.IsValid).Distinct();
 
 		if (heuristicFilter) {
-			abs = abs.Where(u => !UrlSegmentBlacklist.Any(u.Contains));
+			abs = abs.Where(static u => !UrlSegmentBlacklist.Any(u.Contains));
 		}
 
 		return abs;
diff --git a/SmartImage.Lib/Images/ImageUtilities.cs b/SmartImage.Lib/Images/ImageUtilities.cs
@@ -15,28 +15,32 @@ public static class ImageUtilities
 
 	public static IImageHash Hasher { get; set; } = new PerceptualHash();
 
-	extension(ISImage image)
+	public static SizeIS ResizeByFactor(this SizeIS cs, SizeIS newSize)
 	{
+		int origWidth  = cs.Width;
+		int origHeight = cs.Height;
 
-		public ISImage ResizeByFactor(SizeIS newSize)
-		{
-			int origWidth  = image.Width;
-			int origHeight = image.Height;
+		double widthRatio  = (double) newSize.Width  / origWidth;
+		double heightRatio = (double) newSize.Height / origHeight;
+		double scale       = Math.Min(widthRatio, heightRatio);
 
-			double widthRatio  = (double) newSize.Width  / origWidth;
-			double heightRatio = (double) newSize.Height / origHeight;
-			double scale       = Math.Min(widthRatio, heightRatio);
+		int newWidth  = (int) (origWidth  * scale);
+		int newHeight = (int) (origHeight * scale);
 
-			if (scale >= 1.0)
-				return image.Clone();
+		return new SizeIS(newWidth, newHeight);
+	}
 
-			int newWidth  = (int) (origWidth  * scale);
-			int newHeight = (int) (origHeight * scale);
+	extension(ISImage image)
+	{
+
+		public ISImage ResizeByFactor(SizeIS newSize)
+		{
+			var cs = image.Size.ResizeByFactor(newSize);
 
 			// Resize the image
 			var resized = image.Clone(ctx => ctx.Resize(new ResizeOptions()
 			{
-				Size = new SizeIS(newWidth, newHeight),
+				Size = cs,
 
 			}));
 			return resized;
diff --git a/SmartImage.Lib/Images/Uni/UniImageUrl.cs b/SmartImage.Lib/Images/Uni/UniImageUrl.cs
@@ -24,7 +24,6 @@ public class UniImageUrl : UniImage, IUrl
 	internal UniImageUrl(Url url) : base(url?.ToString(), UniImageType.Uri)
 	{
 		Url = url;
-
 	}
 
 	// public override string Name => Url?.GetFileName();
diff --git a/SmartImage.Lib/SearchClient.cs b/SmartImage.Lib/SearchClient.cs
diff --git a/SmartImage.Lib/SearchConfig.cs b/SmartImage.Lib/SearchConfig.cs
diff --git a/SmartImage.Rdx/Commands/Common/CommonCommandSettings.cs b/SmartImage.Rdx/Commands/Common/CommonCommandSettings.cs
diff --git a/SmartImage.Rdx/Commands/Search/SearchCommand.cs b/SmartImage.Rdx/Commands/Search/SearchCommand.cs
diff --git a/SmartImage.Rdx/Program.cs b/SmartImage.Rdx/Program.cs
diff --git a/SmartImage.Rdx/Shell/Elements.cs b/SmartImage.Rdx/Shell/Elements.cs

Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,12 @@ public abstract class BaseGelbooruClient : BaseBooruClient`
`21`	`21`	`[CBN]`
`22`	`22`	`public string Id { get; set; }`
`23`	`23`
`24`		`- protected BaseGelbooruClient(Url baseUrl) : base(baseUrl)`
	`24`	`+ protected BaseGelbooruClient(Url url) : base(url)`
`25`	`25`	`{`
`26`	`26`
`27`	`27`	`Client = new FlurlClient()`
`28`	`28`	`{`
`29`		`- BaseUrl = baseUrl,`
	`29`	`+ BaseUrl = url,`
`30`	`30`	`Settings =`
`31`	`31`	`{`
`32`	`32`	`JsonSerializer = { }`
Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,10 @@ public bool Configure(string api)`
`44`	`44`
`45`	`45`	`s_logger.LogTrace("Init with {Api}", api);`
`46`	`46`
`47`		`- return HasClient;`
	`47`	`+ return IsInitialized;`
`48`	`48`	`}`
`49`	`49`
`50`		`- public FlareSolverrClient([CBN] string api = SearchConfig.FLARE_SOLVERR_API_URL_DEFAULT)`
	`50`	`+ public FlareSolverrClient([CBN] string api = FLARE_SOLVERR_API_URL_DEFAULT)`
`51`	`51`	`{`
`52`	`52`	`Configure(api);`
`53`	`53`	`}`
`@@ -72,6 +72,7 @@ public ValueTask<bool> ApplyConfigAsync(SearchConfig cfg, CancellationToken ct =`
`72`	`72`	`return ValueTask.FromResult(ok);`
`73`	`73`	`}`
`74`	`74`
`75`		`-`
	`75`	`+`
	`76`	`+ public const string FLARE_SOLVERR_API_URL_DEFAULT = "http://localhost:8191";`
`76`	`77`
`77`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,15 +22,15 @@ namespace SmartImage.Lib.Engines;`
`22`	`22`	`#pragma warning disable CA1822`
`23`	`23`	`#nullable disable`
`24`	`24`
`25`		`-public abstract class BaseSearchEngine : IDisposable, IEquatable<BaseSearchEngine>, ISearchEngine`
	`25`	`+public abstract class BaseSearchEngine : IDisposable, IEquatable<BaseSearchEngine>, ISearchEngine, IUrl`
`26`	`26`	`{`
`27`	`27`
`28`	`28`	`protected static readonly ILogger Logger = AppSupport.Factory.CreateLogger(nameof(BaseSearchEngine));`
`29`	`29`
`30`	`30`	`/// <summary>`
`31`	`31`	`/// Base URI`
`32`	`32`	`/// </summary>`
`33`		`- public virtual Url BaseUrl { get; }`
	`33`	`+ public virtual Url Url { get; }`
`34`	`34`
`35`	`35`	`public virtual string Name => EngineOption.ToString();`
`36`	`36`
`@@ -72,9 +72,9 @@ static BaseSearchEngine()`
`72`	`72`	`});`
`73`	`73`	`}`
`74`	`74`
`75`		`- protected BaseSearchEngine([NN] Url baseUrl)`
	`75`	`+ protected BaseSearchEngine([NN] Url url)`
`76`	`76`	`{`
`77`		`- BaseUrl = baseUrl;`
	`77`	`+ Url = url;`
`78`	`78`	`Timeout = TimeSpan.FromSeconds(30);`
`79`	`79`	`ErrorBodyMessages = [];`
`80`	`80`	`MaxLength = null;`
`@@ -111,7 +111,7 @@ protected virtual Url GetRawUrl(SearchQuery query)`
`111`	`111`	`throw new SmartImageException($"{query} not uploaded");`
`112`	`112`	`}`
`113`	`113`
`114`		`- Url u = (BaseUrl + query.Upload);`
	`114`	`+ Url u = (Url + query.Upload);`
`115`	`115`
`116`	`116`	`return u;`
`117`	`117`	`}`
`@@ -135,7 +135,7 @@ public virtual bool VerifyQuery(SearchQuery q)`
`135`	`135`
`136`	`136`	`public override string ToString()`
`137`	`137`	`{`
`138`		`- return $"{Name}: {BaseUrl} {Timeout}";`
	`138`	`+ return $"{Name}: {Url} {Timeout}";`
`139`	`139`	`}`
`140`	`140`
`141`	`141`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public abstract class ParsedSearchEngine<TItem, TIntermediate, TSource> : BaseSe`
`19`	`19`	`where TItem : SearchResultItem`
`20`	`20`	`{`
`21`	`21`
`22`		`- protected ParsedSearchEngine([NN] Url baseUrl) : base(baseUrl) { }`
	`22`	`+ protected ParsedSearchEngine([NN] Url url) : base(url) { }`
`23`	`23`
`24`	`24`
`25`	`25`	`public override async Task<SearchResult> GetResultAsync(SearchQuery query, CancellationToken token = default)`
Original file line number	Diff line number	Diff line change
`@@ -28,16 +28,16 @@ public partial class ArchiveMoeEngine : WebSearchEngine<ChanPost, IList<INode>>`
`28`	`28`
`29`	`29`	`public ArchiveMoeEngine() : this("https://archived.moe/_/search/") { }`
`30`	`30`
`31`		`- protected ArchiveMoeEngine(Url baseUrl) : base(baseUrl) { }`
	`31`	`+ protected ArchiveMoeEngine(Url url) : base(url) { }`
`32`	`32`
`33`	`33`	`protected override Url GetRawUrl(SearchQuery query)`
`34`	`34`	`{`
`35`	`35`	`Base64MD5Hash = GetBase64MD5Hash(query.Source.Bytes);`
`36`	`36`
`37`		`- var r = Url.Combine(BaseUrl, "image", Base64MD5Hash);`
	`37`	`+ var r = Url.Combine(Url, "image", Base64MD5Hash);`
`38`	`38`	`return r;`
`39`	`39`
`40`		`- // return (BaseUrl.AppendPathSegments("image").AppendPathSegment(Base64Hash));`
	`40`	`+ // return (Url.AppendPathSegments("image").AppendPathSegment(Base64Hash));`
`41`	`41`	`}`
`42`	`42`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -44,13 +44,14 @@ public sealed class Ascii2DEngine : WebSearchEngine<Ascii2DItem, IList<INode>>,`
`44`	`44`
`45`	`45`	`public const string MAIN_URL = "https://ascii2d.net/search/url/";`
`46`	`46`
`47`		`- private FlareSolverrClient m_fsClient;`
	`47`	`+ private readonly FlareSolverrClient m_fsClient;`
`48`	`48`
`49`	`49`	`public Ascii2DEngine() : base(MAIN_URL)`
`50`	`50`	`{`
`51`	`51`	`Timeout = TimeSpan.FromSeconds(30);`
`52`	`52`	`MaxLength = 10_000_000;`
`53`	`53`	`Jar = new CookieJar();`
	`54`	`+ m_fsClient = new FlareSolverrClient();`
`54`	`55`	`}`
`55`	`56`
`56`	`57`
`@@ -204,7 +205,7 @@ public async ValueTask<bool> ApplyCookiesAsync(ICookiesSource source, Cancellati`
`204`	`205`	`var ck = bck.AsCookie();`
`205`	`206`
`206`	`207`	`if (ck.Domain.Contains("ascii2d")) {`
`207`		`- Jar.AddOrReplace(new FlurlCookie(ck.Name, ck.Value, BaseUrl));`
	`208`	`+ Jar.AddOrReplace(new FlurlCookie(ck.Name, ck.Value, Url));`
`208`	`209`	`}`
`209`	`210`	`}`
`210`	`211`
`@@ -215,10 +216,10 @@ public async ValueTask<bool> ApplyCookiesAsync(ICookiesSource source, Cancellati`
`215`	`216`	`public ValueTask<bool> ApplyConfigAsync(SearchConfig cfg, CancellationToken ct = default)`
`216`	`217`	`{`
`217`	`218`	`if (cfg.FlareSolverr) {`
`218`		`- m_fsClient = new FlareSolverrClient(cfg.FlareSolverrApiUrl);`
	`219`	`+ m_fsClient.Configure(cfg.FlareSolverrApiUrl);`
`219`	`220`	`}`
`220`	`221`
`221`		`- return ValueTask.FromResult(m_fsClient is not null);`
	`222`	`+ return ValueTask.FromResult(m_fsClient.IsInitialized);`
`222`	`223`	`}`
`223`	`224`
`224`	`225`	`}`
`@@ -242,7 +243,7 @@ public static Ascii2DItem ParseSource(INode nx, SearchResult r)`
`242`	`243`	`var imgBox = nxe.Children[0];`
`243`	`244`	`var thumb = imgBox.Children[0].Attributes["src"];`
`244`	`245`
`245`		`- sri.Thumbnail = Url.Combine(r.Engine.BaseUrl.Root, thumb?.Value);`
	`246`	`+ sri.Thumbnail = Url.Combine(r.Engine.Url.Root, thumb?.Value);`
`246`	`247`
`247`	`248`	`var info = n.ChildNodes.Where(static n1 => !string.IsNullOrWhiteSpace(n1.TextContent))`
`248`	`249`	`.ToArray();`