fixes

Author: Decimation

SmartImage.Lib/DirectImage.cs

@@ -34,9 +34,17 @@ public override int GetHashCode()
 			return HashCode.Combine(Stream, Response, Url);
 		}
 
-		public static bool operator ==(DirectImage left, DirectImage right) => left.Equals(right);
+		public static bool operator ==(DirectImage left, DirectImage right)
+		{
+			return !ReferenceEquals(left, null) && left.Equals(right);
+
+		}
 
-		public static bool operator !=(DirectImage left, DirectImage right) => !left.Equals(right);
+		public static bool operator !=(DirectImage left, DirectImage right)
+		{
+			return !ReferenceEquals(left, null) && !left.Equals(right);
+
+		}
 
 		public void Dispose()
 		{

SmartImage.Lib/SearchClient.cs

@@ -84,6 +84,8 @@ public SearchClient(SearchConfig config)
 	/// </summary>
 	public int Pending { get; private set; }
 
+	public List<SearchResult> AllResults => Results.Union(FilteredResults).Distinct().ToList();
+
 	/// <summary>
 	///     Reloads <see cref="Config" /> and <see cref="Engines" /> accordingly.
 	/// </summary>
@@ -190,6 +192,7 @@ public async Task RunSearchAsync()
 			});
 
 			IsComplete = !tasks.Any();
+			
 		}
 
 		Trace.WriteLine($"{nameof(SearchClient)}: Search complete", C_SUCCESS);
@@ -210,28 +213,7 @@ public async Task RunSearchAsync()
 		SearchCompleted?.Invoke(null, args);
 	}
 
-	public async void FindDirectResults(SearchResult result)
-	{
-		Debug.WriteLine($"searching within {result.Engine.Name}");
-
-		foreach (ImageResult ir in result.AllResults) {
-			var b = await ir.TryScanForDirectImages();
-
-			if (b && !DirectResults.Contains(ir)) {
-				
-				Debug.WriteLine($"{nameof(SearchClient)}: Found direct result {ir.Direct.Url}");
-				DirectResults.Add(ir);
-				result.PrimaryResult.Direct.Url ??= ir.Direct.Url;
-
-				DirectFound?.Invoke(null, new DirectResultsFoundEventArgs
-				{
-					DirectResultsSubset = new() { ir },
-				});
-
-				ResultUpdated?.Invoke(null, EventArgs.Empty);
-			}
-		}
-	}
+	
 
 
 	private void FindDirectResults(object state, SearchResult value, int take2 = 5)
@@ -247,14 +229,21 @@ private void FindDirectResults(object state, SearchResult value, int take2 = 5)
 			Debug.WriteLine($"*{nameof(SearchClient)}: Found {images.Count} direct results", C_DEBUG);
 			DirectResults.AddRange(images);
 
-			DirectFound?.Invoke(null, new DirectResultsFoundEventArgs
-			{
-				DirectResultsSubset = images,
-			});
 		}
 		else {
-			var t = Task.Factory.StartNew(() => FindDirectResults(value));
+			var t = Task.Factory.StartNew(async () =>
+			{
+				if (value.Scanned) {
+					return;
+				}
+				var d = await value.FindDirectResults();
+				Debug.WriteLine($"adding {d.Count} to {DirectResults.Count}");
+				DirectResults.AddRange(d);
+				value.Scanned = true;
 
+				ResultUpdated?.Invoke(null, EventArgs.Empty);
+			});
+			
 		}
 	}
 
@@ -374,11 +363,7 @@ public static BaseSearchEngine[] GetAllSearchEngines()
 	///     Fires when a search is complete (<see cref="RunSearchAsync" />).
 	/// </summary>
 	public event EventHandler<SearchCompletedEventArgs> SearchCompleted;
-
-	/// <summary>
-	/// Fires when a direct image result is found (<see cref="FindDirectResults"/>)
-	/// </summary>
-	public event EventHandler<DirectResultsFoundEventArgs> DirectFound;
+	
 
 	private static readonly Predicate<SearchResult> DetailPredicate = r => r.IsNonPrimitive;
 

SmartImage.Lib/Searching/ImageResult.cs

@@ -223,7 +223,6 @@ public async Task<bool> TryScanForDirectImages()
 
 			if (direct != null) {
 				Direct    = direct;
-				Direct.Url =  ((Direct.Url));
 				ReloadImageData();
 				return true;
 			}
@@ -247,7 +246,12 @@ public bool IsAlreadyDirect()
 		var b = ImageHelper.IsImage(s, out var di);
 
 		if (b) {
-			Image = Image.FromStream(di.Stream);
+
+			try {
+				Image = Image.FromStream(di.Stream);
+			}
+			catch (Exception e) {
+			}
 
 			Direct.Url = Url;
 		}

SmartImage.Lib/Searching/SearchResult.cs

@@ -3,11 +3,13 @@
 using SmartImage.Lib.Utilities;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Text;
+using System.Threading.Tasks;
 using Kantan.Model;
 using Kantan.Text;
 using Kantan.Utilities;
@@ -137,6 +139,34 @@ public SearchResult(BaseSearchEngine engine)
 	/// </summary>
 	public TimeSpan? RetrievalTime { get; internal set; }
 
+	
+	public bool Scanned { get; internal set; }
+
+	public async Task<List<ImageResult>> FindDirectResults()
+	{
+
+		Debug.WriteLine($"searching within {Engine.Name}");
+
+		var directResults = new List<ImageResult>();
+
+		foreach (ImageResult ir in AllResults) {
+			var b = await ir.TryScanForDirectImages();
+
+			if (b && !directResults.Contains(ir)) {
+
+				Debug.WriteLine($"{nameof(SearchClient)}: Found direct result {ir.Direct.Url}");
+				directResults.Add(ir);
+				PrimaryResult.Direct.Url ??= ir.Direct.Url;
+			}
+		}
+
+		Scanned = true;
+
+		return directResults;
+
+	}
+
+
 	public void Consolidate()
 	{
 		PrimaryResult = ReflectionHelper.Consolidate(PrimaryResult, OtherResults);

SmartImage/Program.cs

@@ -222,25 +222,15 @@ private static async Task Main(string[] args)
 			}
 		};
 
-		Client.DirectFound += (sender, eventArgs) =>
-		{
-			// ...
-		};
+		
 
 		Client.ResultUpdated += (sender, result) =>
 		{
-			/*var option = ResultDialog.Options.First(x => x.Name == result.Engine.Name);
-			var i = ResultDialog.Options.IndexOf(option);
-			ResultDialog.Options[i] = ConsoleUIFactory.CreateResultOption(result);
 			ResultDialog.Refresh();
-
-			Debug.WriteLine($"{i} update");*/
-			ResultDialog.Refresh();
-
 		};
 
 
-		ConsoleProgressIndicator.Start(_cancellationToken);
+		CPI.Start(_cancellationToken);
 
 
 		// Show results

SmartImage/UI/ConsoleUIFactory.cs

@@ -169,7 +169,9 @@ internal static ConsoleOption CreateResultOption(SearchResult result)
 				CPI.Start(cts);
 			}
 
-			Program.Client.FindDirectResults(result);
+			// Program.Client.FindDirectResults(result);
+
+			result.FindDirectResults();
 
 			cts.Cancel();
 			cts.Dispose();