Fix null pointers; rework result/engine model; *

Author: Decimation

SmartImage.Lib 3/Engines/BaseSearchEngine.cs

@@ -125,22 +125,26 @@ public virtual async Task<SearchResult> GetResultAsync(SearchQuery query, Cancel
 
 		var res = new SearchResult(this)
 		{
-			RawUrl       = await GetRawUrlAsync(query),
+			RawUrl       = GetRawUrl(query),
 			ErrorMessage = null,
-			Status = srs
+			Status       = srs
 		};
 
+		lock (res.Results) {
+			res.Results.Add(res.GetRawResultItem());
+		}
+
 		Debug.WriteLine($"{Name} | {query} - {res.Status}", LogCategories.C_INFO);
 
 		return res;
 	}
 
-	protected virtual ValueTask<Url> GetRawUrlAsync(SearchQuery query)
+	protected virtual Url GetRawUrl(SearchQuery query)
 	{
 		//
 		Url u = ((BaseUrl + query.Upload));
 
-		return ValueTask.FromResult(u);
+		return u;
 	}
 
 	public abstract void Dispose();

SmartImage.Lib 3/Engines/Impl/Search/ArchiveMoeEngine.cs

@@ -38,17 +38,17 @@ protected static string GetHash(SearchQuery q)
 		var b64  = Convert.ToBase64String(data).Replace("==", "");
 		b64 = Regex.Replace(b64, @"\//", "_");
 		b64 = Regex.Replace(b64, @"\+", "-");
-		
+
 		q.Image.Stream.TrySeek();
 
 		return b64;
 	}
 
-	protected override ValueTask<Url> GetRawUrlAsync(SearchQuery query)
+	protected override Url GetRawUrl(SearchQuery query)
 	{
 		Base64Hash = GetHash(query);
 
-		return ValueTask.FromResult(BaseUrl.AppendPathSegments("image").AppendPathSegment(Base64Hash));
+		return (BaseUrl.AppendPathSegments("image").AppendPathSegment(Base64Hash));
 	}
 
 	protected override ValueTask<SearchResultItem> ParseResultItem(INode n, SearchResult r)

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

@@ -53,9 +53,9 @@ public Ascii2DEngine() : base("https://ascii2d.net/search/url/")
 		return b && b2;
 	}*/
 
