Fix Yandex

Author: Decimation

SmartImage.Lib/Engines/BaseSearchEngine.cs

@@ -5,6 +5,7 @@
 global using Url = Flurl.Url;
 using System.Diagnostics;
 using System.Net.Http.Headers;
+using System.Runtime.CompilerServices;
 using Flurl.Http;
 using Kantan.Diagnostics;
 using Kantan.Net.Utilities;
@@ -16,7 +17,9 @@
 using SmartImage.Lib.Results.Data;
 using SmartImage.Lib.Utilities.Diagnostics;
 
+[assembly: InternalsVisibleTo("SmartImage.Test")]
 namespace SmartImage.Lib.Engines;
+
 #nullable enable
 
 

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

@@ -234,9 +234,9 @@ private async Task<IFlurlResponse> GetResponseByUrlAsync(Url origin, Cancellatio
 
 #region Overrides of WebSearchEngine
 
-	protected override async ValueTask<List<INode>> GetNodes(IDocument d)
+	protected override async ValueTask<IEnumerable<INode>> GetNodes(IDocument d)
 	{
-		var nodes = await base.GetNodes(d);
+		var nodes = (await base.GetNodes(d)).ToList();
 
 		var cnt = nodes.RemoveAll(x =>
 		{

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

@@ -125,8 +125,8 @@ protected override async Task<IDocument> GetDocumentAsync(SearchResult sr, Searc
 			}
 		};
 
-		var flurlRes = await Client.SendAsync(req, cancellationToken: token);
-		var httpRes  = flurlRes.ResponseMessage;
+		using var flurlRes = await Client.SendAsync(req, cancellationToken: token);
+		using var httpRes  = flurlRes.ResponseMessage;
 
 		// Debug.WriteLine($"{res.StatusCode}");
 
@@ -150,7 +150,7 @@ protected override async Task<IDocument> GetDocumentAsync(SearchResult sr, Searc
 		return await parser.ParseDocumentAsync(content, token);
 	}
 
-	protected override ValueTask<List<INode>> GetNodes(IDocument d)
+	protected override ValueTask<IEnumerable<INode>> GetNodes(IDocument d)
 	{
 		// Index 0 is table header
 		var array = d.Body.SelectNodes(NodesSelector);
@@ -160,7 +160,7 @@ protected override ValueTask<List<INode>> GetNodes(IDocument d)
 
 		}
 
-		return ValueTask.FromResult(array);
+		return  ValueTask.FromResult((IEnumerable<INode>) array);
 	}
 
 	/*
@@ -305,7 +305,7 @@ public ValueTask<bool> ApplyConfigAsync(SearchConfig cfg, CancellationToken ct =
 
 	protected override ValueTask<SearchResultItem> ParseResultItem(INode n, SearchResult r)
 	{
-		var eh = EhResult.Parse(n);
+		var eh  = EhResult.Parse(n);
 		var sri = eh.ToItem(r);
 		return ValueTask.FromResult(sri);
 	}
@@ -452,9 +452,9 @@ public static EhResult Parse(INode n)
 			item.Author = v.FirstOrDefault();
 		}
 
-		
-		item.Title       = eh.Title;
-		item.Url         = eh.Url;
+
+		item.Title = eh.Title;
+		item.Url   = eh.Url;
 
 		/*var gl1c        = n.ChildNodes[0];
 		var gl2c        = n.ChildNodes[1];

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

@@ -14,6 +14,7 @@
 using SmartImage.Lib.Images.Uni;
 using SmartImage.Lib.Results;
 using SmartImage.Lib.Results.Data;
+
 // ReSharper disable UnusedMember.Local
 #pragma warning disable IDE0051
 namespace SmartImage.Lib.Engines.Impl.Search;
@@ -66,7 +67,7 @@ public static GoogleLensItem Parse(INode n)
 
 }
 
-public class GoogleLensEngine : WebSearchEngine, IEndpointEngine /*, ICookiesEngine*/
+public class GoogleLensEngine : WebSearchEngine, IEndpointEngine, ICookiesEngine, ISearchConfigReceiver
 {
 
 	// TODO: WIP
@@ -208,10 +209,10 @@ private Task<IFlurlResponse> SearchUrlAsync(Url url, CancellationToken token)
 		return req;
 	}
 
-	protected override ValueTask<List<INode>> GetNodes(IDocument d)
+	protected override ValueTask<IEnumerable<INode>> GetNodes(IDocument d)
 	{
 		var all = d.QuerySelectorAll(".LBcIee");
-		return ValueTask.FromResult(all.OfType<INode>().ToList());
+		return ValueTask.FromResult(all.OfType<INode>());
 	}
 
 	protected override Url GetRawUrl(SearchQuery query)
@@ -221,4 +222,33 @@ protected override Url GetRawUrl(SearchQuery query)
 
 	public override void Dispose() { }
 
+	public CookieJar Jar { get; private set; }
+
+	public ICookiesProvider Provider { get; set; }
+
+	public async ValueTask<bool> ApplyCookiesAsync(CancellationToken token = default)
+	{
+		var ck = await Provider.GetOrLoadCookiesAsync(token);
+
+		foreach (var cookie in ck) {
+			if (cookie.Name == "NID") {
+				Nid = cookie.AsFlurlCookie();
+				break;
+			}
+		}
+
+		return true;
+	}
+
+#region Implementation of ISearchConfigReceiver
+
+	public ValueTask<bool> ApplyConfigAsync(SearchConfig cfg, CancellationToken ct = default)
+	{
+		Provider = cfg.CookiesProvider;
+		
+		return ApplyCookiesAsync(ct);
+	}
+
+#endregion
+
 }

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

@@ -43,8 +43,8 @@ protected IqdbEngine(string b) : base(b)
 
 	private const int MAX_FILE_SIZE = 8_388_608;
 
-	private const string URL_BASE = "https://iqdb.org/";
-	private const string URL_QUERY    = "https://iqdb.org/?url=";
+	private const string URL_BASE  = "https://iqdb.org/";
+	private const string URL_QUERY = "https://iqdb.org/?url=";
 
 	protected override string[] ErrorBodyMessages =>
 	[
@@ -234,15 +234,17 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 
 		var sr = await base.GetResultAsync(query, token);
 
+		IDocument doc = null;
+
 		if (sr.Status == SearchResultStatus.IllegalInput) {
 			goto ret;
 		}
 
-		var doc = await GetDocumentAsync(query, token);
+		doc = await GetDocumentAsync(query, token);
 
 		if (doc?.Body == null) {
 			sr.ErrorMessage = "Could not retrieve data";
-			sr.Status = SearchResultStatus.UnknownError;
+			sr.Status       = SearchResultStatus.UnknownError;
 			goto ret;
 		}
 
@@ -302,7 +304,9 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 		};*/
 
 	ret:
+		doc?.Dispose();
 		sr.Update();
+		Logger.LogDebug("Disposing {Name} doc", Name);
 		return sr;
 	}
 

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

