improvements

Author: Decimation

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

@@ -3,9 +3,11 @@
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using Flurl.Http;
+using Kantan.Collections;
 using Kantan.Net;
 using Kantan.Text;
 using Novus.Utilities;
@@ -143,9 +145,24 @@ public static BaseSearchEngine[] GetAllSearchEngines()
 		var engines = typeof(BaseSearchEngine).GetAllSubclasses()
 		                                      .Select(Activator.CreateInstance)
 		                                      .Cast<BaseSearchEngine>()
-		                                      .ToArray();
-		
-		return engines;
+		                                      .ToList();
+
+		for (var i = engines.Count - 1; i >= 0; i--) {
+			BaseSearchEngine engine = engines[i];
+
+			var attr = engine.GetType().GetTypeInfo()
+			                 .GetCustomAttributes(typeof(ObsoleteAttribute), true)
+			                 .Cast<ObsoleteAttribute>()
+			                 .FirstOrDefault();
+
+			if (attr is { }) {
+				Debug.WriteLine($"Removing obsolete engine: {engine.Name}", C_INFO);
+				engines.RemoveAt(i);
+			}
+		}
+
+
+		return engines.ToArray();
 	}
 }
 

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

@@ -14,13 +14,13 @@ protected WebClientSearchEngine(string baseUrl) : base(baseUrl) { }
 	public abstract override SearchEngineOptions EngineOption { get; }
 
 	public abstract override EngineSearchType SearchType { get; }
-	
+
 	protected override object GetProcessingObject(SearchResult sr) => ParseContent(sr.Origin);