-	protected override async ValueTask<Url> GetRawUrlAsync(SearchQuery query)
+	protected override Url GetRawUrl(SearchQuery query)
 	{
-		var url = await base.GetRawUrlAsync(query);
+		var url =  base.GetRawUrl(query);
 
 		/*url = url.SetQueryParams(new
 		{

SmartImage.Lib 3/Engines/Impl/Search/FluffleEngine.cs

@@ -85,9 +85,9 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 		return sr;
 	}
 
-	protected override async ValueTask<Url> GetRawUrlAsync(SearchQuery query)
+	protected override Url GetRawUrl(SearchQuery query)
 	{
-		return await base.GetRawUrlAsync(query);
+		return  base.GetRawUrl(query);
 	}
 
 	public override SearchEngineOptions EngineOption => SearchEngineOptions.Fluffle;

SmartImage.Lib 3/Engines/Impl/Search/YandexEngine.cs

@@ -121,7 +121,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 	{
 		// var sr = await base.GetResultAsync(query, token);
 
-		var url = await GetRawUrlAsync(query);
+		var url =  GetRawUrl(query);
 
 		var sr = new SearchResult(this)
 		{

SmartImage.Lib 3/Results/SearchResult.cs

@@ -1,5 +1,6 @@
 using System.Collections.Concurrent;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Net;
 using System.Runtime.CompilerServices;
 using Flurl.Http;
@@ -67,7 +68,10 @@ public sealed class SearchResult : IDisposable, INotifyPropertyChanged
 	/// </summary>
 	public Url RawUrl { get; internal set; }
 
-	public List<SearchResultItem> Results { get; internal set; }
+	/// <summary>
+	/// Results; first element should be <see cref="GetRawResultItem"/>
+	/// </summary>
+	public List<SearchResultItem> Results { get;  }
 
 	[CBN]
 	public string ErrorMessage { get; internal set; }
@@ -81,6 +85,8 @@ public sealed class SearchResult : IDisposable, INotifyPropertyChanged
 	public SearchResultItem GetBestResult()
 	{
 		if (Results.Count == 0) {
+			// This should never happen so long as results contains the raw item
+			Debugger.Break();
 			return null;
 		}
 
@@ -91,7 +97,9 @@ public SearchResultItem GetBestResult()
 	internal SearchResult(BaseSearchEngine bse)
 	{
 		Engine  = bse;
-		Results = [];
+		Results=[];
+
+		// Results = [GetRawResultItem()];
 	}
 
 	public override string ToString()
@@ -149,7 +157,7 @@ private bool SetField<T>(ref T field, T value, [CallerMemberName] string propert
 		return true;
 	}
 
-	public SearchResultItem AsRawResultItem()
+	public SearchResultItem GetRawResultItem()
 	{
 		return new SearchResultItem(this)
 		{

SmartImage.Lib 3/SearchClient.cs

@@ -181,26 +181,19 @@ public async Task<SearchResult[]> RunSearchAsync(SearchQuery query, bool reload
 			//todo
 
 			try {
-				
+
 				var ordered = results.Select(x => x.GetBestResult())
 					.Where(x => x != null)
 					.OrderByDescending(x => x.Similarity);
 
-				var item = ordered.First();
-
-				if (Config.OpenRaw) {
-					OpenResult(item.Root.AsRawResultItem());
-				}
+				var item = ordered.FirstOrDefault();
 
 				OpenResult(item);
 			}
 			catch (Exception e) {
 				Debug.WriteLine($"{e.Message}");
 
-				SearchResult result = results.FirstOrDefault(f => f.Status.IsSuccessful()) ?? results.First();
-				var          item   = result.GetBestResult();
-
-				OpenResult(item);
+				Debugger.Break();
 			}
 
 			/*try {
@@ -241,19 +234,24 @@ private void ProcessResult(SearchResult result)
 		}
 	}
 
-	private static void OpenResult(Url url1)
+	private static void OpenResult([MN] Url url1)
 	{
 // #if DEBUG && !TEST
 /*
 #pragma warning disable CA1822
 
-		// ReSharper disable once MemberCanBeMadeStatic.Local        
+		// ReSharper disable once MemberCanBeMadeStatic.Local
 		Logger.LogDebug("Not opening {url}", url1);
 		return;
 
 #pragma warning restore CA1822
 */
 // #else
+
+		if (url1 == null) {
+			return;
+		}
+
 		Logger.LogInformation("Opening {Url}", url1);
 
 		var b = FileSystem.Open(url1, out var proc);
@@ -275,21 +273,31 @@ private static void OpenResult(Url url1)
 
 	}
 
-	private void OpenResult(SearchResultItem result)
+	private void OpenResult([MN] SearchResultItem result)
 	{
 // #if DEBUG && !TEST
 /*#pragma warning disable CA1822
 
-		// ReSharper disable once MemberCanBeMadeStatic.Local        
+		// ReSharper disable once MemberCanBeMadeStatic.Local
 		Logger.LogDebug("Not opening result {result}", result);
 		return;
 
 #pragma warning restore CA1822*/
 // #else
-		
+
 		OnOpen?.Invoke(this, result);
 
-		OpenResult(result.Url);
+		if (result != null) {
+
+			if (Config.OpenRaw) {
+				OpenResult(result.Root.GetRawResultItem().Url);
+			}
+			else {
+				OpenResult(result.Url);
+				// OpenResult(result);
+
+			}
+		}
 // #endif
 
 	}

SmartImage.Rdx/IntegrationCommand.cs

@@ -6,7 +6,7 @@
 
 namespace SmartImage.Rdx;
 
-public class IntegrationCommand : Command<IntegrationCommandSettings>
+internal class IntegrationCommand : Command<IntegrationCommandSettings>
 {
 
 	public override int Execute(CommandContext context, IntegrationCommandSettings settings)

SmartImage.Rdx/IntegrationCommandSettings.cs

@@ -5,7 +5,7 @@
 
 namespace SmartImage.Rdx;
 
-public class IntegrationCommandSettings : CommandSettings
+internal class IntegrationCommandSettings : CommandSettings
 {
 
 	[CommandOption("--ctx-menu")]