@@ -48,7 +48,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 		RepostSleuthResult obj = null;
 
 		try {
-			var s = await Client.Request(EndpointUrl)
+			using var response = await Client.Request(EndpointUrl)
 				        .SetQueryParams(new
 				        {
 
@@ -62,8 +62,9 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 					        target_match_percent = 90,
 					        filter_dead_matches  = false,
 					        target_days_old      = 0
-				        }).GetStringAsync(cancellationToken: token);
+				        }).GetAsync(cancellationToken: token);
 
+			var s = await response.GetStreamAsync();
 			obj = JsonSerializer.Deserialize<RepostSleuthResult>(s, JsOptions);
 		}
 		catch (JsonException e) {

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

@@ -193,10 +193,14 @@ private async ValueTask GetWebResultsAsync(SearchQuery query, SearchResult sr)
 
 		foreach (INode result in results) {
 			var sndr = SauceNaoDataResult.Parse(result);
-			var sris = sndr.ToItem(sr);
-			sr.Results.AddRange(sris);
+			if (sndr != null) {
+				var sris = sndr.ToItem(sr);
+				sr.Results.AddRange(sris);
+
+			}
 		}
 
+		Logger.LogDebug("Disposing {Name} doc", Name);
 		doc.Dispose();
 	ret:
 		response.Dispose();

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

@@ -60,7 +60,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 		var r = await base.GetResultAsync(query, token);
 
 		try {
-			IFlurlRequest request = Client.Request(Url.Combine(EndpointUrl, ("/search")))
+			IFlurlRequest request = Client.Request(EndpointUrl, ("/search"))
 				.WithTimeout(Timeout)
 				.SetQueryParam("url", query.Upload, true);