-	
+
 	protected virtual object ParseContent(SearchResultOrigin origin)
 	{
-		var parser = new HtmlParser();
-		var readStringTask  = origin.Response.Content.ReadAsStringAsync();
+		var parser         = new HtmlParser();
+		var readStringTask = origin.Response.Content.ReadAsStringAsync();
 		readStringTask.Wait();
 		var content  = readStringTask.Result;
 		var document = parser.ParseDocument(content);

SmartImage.Lib/Engines/Search/Other/KarmaDecayEngine.cs

@@ -1,11 +1,14 @@
+using System;
 using SmartImage.Lib.Engines.Search.Base;
 using SmartImage.Lib.Searching;
 
 namespace SmartImage.Lib.Engines.Search.Other;
 
+[Obsolete]
 public sealed class KarmaDecayEngine : BaseSearchEngine
 {
 	public KarmaDecayEngine() : base("http://karmadecay.com/search/?q=") { }
+
 	public override EngineSearchType SearchType => EngineSearchType.External | EngineSearchType.Metadata;
 
 	public override SearchEngineOptions EngineOption => SearchEngineOptions.KarmaDecay;

SmartImage.Lib/Engines/Search/TidderEngine.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using AngleSharp.Dom;
 using AngleSharp.Html.Dom;
@@ -13,15 +14,18 @@
 #nullable enable
 namespace SmartImage.Lib.Engines.Search;
 
+[Obsolete]
 public sealed class TidderEngine : WebClientSearchEngine
 {
 	public TidderEngine() : base("http://tidder.xyz/?imagelink=") { }
 
 	public override SearchEngineOptions EngineOption => SearchEngineOptions.Tidder;
-	
+
 
 	public override EngineSearchType SearchType => EngineSearchType.External | EngineSearchType.Metadata;
 
+
+	[DebuggerHidden]
 	protected override SearchResult Process(object obj, SearchResult sr)
 	{
 		var doc = (IDocument) obj;

SmartImage.Lib/Engines/Search/TinEyeEngine.cs

@@ -37,14 +37,7 @@ protected override object GetProcessingObject(SearchResult sr)
 
 	protected override async Task<List<ImageResult>> Browse(ImageQuery sd, SearchResult r)
 	{
-		using var browserFetcher = new BrowserFetcher();
-
-		var ri = await browserFetcher.DownloadAsync();
-
-		Debug.WriteLine($"{ri}");
-
-		var extra = new PuppeteerExtra();
-		extra.Use(new StealthPlugin());
+		PuppeteerExtra extra = await GetBrowser();
 
 		await using Browser browser = await extra.LaunchAsync(new LaunchOptions
 		{
@@ -55,24 +48,20 @@ protected override async Task<List<ImageResult>> Browse(ImageQuery sd, SearchRes
 		await using Page page = await browser.NewPageAsync();
 
 		await page.GoToAsync(BaseUrl + sd.UploadUri);
-		// await page.ScreenshotAsync(@"C:\Users\Deci\Downloads\a.png");
 		await page.WaitForNavigationAsync();
 
 		var rd = page.Url;
 		Debug.WriteLine($"{rd}");
 
-		/*var rcText = await (await page.WaitForSelectorAsync("#result_count"))
-			             .GetPropertyAsync("textContent");*/
-
-		//div[class="match"]
-		//div[class*='match-row']
 
 		var resultElems = await page.QuerySelectorAllAsync("div[class='match']");
 
 		var img = new List<ImageResult>();
 
-		if ((await (await resultElems[0].QuerySelectorAsync("span")).GetPropertyAsync("textContent"))
-		    .ToValueString().Contains("sponsored", StringComparison.InvariantCultureIgnoreCase)) {
+		var firstSpan = await (await resultElems[0].QuerySelectorAsync("span"))
+			                .GetPropertyAsync("textContent");
+
+		if (firstSpan.ToValueString().Contains("sponsored", StringComparison.InvariantCultureIgnoreCase)) {
 			resultElems = resultElems.Skip(1).ToArray();
 		}
 
@@ -110,7 +99,7 @@ protected override async Task<List<ImageResult>> Browse(ImageQuery sd, SearchRes
 				}
 
 				ir.OtherUrl.AddRange(uri);
-				
+
 
 				var imgElems = await t1.QuerySelectorAllAsync("img");
 				var imgList  = new List<Uri>();
@@ -120,20 +109,9 @@ protected override async Task<List<ImageResult>> Browse(ImageQuery sd, SearchRes
 
 					imgList.Add(new Uri(src.ToValueString()));
 				}
-				
+
 				ir.OtherUrl.AddRange(imgList);
 				ir.Url = ir.OtherUrl.FirstOrDefault();
-
-				/*var union = imgList.Union(uri).ToArray();
-
-				var plr=Parallel.For(0, union.Length, (i, s) =>
-				{
-					if (ImageHelper.IsBinaryImage(union[i].ToString(), out var b,2000)) {
-						ir.DirectImages.Add(b);
-					}
-
-				});
-				r.Scanned = true;*/
 			}
 
 			img.Add(ir);
@@ -142,6 +120,19 @@ protected override async Task<List<ImageResult>> Browse(ImageQuery sd, SearchRes
 		return img;
 	}
 
+	private static async Task<PuppeteerExtra> GetBrowser()
+	{
+		using var browserFetcher = new BrowserFetcher();
+
+		var ri = await browserFetcher.DownloadAsync();
+
+		Debug.WriteLine($"{ri}");
+
+		var extra = new PuppeteerExtra();
+		extra.Use(new StealthPlugin());
+		return extra;
+	}
+
 
 	protected override SearchResult Process(object obj, SearchResult sr)
 	{

SmartImage.Lib/SearchClient.cs

@@ -114,8 +114,8 @@ public void Reload(bool saveCfg = false)
 		}
 
 		Engines = BaseSearchEngine.GetAllSearchEngines()
-		            .Where(e => Config.SearchEngines.HasFlag(e.EngineOption))
-		            .ToArray();
+		                          .Where(e => Config.SearchEngines.HasFlag(e.EngineOption))
+		                          .ToArray();
 
 		Trace.WriteLine($"{nameof(SearchClient)}: Config:\n{Config}", C_DEBUG);
 
@@ -146,27 +146,25 @@ public void Reset()
 	/// <summary>
 	///     Performs an image search asynchronously.
 	/// </summary>
-	public async Task RunSearchAsync(CancellationToken? cts = null)
+	public async Task RunSearchAsync(CancellationToken cts, CancellationTokenSource cts2)
 	{
 		if (IsComplete) {
 			Reset();
 		}
 
 
-		cts ??= CancellationToken.None;
-
 		Tasks = new List<Task<SearchResult>>(Engines.Select(engine =>
 		{
-			var task = engine.GetResultAsync(Config.Query, cts.Value);
+			var task = engine.GetResultAsync(Config.Query, cts);
 
 			return task;
 		}));
 
 
-		while (!IsComplete && !cts.Value.IsCancellationRequested) {
+		while (!IsComplete && !cts.IsCancellationRequested) {
 			var finished = await Task.WhenAny(Tasks);
 
-			var task = finished.ContinueWith(GetResultContinueCallback, null, cts.Value,
+			var task = finished.ContinueWith(GetResultContinueCallback, state: cts2, cts,
 			                                 0, TaskScheduler.Default);
 
 			ContinueTasks.Add(task);
@@ -232,14 +230,13 @@ public async Task RunSearchAsync(CancellationToken? cts = null)
 		SearchCompleted?.Invoke(null, args);
 	}
 
-	public async Task RunContinueAsync(CancellationToken? c = null)
+	public async Task RunContinueAsync(CancellationToken c)
 	{
 
 		IsContinueComplete = false;
 
-		c ??= CancellationToken.None;
 
-		while (!IsContinueComplete && !c.Value.IsCancellationRequested) {
+		while (!IsContinueComplete && !c.IsCancellationRequested) {
 			var task = await Task.WhenAny(ContinueTasks);
 			await task;
 
@@ -260,7 +257,8 @@ private void GetResultContinueCallback(Task<SearchResult> task, object state)
 			return;
 		}
 
-		var result = value.GetBinaryImageResults();
+		var cts    = (CancellationTokenSource) state;
+		var result = value.GetBinaryImageResults(cts);
 
 		if (result.Any()) {
 
@@ -274,7 +272,7 @@ private void GetResultContinueCallback(Task<SearchResult> task, object state)
 				if (DirectResultsWaitHandle.TrySetResult()) {
 					Debug.WriteLine("wait handle set");
 
-
+					
 				}
 
 			}
@@ -287,32 +285,6 @@ private void GetResultContinueCallback(Task<SearchResult> task, object state)
 		}
 	}
 
-	/// <summary>
-	///     Refines search results by searching with the most-detailed result (<see cref="FindDirectResults" />).
-	/// </summary>
-	public async Task RefineSearchAsync()
-	{
-		if (!IsComplete) {
-			throw SearchException;
-		}
-
-		var directResult = DirectResults.FirstOrDefault();
-
-		if (directResult == null) {
-			throw new SmartImageException("Could not find direct result");
-		}
-
-		var direct = directResult.DirectImage.Url;
-
-		Debug.WriteLine($"{nameof(SearchClient)}: Refining by {direct}", C_DEBUG);
-
-		Config.Query = direct;
-
-		Reset();
-
-		await RunSearchAsync();
-	}
-
 	public static List<ImageResult> ApplyPredicateFilter(List<SearchResult> results, Predicate<SearchResult> predicate)
 	{
 		var query = results.Where(r => predicate(r))
@@ -325,22 +297,6 @@ public static List<ImageResult> ApplyPredicateFilter(List<SearchResult> results,
 		return query;
 	}
 
-	/// <summary>
-	///     Maximizes search results by using the specified property selector.
-	/// </summary>
-	/// <returns><see cref="Results" /> ordered by <paramref name="property" /></returns>
-	public List<SearchResult> MaximizeResults<T>(Func<SearchResult, T> property)
-	{
-		if (!IsComplete) {
-			throw SearchException;
-		}
-
-		var res = Results.OrderByDescending(property).ToList();
-
-		res.RemoveAll(r => !r.IsNonPrimitive);
-
-		return res;
-	}
 
 	/// <summary>
 	/// Fires when <see cref="GetResultContinueCallback"/> returns