Fixes

Author: Decimation

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

@@ -262,14 +262,23 @@ protected override ValueTask<SearchResultItem> ParseResultItem(INode nx, SearchR
 		return ValueTask.FromResult(sri);
 	}
 
-	public async ValueTask<bool> ApplyCookiesAsync(ICookiesProvider provider, CancellationToken ct)
+	public async ValueTask<bool> ApplyCookiesAsync(ICookiesProvider provider, CancellationToken ct = default)
 	{
-		var ck = Jar.Where(static x => x.Domain.Contains("ascii2d"));
-		
-		foreach (var c in ck) {
-			Jar.AddOrReplace(c);
+		if (FlareSolverrClient.Value.IsInitialized) {
+			return false;
 		}
 
+		var cookies = await provider.LoadCookiesAsync(ct);
+
+		foreach (var bck in cookies) {
+			var ck = bck.AsCookie();
+
+			if (ck.Domain.Contains("ascii2d")) {
+				Jar.AddOrReplace(new FlurlCookie(ck.Name, ck.Value, BaseUrl));
+			}
+		}
+
+
 		return true;
 	}
 

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

@@ -30,27 +30,14 @@ namespace SmartImage.Lib.Engines.Impl.Search;
 public sealed class EHentaiEngine : WebSearchEngine, ISearchConfigReceiver, ICookiesReceiver, INotifyPropertyChanged
 {
 
-	private const string HOST_EH = ".e-hentai.org";
-	private const string HOST_EX = ".exhentai.org";
-
-	private readonly HttpClient m_client;
-
 	// NOTE: a separate HttpClient is used for EHentai because of special network requests and other unique requirements...
 
-	private readonly HttpClientHandler m_clientHandler = new()
-	{
-		AllowAutoRedirect              = true,
-		MaxAutomaticRedirections       = 15,
-		CheckCertificateRevocationList = false,
-		UseCookies                     = true,
-		CookieContainer                = new() { },
-
-	};
-
 	public override Url BaseUrl => IsLoggedIn ? ExHentaiBase : EHentaiBase;
 
 	private Url LookupUrl => IsLoggedIn ? ExHentaiLookup : EHentaiLookup;
 
+	private Url OriginUrl => UseExHentai ? ExHentaiBase : EHentaiBase;
+
 	public override SearchEngineOptions EngineOption => SearchEngineOptions.EHentai;
 
 	protected override string NodesSelector => Serialization.S_EHentai;
@@ -59,7 +46,8 @@ public sealed class EHentaiEngine : WebSearchEngine, ISearchConfigReceiver, ICoo
 
 	public bool UseExHentai { get; set; }
 
-	private readonly CookieCollection m_cookies;
+
+	public CookieJar Jar { get; }
 
 	#region
 
@@ -70,16 +58,21 @@ public sealed class EHentaiEngine : WebSearchEngine, ISearchConfigReceiver, ICoo
 	public static readonly Url ExHentaiBase   = "https://exhentai.org/";
 	public static readonly Url ExHentaiLookup = "https://upld.exhentai.org/upld/image_lookup.php";
 
+	#region
+
+	private const string HOST_EH = ".e-hentai.org";
+	private const string HOST_EX = ".exhentai.org";
+
+	#endregion
+
 	#endregion
 
 	static EHentaiEngine() { }
 
 	public EHentaiEngine(bool useExHentai = true) : base(EHentaiBase)
 	{
-		m_client   = new HttpClient(m_clientHandler);
 		IsLoggedIn = false;
 
-		m_cookies   = new();
 		UseExHentai = useExHentai;
 		Jar         = new CookieJar() { };
 	}
@@ -111,67 +104,38 @@ public async ValueTask ApplyConfigAsync(SearchConfig cfg)
 	 */
 
 
-	public CookieJar Jar { get; }
-
-
 	public async ValueTask<bool> ApplyCookiesAsync(ICookiesProvider provider, CancellationToken ct = default)
 	{
 		Trace.WriteLine($"Applying cookies to {Name}");
 
-		/*if (await CookiesManager.Instance.LoadCookiesAsync()) {
-			cookies ??= CookiesManager.Instance.Cookies;
-		}
-		else {
-			return false;
-		}*/
-
 		var cookies = await provider.LoadCookiesAsync(ct);
 
-		foreach (var cookie in cookies) {
-			var  x = cookie.AsCookie();
-			bool a = false;
+		foreach (var bck in cookies) {
+			var  cookie = bck.AsCookie();
+			bool c      = false;
 
 			if (UseExHentai) {
-				bool c = x.Domain.Contains(HOST_EX);
-				a |= c;
+				c |= cookie.Domain.Contains(HOST_EX);
 			}
 
-			var b = x.Domain.Contains(HOST_EH);
+			var dmnEh = cookie.Domain.Contains(HOST_EH);
 
-			// return b;
-			a |= b;
+			c |= dmnEh;
 
-			if (a) {
-				// m_cookies.Add(new Cookie(x.Name, x.Value, x.Path, x.Domain) { });
-				Jar.AddOrReplace(new FlurlCookie(x.Name,x.Value, UseExHentai ? ExHentaiBase : EHentaiBase));
+			if (c) {
+				Jar.AddOrReplace(new FlurlCookie(cookie.Name, cookie.Value, OriginUrl));
 			}
 		}
 
+		var response = await GetSessionAsync();
 
-		var res2 = await GetSessionAsync();
-
-		/*var res2 = await EHentaiBase.WithCookies(m_clientHandler.CookieContainer)
-			.WithHeaders(new
-			{
-				User_Agent = HttpUtilities.UserAgent
-			})
-			.WithAutoRedirect(true)
-			.GetAsync();*/
-
-		/*
-		m_clientHandler.CookieContainer.Add(m_cookies);
-		m_client.Timeout = Timeout;
-		*/
-
-
-		return IsLoggedIn = res2.ResponseMessage.IsSuccessStatusCode;
+		return IsLoggedIn = response.ResponseMessage.IsSuccessStatusCode;
 
 	}
 
 	private Task<IFlurlResponse> GetSessionAsync()
 	{
 		return (UseExHentai ? ExHentaiBase : EHentaiBase)
-			// .WithCookies(m_cookies)
 			.WithCookies(Jar)
 			.WithTimeout(Timeout)
 			.WithHeaders(new
@@ -226,37 +190,31 @@ protected override async Task<IDocument> GetDocumentAsync(SearchResult sr, Searc
 			{ new StringContent("dm_l"), "inline_set" }
 		};
 
-		// data.Add(new FileContent(f.FullName), "sfile", "a.jpg");
-
-		//todo
-		/*m_clientHandler.CookieContainer.Add(m_cookies);
-
-		m_client.Timeout = Timeout;*/
 
 		Debug.WriteLine($"{LookupUrl}", nameof(GetDocumentAsync));
 
-		var req2 = new FlurlRequest(LookupUrl)
+		var req = new FlurlRequest(LookupUrl)
 		{
 			CookieJar = Jar,
-			Verb    = HttpMethod.Post,
-			Content = data,
+			Verb      = HttpMethod.Post,
+			Content   = data,
 			Headers =
 			{
 				{ "User-Agent", HttpUtilities.UserAgent }
 			}
 		};
 
-		var res1 = await Client.SendAsync(req2, cancellationToken: token);
-		var res  = res1.ResponseMessage;
+		var flurlRes = await Client.SendAsync(req, cancellationToken: token);
+		var httpRes  = flurlRes.ResponseMessage;
 
 		// Debug.WriteLine($"{res.StatusCode}");
 
-		sr.RawUrl = res.RequestMessage.RequestUri;
+		sr.RawUrl = httpRes.RequestMessage.RequestUri;
 		var old = sr.Results.Find(r => r.IsRaw);
 		old.Url = sr.RawUrl;
 
 		// Debug.WriteLine($"{sr.RawUrl}");
-		var content = await res.Content.ReadAsStringAsync(token);
+		var content = await httpRes.Content.ReadAsStringAsync(token);
 
 		// var content2 = await sr.RawUrl.GetStringAsync(cancellationToken: token);
 

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

@@ -1,58 +1,99 @@
-using System.Text.Json;
+using System.Diagnostics;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 using Flurl.Http;
+using Kantan.Monad;
 using SmartImage.Lib.Results;
 
 namespace SmartImage.Lib.Engines.Impl.Search;
 
 public sealed class TinEyeEngine : BaseSearchEngine
 {
 
-	public TinEyeEngine() : base("https://www.tineye.com/search?url=") { }
+	public TinEyeEngine() : base("https://www.tineye.com/search?url=")
+	{
+		MaxSize = 10_000_000;
+	}
 
 	private const string API_URL = "https://tineye.com/api/v1/result_json/?sort=score&order=desc";
 
 	public override SearchEngineOptions EngineOption => SearchEngineOptions.TinEye;
 
 	public override void Dispose() { }
 
+	public override bool VerifyQuery(SearchQuery q)
+	{
+		q.Uni.AllocImage().Wait();
+
+		if (q.Uni.Image.Width >= 10000) {
+			return false;
+		}
+
+		return base.VerifyQuery(q);
+	}
+
 	public override async Task<SearchResult> GetResultAsync(SearchQuery query, CancellationToken token = default)
 	{
 		var sr = await base.GetResultAsync(query, token);
 
+		if (sr.Status == SearchResultStatus.IllegalInput) {
+			goto ret;
+		}
+
 		var req = await Client.Request(API_URL).PostMultipartAsync(b =>
 		{
 			b.AddString("url", query.Upload);
 		}, cancellationToken: token);
 
-		var tinEyeRoot = await req.GetJsonAsync<TinEyeRoot>();
+		TinEyeRoot tinEyeRoot = null;
+
+		try {
+			var str = await req.GetStringAsync();
+
+			tinEyeRoot = JsonSerializer.Deserialize<TinEyeRoot>(str);
+
+			// tinEyeRoot = await req.GetJsonAsync<TinEyeRoot>();
+		}
+		catch (Exception e) {
+			// Debugger.Break();
+			Trace.WriteLine(e.Message);
+			goto ret;
+		}
 
 		foreach (TinEyeMatch match in tinEyeRoot.Matches) {
+			var backlinks = match.Backlinks;
+			var backlink  = backlinks?[0];
+
+
 			var resultItem = new SearchResultItem(sr)
 			{
-				Metadata    = match,
-				Site        = match.Domain,
-				Url         = match.Backlinks[0].Backlink,
-				Description = match.Backlinks[0].ImageName,
+				Metadata = match,
+				Site     = match.Domain,
 
 				// Thumbnail   = match.Backlinks[0].Url,
 				Thumbnail = match.ImageUrl,
 				Width     = match.Width,
 				Height    = match.Height,
-				Time      = DateTime.Parse(match.Backlinks[0].CrawlDate)
 			};
 
-			if (match.Backlinks.Count > 1) {
-				for (int m = 1; m < match.Backlinks.Count; m++) {
-					var bl = match.Backlinks[m];
+			if (backlink != null) {
+				resultItem.Url         = backlink.Backlink;
+				resultItem.Description = backlink.ImageName;
+				resultItem.Time        = DateTime.Parse(backlink?.CrawlDate);
+
+			}
+
+			if (backlinks is { Count: > 1 }) {
+				for (int m = 1; m < backlinks.Count; m++) {
+					var bl = backlinks[m];
 
 					var resultItemSister = resultItem with
 					{
 						Url = bl.Backlink,
 
 						// Thumbnail = bl.Url, 
 						Description = bl.ImageName,
-						Time = DateTime.Parse(match.Backlinks[0].CrawlDate),
+						Time = DateTime.Parse(bl.CrawlDate),
 						Parent = resultItem,
 					};
 
@@ -65,6 +106,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 			sr.Results.Add(resultItem);
 		}
 
+	ret:
 		return sr;
 	}
 
@@ -291,7 +333,7 @@ public class TinEyeBacklink
 	public string CrawlDate { get; set; }
 
 	[JsonPropertyName("source_id")]
-	public int SourceId { get; set; }
+	public long SourceId { get; set; }
 
 	[JsonPropertyName("image_name")]
 	public string ImageName { get; set; }

SmartImage.Lib/Results/Data/AutoCookiesProvider.cs

@@ -73,7 +73,8 @@ public async ValueTask<IList<IBrowserCookie>> LoadCookiesAsync(CancellationToken
 		return chi;
 	}
 
-	public bool IsOpen => Reader.Connection.State is < ConnectionState.Broken and >= ConnectionState.Open;
+	public bool IsOpen => Reader.Connection.State is ConnectionState.Open;
+	public bool IsOpenOrInUse => Reader.Connection.State is < ConnectionState.Broken and >= ConnectionState.Open;
 
 	public bool IsClosedOrBroken => Reader.Connection.State is ConnectionState.Broken or ConnectionState.Closed;