Updates

Author: Decimation

SmartImage.Lib/Engines/Search/Ascii2DEngine.cs

@@ -99,7 +99,6 @@ protected override SearchResultOrigin GetResultOrigin(ImageQuery query, Cancella
 		var stub = new SearchResultOrigin()
 		{
 			Response  = response,
-			Content   = content,
 			Retrieval = diff,
 			Success   = true,
 			RawUri    = rawUri

SmartImage.Lib/Engines/Search/Base/BaseSearchEngine.cs

@@ -41,6 +41,7 @@ public virtual SearchResult GetResult(ImageQuery query, CancellationToken? c = n
 		{
 			Origin = GetResultOrigin(query)
 		};
+
 		c ??= CancellationToken.None;
 
 		if (c is { IsCancellationRequested: true }) {
@@ -63,6 +64,7 @@ public virtual SearchResult GetResult(ImageQuery query, CancellationToken? c = n
 
 	public async Task<SearchResult> GetResultAsync(ImageQuery query, CancellationToken? c = null)
 	{
+		c??= CancellationToken.None;
 
 		var task = Task.Run(delegate
 		{
@@ -73,7 +75,7 @@ public async Task<SearchResult> GetResultAsync(ImageQuery query, CancellationTok
 			Debug.WriteLine($"{Name}: result done", C_SUCCESS);
 
 			return res;
-		}, c ?? CancellationToken.None);
+		}, c.Value);
 
 		return await task;
 	}
@@ -91,7 +93,7 @@ protected virtual SearchResultOrigin GetResultOrigin(ImageQuery query, Cancellat
 
 		var res = HttpUtilities.GetHttpResponse(rawUri.ToString(),
 		                                        (int) Timeout.TotalMilliseconds,
-		                                        HttpMethod.Get, FollowRedirects);
+		                                        HttpMethod.Get, FollowRedirects, token: c);
 
 
 		bool success;
@@ -115,16 +117,15 @@ protected virtual SearchResultOrigin GetResultOrigin(ImageQuery query, Cancellat
 		string content = null;
 
 		if (success && res is { }) {
-			var task = res.Content.ReadAsStringAsync();
-
-			task.Wait(Timeout);
-			content = task.Result;
+			// var task = res.Content.ReadAsStringAsync();
+			// task.Wait(Timeout);
+			// content = task.Result;
 		}
 
 		var origin = new SearchResultOrigin
 		{
 			Response = res,
-			Content  = content,
+			// Content  = content,
 			Success  = success,
 			RawUri   = rawUri,
 			Query    = query

SmartImage.Lib/Engines/Search/Base/ProcessedSearchEngine.cs

@@ -24,7 +24,7 @@ public sealed override SearchResult GetResult(ImageQuery query, CancellationToke
 			goto ret;
 		}
 
-		if (!sr.IsSuccessful) {
+		if (!sr.IsStatusSuccessful) {
 			// sr.Origin.Dispose();
 			goto ret;
 		}

SmartImage.Lib/Engines/Search/Base/WebClientSearchEngine.cs

@@ -21,9 +21,11 @@ protected override object GetProcessingObject(SearchResult r)
 
 	protected virtual object ParseContent(SearchResultOrigin s)
 	{
-		var parser = new HtmlParser();
-
-		var document = parser.ParseDocument(s.Content);
+		var    parser            = new HtmlParser();
+		var async = s.Response.Content.ReadAsStringAsync();
+		async.Wait();
+		var content = async.Result;
+		var document = parser.ParseDocument((string) content);
 
 		return document;
 	}

SmartImage.Lib/Engines/Search/TinEyeEngine.cs

@@ -3,18 +3,23 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
+using Kantan.Net;
 using PuppeteerExtraSharp;
 using PuppeteerExtraSharp.Plugins.ExtraStealth;
 using PuppeteerSharp;
 using SmartImage.Lib.Engines.Search.Base;
 using SmartImage.Lib.Searching;
+using SmartImage.Lib.Utilities;
 
 namespace SmartImage.Lib.Engines.Search;
 
 public static class WebDriverExtensions
 {
 	public static string ToValueString(this JSHandle h)
-		=> h.ToString().Replace("jshandle:", string.Empty, StringComparison.InvariantCultureIgnoreCase);
+	{
+		// return h.JsonValueAsync().GetAwaiter().GetResult().ToString();
+		return h.ToString().Replace("jshandle:", string.Empty, StringComparison.InvariantCultureIgnoreCase);
+	}
 }
 
 public sealed class TinEyeEngine : WebDriverSearchEngine
@@ -75,8 +80,8 @@ protected override async Task<List<ImageResult>> Browse(ImageQuery sd, SearchRes
 
 			var ir = new ImageResult(r) { };
 
-			var p    = await elem.QuerySelectorAllAsync("p");
-			var h4   = await elem.QuerySelectorAsync("h4");
+			var p  = await elem.QuerySelectorAllAsync("p");
+			var h4 = await elem.QuerySelectorAsync("h4");
 
 			var name = await h4.GetPropertyAsync("textContent");
 
@@ -87,25 +92,32 @@ protected override async Task<List<ImageResult>> Browse(ImageQuery sd, SearchRes
 
 				var uri = new List<Uri>();
 
+				// a=a.Distinct().ToArray();
+
 				foreach (ElementHandle t in a) {
 					var href = await t.GetPropertyAsync("href");
 
 					string s = href.ToValueString();
-					Debug.WriteLine($"{s} | {await href.JsonValueAsync()}");
+
 					if (!string.IsNullOrWhiteSpace(s)) {
-						uri.Add(new Uri(s));
+						var item = new Uri(s);
+						// item = item.Normalize();
+
+						if (!uri.Contains(item)) {
+							uri.Add(item);
+						}
 					}
 				}
 
 				ir.OtherUrl.AddRange(uri);
 
 
-				var imgElems  = await t1.QuerySelectorAllAsync("img");
-				var imgList = new List<Uri>();
+				var imgElems = await t1.QuerySelectorAllAsync("img");
+				var imgList  = new List<Uri>();
 
 				for (int k = 0; k < imgElems.Length; k++) {
 					var src = await a[k].GetPropertyAsync("src");
-					
+
 					imgList.Add(new Uri(src.ToValueString()));
 				}
 
@@ -126,15 +138,15 @@ protected override async Task<List<ImageResult>> Browse(ImageQuery sd, SearchRes
 
 			img.Add(ir);
 		}
-		
+
 		return img;
 	}
 
 
 	protected override SearchResult Process(object obj, SearchResult sr)
 	{
 		var query = (ImageQuery) obj;
-		
+
 		// var vr = base.GetResult(query);
 
 		var task = Browse(query, sr);

SmartImage.Lib/SearchClient.cs

@@ -42,7 +42,7 @@ public SearchClient(SearchConfig config)
 		DetailedResults = new List<ImageResult>();
 		ContinueTasks   = new List<Task>();
 
-		DirectResultsWaitHandle = new AutoResetEvent(false);
+		DirectResultsWaitHandle = new();
 
 		Reload();
 
@@ -90,7 +90,7 @@ public SearchClient(SearchConfig config)
 	/// <summary>
 	/// Number of pending results
 	/// </summary>
-	public int PendingCount { get; private set; }
+	public int PendingCount => Tasks.Count;
 
 	public int CompleteCount => AllResults.Count;
 
@@ -100,7 +100,7 @@ public SearchClient(SearchConfig config)
 
 	public List<Task> ContinueTasks { get; }
 
-	public WaitHandle DirectResultsWaitHandle { get; private set; }
+	public TaskCompletionSource DirectResultsWaitHandle { get; private set; }
 
 
 	/// <summary>
@@ -130,13 +130,12 @@ public void Reset()
 		FilteredResults.Clear();
 		DetailedResults.Clear();
 		ContinueTasks.Clear();
-		PendingCount = 0;
+
 
 		IsComplete         = false;
 		IsContinueComplete = false;
 
-		DirectResultsWaitHandle = new AutoResetEvent(false);
-
+		DirectResultsWaitHandle = new();
 		Reload();
 	}
 
@@ -159,8 +158,6 @@ public async Task RunSearchAsync(CancellationToken? cts = null)
 			return task;
 		}));
 
-		PendingCount = Tasks.Count;
-
 
 		while (!IsComplete && !cts.Value.IsCancellationRequested) {
 			var finished = await Task.WhenAny(Tasks);
@@ -170,10 +167,9 @@ public async Task RunSearchAsync(CancellationToken? cts = null)
 
 			ContinueTasks.Add(task);
 
-			SearchResult value = await finished;
+			SearchResult value = finished.Result;
 
 			Tasks.Remove(finished);
-			PendingCount = Tasks.Count;
 
 			bool? isFiltered;
 			bool  isPriority = Config.PriorityEngines.HasFlag(value.Engine.EngineOption);
@@ -194,6 +190,7 @@ public async Task RunSearchAsync(CancellationToken? cts = null)
 
 				if (value.IsNonPrimitive) {
 					Results.Add(value);
+					DetailedResults.Add(value.PrimaryResult);
 					isFiltered = false;
 				}
 				else {
@@ -206,11 +203,6 @@ public async Task RunSearchAsync(CancellationToken? cts = null)
 				isFiltered = null;
 			}
 
-
-			if (DetailPredicate(value)) {
-				DetailedResults.Add(value.PrimaryResult);
-			}
-
 			//
 
 			// Call event
@@ -229,7 +221,7 @@ public async Task RunSearchAsync(CancellationToken? cts = null)
 
 		/* 2nd pass */
 
-		DetailedResults.AddRange(ApplyPredicateFilter(Results, DetailPredicate));
+		// DetailedResults.AddRange(ApplyPredicateFilter(Results, v => v.IsNonPrimitive));
 
 		var args = new SearchCompletedEventArgs { };
 
@@ -253,17 +245,14 @@ public async Task RunContinueAsync(CancellationToken? c = null)
 
 		}
 
-		if (!DirectResultsWaitHandle.SafeWaitHandle.IsInvalid || !DirectResultsWaitHandle.SafeWaitHandle.IsClosed) {
-			((AutoResetEvent) DirectResultsWaitHandle).Set();
-		}
 	}
 
 
 	private void GetResultContinueCallback(Task<SearchResult> task, object state)
 	{
 		var value = task.Result;
 
-		if (!value.IsSuccessful || !value.IsNonPrimitive || value.Scanned) {
+		if (!value.IsStatusSuccessful || !value.IsNonPrimitive || value.Scanned) {
 			return;
 		}
 
@@ -274,20 +263,19 @@ private void GetResultContinueCallback(Task<SearchResult> task, object state)
 			DirectResults.AddRange(result);
 
 			value.Scanned = true;
-			var autoResetEvent = ((AutoResetEvent) DirectResultsWaitHandle);
 
 			if (DirectResults.Count > 0 /*||
 			    !DirectResultsWaitHandle.SafeWaitHandle.IsClosed*/ /*|| ContinueTasks.Count==1*/) {
 
-				if (!DirectResultsWaitHandle.SafeWaitHandle.IsClosed) {
+				if (DirectResultsWaitHandle.TrySetResult()) {
 					Debug.WriteLine("wait handle set");
-					autoResetEvent.Set();
+
 
 				}
 
 			}
 
-			DirectResultCompleted?.Invoke(null, EventArgs.Empty);
+			ContinueCompleted?.Invoke(null, EventArgs.Empty);
 
 			// if (result.Any()) { }
 
@@ -345,7 +333,7 @@ public List<SearchResult> MaximizeResults<T>(Func<SearchResult, T> property)
 
 		var res = Results.OrderByDescending(property).ToList();
 
-		res.RemoveAll(r => !DetailPredicate(r));
+		res.RemoveAll(r => !r.IsNonPrimitive);
 
 		return res;
 	}
@@ -367,9 +355,9 @@ public static BaseSearchEngine[] GetAllSearchEngines()
 	}
 
 	/// <summary>
-	/// Fires when a result has been updated with new information
+	/// Fires when <see cref="GetResultContinueCallback"/> returns
 	/// </summary>
-	public event EventHandler DirectResultCompleted;
+	public event EventHandler ContinueCompleted;
 
 	/// <summary>
 	///     Fires when a result is returned (<see cref="RunSearchAsync" />).
@@ -382,24 +370,19 @@ public static BaseSearchEngine[] GetAllSearchEngines()
 	public event EventHandler<SearchCompletedEventArgs> SearchCompleted;
 
 
-	private static readonly Predicate<SearchResult> DetailPredicate = r => r.IsNonPrimitive;
-
-	private static readonly SmartImageException SearchException = new("Search must be completed");
+	private static readonly SmartImageException SearchException = new("Search not complete");
 
 
 	public void Dispose()
 	{
-		foreach (ImageResult result in DirectResults) {
+		/*foreach (ImageResult result in DirectResults) {
 			result.Dispose();
-		}
+		}*/
 
 		foreach (SearchResult result in AllResults) {
 			result.Dispose();
 		}
 
-		if (!DirectResultsWaitHandle.SafeWaitHandle.IsClosed) {
-			DirectResultsWaitHandle.Dispose();
-		}
 	}
 }
 

SmartImage.Lib/SearchConfig.cs

@@ -15,7 +15,7 @@ namespace SmartImage.Lib;
 /// Contains configuration for <see cref="SearchClient"/>
 /// </summary>
 /// <remarks>Search config is only applicable when used in <see cref="SearchClient"/></remarks>
-public sealed class SearchConfig : ConfigurationSection
+public sealed class SearchConfig /*: ConfigurationSection*/
 {
 	/// <summary>
 	/// Search query

SmartImage.Lib/Searching/ImageQuery.cs

@@ -100,7 +100,7 @@ public ImageQuery([NotNull] string value, [CanBeNull] BaseUploadEngine engine =
 	public static (bool IsUri, bool IsFile) IsUriOrFile(string x)
 	{
 		//todo
-		var isUriOrFile = (ImageHelper.IsBinaryImage(x, out var di), File.Exists(x));
+		var isUriOrFile = (ImageHelper.IsBinaryImage(x, out var di,-1), File.Exists(x));
 		// di?.Dispose();
 		return isUriOrFile;
 	}
@@ -109,7 +109,7 @@ public ImageResult GetImageResult()
 	{
 
 
-		BinaryResource directImage = new()
+		MediaResource directImage = new()
 		{
 			// Stream = Stream,
 			Url = UploadUri