*

Author: Decimation

SmartImage.Lib 3/Results/SearchResultItem.cs

@@ -1,4 +1,6 @@
-using System.Collections;
+using System.Runtime.CompilerServices;
+
+using System.Collections;
 using System.Drawing;
 using System.Dynamic;
 using Flurl.Http;
@@ -8,6 +10,7 @@
 using Novus.FileTypes.Uni;
 using SmartImage.Lib.Utilities;
 
+[assembly: InternalsVisibleTo("SmartImage.Lib Unit Test")]
 namespace SmartImage.Lib.Results;
 
 public sealed record SearchResultItem : IDisposable, IComparable<SearchResultItem>, IComparable

SmartImage.Lib 3/SearchClient.cs

@@ -158,15 +158,10 @@ public async Task<SearchResult[]> RunSearchAsync(SearchQuery query, bool reload
 			Task<SearchResult> task = await Task.WhenAny(tasks);
 			tasks.Remove(task);
 
-			// Debug.WriteLine($"{task.Id} {task.Status}");
 			SearchResult result = await task;
 
-			// ProcessResult(result);
-
 			results[i] = result;
 			i++;
-
-			// results.Add(result);
 		}
 
 		ResultChannel?.Writer.Complete();
@@ -176,10 +171,6 @@ public async Task<SearchResult[]> RunSearchAsync(SearchQuery query, bool reload
 
 		if (Config.PriorityEngines == SearchEngineOptions.Auto) {
 
-			// var sri    = results.SelectMany(r => r.Results).ToArray();
-			// var result = Optimize(sri).FirstOrDefault() ?? sri.FirstOrDefault();
-			//todo
-
 			try {
 
 				var ordered = results.Select(x => x.GetBestResult())
@@ -236,17 +227,6 @@ private void ProcessResult(SearchResult result)
 
 	private static void OpenResult([MN] Url url1)
 	{
-// #if DEBUG && !TEST
-/*
-#pragma warning disable CA1822
-
-		// ReSharper disable once MemberCanBeMadeStatic.Local
-		Logger.LogDebug("Not opening {url}", url1);
-		return;
-
-#pragma warning restore CA1822
-*/
-// #else
 
 		if (url1 == null) {
 			return;
@@ -259,46 +239,29 @@ private static void OpenResult([MN] Url url1)
 		// var b = Open(url1, out var proc);
 
 		if (b && proc is { }) {
-			/*var o = proc.WaitForExit(TimeSpan.FromSeconds(3));
-
-			if (o) {
-				Debug.WriteLine($"{proc}");
-			}*/
 			proc.Dispose();
 		}
 
-		// Process.Start(url1);
-		// HttpUtilities.TryOpenUrl(url1);
-// #endif
-
 	}
 
 	private void OpenResult([MN] SearchResultItem result)
 	{
-// #if DEBUG && !TEST
-/*#pragma warning disable CA1822
+#if DEBUG && !TEST
+#pragma warning disable CA1822
 
 		// ReSharper disable once MemberCanBeMadeStatic.Local
 		Logger.LogDebug("Not opening result {result}", result);
 		return;
 
-#pragma warning restore CA1822*/
-// #else
-
+#pragma warning restore CA1822
+#endif
 		OnOpen?.Invoke(this, result);
 
 		if (result != null) {
 
-			if (Config.OpenRaw) {
-				OpenResult(result.Root.GetRawResultItem().Url);
-			}
-			else {
-				OpenResult(result.Url);
-				// OpenResult(result);
-
-			}
+			var url = Config.OpenRaw ? result.Root.GetRawResultItem().Url : result.Url;
+			OpenResult(url);
 		}
-// #endif
 
 	}
 
@@ -313,9 +276,6 @@ public List<Task<SearchResult>> GetSearchTasks(SearchQuery query, TaskScheduler
 				Task<SearchResult> res = e.GetResultAsync(query, token: token)
 					.ContinueWith((r) =>
 					{
-
-						// Debug.Assert(r.IsCompleted);
-						// Debug.WriteLine($"{r.Id} :: {r.Status}");
 						ProcessResult(r.Result);
 						return r.Result;
 
@@ -365,63 +325,6 @@ public BaseSearchEngine TryGetEngine(SearchEngineOptions o)
 		return Engines.FirstOrDefault(e => e.EngineOption == o);
 	}
 
-	/*public static ValueTask<IReadOnlyList<SearchResultItem>> Filter(IEnumerable<SearchResultItem> sri)
-	{
-		var sri2 = sri.AsParallel().DistinctBy(e => e.Url).ToList();
-
-		return ValueTask.FromResult<IReadOnlyList<SearchResultItem>>(sri2);
-	}
-
-	public static IReadOnlyList<SearchResultItem> Optimize(IEnumerable<SearchResultItem> sri)
-	{
-		var items = sri.Where(r => SearchQuery.IsValidSourceType(r.Url))
-			.OrderByDescending(r => r.Score)
-			.ThenByDescending(r => r.Similarity)
-			.ToArray();
-
-		try {
-			/*var c = items.Where(r => r.Root.Engine.EngineOption == SearchEngineOptions.TraceMoe
-				/*&& r.Similarity <= TraceMoeEngine.FILTER_THRESHOLD#2#);
-			items = items.Except(c).ToArray();#1#
-
-		}
-		catch (Exception e) {
-			Logger.LogError("{Error}", e.Message);
-		}
-		finally { }
-
-		return items.AsReadOnly();
-	}
-
-	public static async Task<IReadOnlyList<UniSource>> GetDirectImagesAsync(IEnumerable<SearchResultItem> sri)
-	{
-		//
-		var filter = Optimize(sri)
-			.DistinctBy(r => r.Url)
-			// .Where(r => r.Score >= SearchResultItem.SCORE_THRESHOLD) // probably can be removed/reduced
-			.Select(async r =>
-			{
-				bool b = await r.LoadUniAsync();
-				return r.Uni;
-			})
-			.ToList();
-
-		var di = new List<UniSource>();
-
-		while (filter.Any()) {
-			var t1 = await Task.WhenAny(filter);
-			filter.Remove(t1);
-			var uf = await t1;
-
-			if (uf != null) {
-				di.AddRange(uf);
-			}
-
-		}
-
-		return di.AsReadOnly();
-	}*/
-
 	public void Dispose()
 	{
 		foreach (BaseSearchEngine engine in Engines) {

SmartImage.Lib 3/Utilities/FieldValueMap.cs

@@ -0,0 +1,72 @@
+using Kantan.Utilities;
+using Novus.Utilities;
+
+namespace SmartImage.Lib.Utilities;
+
+// todo
+
+public class FieldValueMap
+{
+
+	public string Name { get; }
+
+	public object Value { get; }
+
+	public string FieldName { get; }
+
+	public static FieldValueMap Find<T>(T inst, string name)
+	{
+		var type = inst?.GetType() ?? typeof(T);
+		return Find(inst, name, type);
+	}
+
+	private static FieldValueMap Find<T>(T inst, string name, Type type)
+	{
+		var fld = type.GetAnyResolvedField(name);
+
+		if (fld is not null) {
+			return new FieldValueMap(name, fld.GetValue(inst), fld.Name);
+		}
+
+		return null;
+	}
+
+	public static FieldValueMap[] Find<T>(T inst, string[] names)
+	{
+		var type = inst?.GetType() ?? typeof(T);
+
+		var values = new FieldValueMap[names.Length];
+		int i      = 0;
+
+		foreach (string name in names) {
+			var val = Find(inst, name, type);
+
+			if (val is not null) {
+				values[i++] = val;
+			}
+		}
+
+		Array.Resize(ref values, i);
+
+		return values;
+	}
+
+	public static FieldValueMap[] Find<T, T2>(T inst, T2 names) where T2 : struct, Enum
+	{
+		var names2 = names.GetSetFlags().Select(x => x.ToString()).ToArray();
+		return Find(inst, names2);
+	}
+
+	public FieldValueMap(string name, object value, string fieldName)
+	{
+		Name      = name;
+		Value     = value;
+		FieldName = fieldName;
+	}
+
+	public override string ToString()
+	{
+		return $"{nameof(Name)}: {Name} | {nameof(FieldName)}: {FieldName} | {nameof(Value)}: {Value}";
+	}
+
+}

SmartImage.Rdx/IntegrationCommand.cs

@@ -3,6 +3,7 @@
 
 using System.Diagnostics;
 using SmartImage.Lib.Utilities;
+using Spectre.Console;
 using Spectre.Console.Cli;
 
 namespace SmartImage.Rdx;