Original image result

Author: Decimation

SmartImage.Lib/Engines/BaseSearchEngine.cs

@@ -67,7 +67,7 @@ public async Task<SearchResult> GetResultAsync(ImageQuery query)
 
 		public Uri GetRawResultUrl(ImageQuery query)
 		{
-			var uri = new Uri(BaseUrl + query.Image);
+			var uri = new Uri(BaseUrl + query.UploadUri);
 
 			bool ok = Network.IsUriAlive(uri, Timeout);
 

SmartImage.Lib/Engines/Impl/SauceNaoEngine.cs

@@ -223,7 +223,7 @@ private IEnumerable<SauceNaoDataResult> GetAPIResults(ImageQuery url)
 			req.AddQueryParameter("output_type", "2");
 			req.AddQueryParameter("numres", "16");
 			req.AddQueryParameter("api_key", Authentication);
-			req.AddQueryParameter("url", url.Image.ToString());
+			req.AddQueryParameter("url", url.UploadUri.ToString());
 
 			var res = m_client.Execute(req);
 

SmartImage.Lib/Engines/Impl/TraceMoeEngine.cs

@@ -41,7 +41,7 @@ protected override SearchResult Process(ImageQuery query, SearchResult r)
 
 
 			var rq = new RestRequest("search");
-			rq.AddQueryParameter("url", query.Image.ToString());
+			rq.AddQueryParameter("url", query.UploadUri.ToString());
 			//rq.AddQueryParameter("anilistInfo", "");
 			rq.OnBeforeDeserialization = resp => { resp.ContentType = "application/json"; };
 			rq.Timeout                 = Timeout.Milliseconds;
@@ -60,7 +60,7 @@ protected override SearchResult Process(ImageQuery query, SearchResult r)
 					r = new SearchResult(this)
 					{
 						PrimaryResult = best,
-						RawUri        = new Uri(BaseUrl + query.Image),
+						RawUri        = new Uri(BaseUrl + query.UploadUri),
 
 					};
 

SmartImage.Lib/SearchClient.cs

@@ -31,6 +31,7 @@ public SearchClient(SearchConfig config)
 			Config = config;
 
 			Results         = new List<SearchResult>();
+
 			FilteredResults = new List<SearchResult>();
 
 			Reload();
@@ -76,6 +77,7 @@ public void Reload()
 			          .ToArray();
 
 			Trace.WriteLine($"Engines: {Config.SearchEngines} | {Engines.QuickJoin()}");
+			
 
 		}
 

SmartImage.Lib/Searching/ImageQuery.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.Drawing;
 using System.IO;
 using JetBrains.Annotations;
 using SimpleCore.Net;
@@ -35,7 +36,7 @@ public sealed class ImageQuery
 		/// <summary>
 		/// Uploaded direct image
 		/// </summary>
-		public Uri Image { get; }
+		public Uri UploadUri { get; }
 
 		/// <summary>
 		/// Upload engine used for uploading the input file; if applicable
@@ -45,15 +46,14 @@ public sealed class ImageQuery
 		public Stream Stream { get; }
 
 
-		
 		public ImageQuery([NotNull] string value, [CanBeNull] BaseUploadEngine engine = null)
 		{
 			if (String.IsNullOrWhiteSpace(value)) {
 				throw new ArgumentNullException(nameof(value));
 			}
 
 
-			value           = value.CleanString();
+			value = value.CleanString();
 
 			(IsUri, IsFile) = IsUriOrFile(value);
 
@@ -66,28 +66,49 @@ public ImageQuery([NotNull] string value, [CanBeNull] BaseUploadEngine engine =
 
 			UploadEngine = engine ?? new LitterboxEngine(); //todo
 
-			Image = IsUri ? new Uri(Value) : UploadEngine.Upload(Value);
+			UploadUri = IsUri ? new Uri(Value) : UploadEngine.Upload(Value);
 
 			Stream = IsFile ? File.OpenRead(value) : WebUtilities.GetStream(value);
 
-			Trace.WriteLine($"{nameof(ImageQuery)}: {Image}", C_SUCCESS);
+			Trace.WriteLine($"{nameof(ImageQuery)}: {UploadUri}", C_SUCCESS);
 		}
 
 
 		public static implicit operator ImageQuery(Uri value) => new(value.ToString());
 
 		public static implicit operator ImageQuery(string value) => new(value);
-		
+
 
 		public static (bool IsUri, bool IsFile) IsUriOrFile(string x)
 		{
 			return (ImageHelper.IsDirect(x, DirectImageType.Binary), File.Exists(x));
 		}
 
+		public ImageResult GetImageResult()
+		{
+
+			var result = new ImageResult()
+			{
+				Url    = UploadUri,
+				Direct = UploadUri,
+				Image  = Image.FromStream(Stream)
+			};
+
+			result.OtherMetadata.Add("Upload engine", UploadEngine.Name);
+			result.OtherMetadata.Add("Input type", IsUri ? "URI" : "File");
+			result.OtherMetadata.Add("Input value", Value);
+
+			result.UpdateImageData();
+
+			return result;
+
+
+		}
+
 
 		public override string ToString()
 		{
-			return $"{Value} | {Image}";
+			return $"{Value} | {UploadUri}";
 		}
 	}
 }

SmartImage.Lib/Searching/SearchResult.cs

@@ -43,6 +43,7 @@ public enum ResultStatus
 		Extraneous
 	}
 
+	
 
 	/// <summary>
 	/// Describes a search result

SmartImage.UI/Form.cs

@@ -238,7 +238,7 @@ private void Update(ImageQuery query)
 		{
 			m_cl.Config.Query     = query;
 			inputTextBox.Text     = query.Value;
-			uploadTextBox.Text    = m_cl.Config.Query.Image.ToString();
+			uploadTextBox.Text    = m_cl.Config.Query.UploadUri.ToString();
 			inputPictureBox.Image = Image.FromStream(query.Stream);
 		}
 

SmartImage/Core/AppInfo.cs

@@ -5,16 +5,21 @@
 using SimpleCore.Utilities;
 using SmartImage.Utilities;
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Reflection.Metadata;
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading;
 using SimpleCore.Diagnostics;
+// ReSharper disable CognitiveComplexity
+
+// ReSharper disable PossibleNullReferenceException
 
 // ReSharper disable UnusedMember.Global
 
@@ -87,6 +92,36 @@ public static string ExeLocation
 			}
 		}
 
+		public static List<string> InstalledUtilities
+		{
+			get
+			{
+				var utils = new List<string>
+				{
+					"ffmpeg.exe", "ffprobe.exe", "magick.exe", "youtube-dl.exe"
+				};
+
+				var rg = new List<string>();
+
+				foreach (string s in utils) {
+					string[] path = Environment.GetEnvironmentVariable("PATH").Split(';');
+
+					foreach (string directory in path) {
+						if (Directory.Exists(directory)) {
+							foreach (string file in Directory.EnumerateFiles(directory)) {
+								if (Path.GetFileName(file) == s) {
+									rg.Add(file);
+								}
+							}
+						}
+					}
+				}
+
+				return rg;
+
+			}
+		}
+
 
 		public static bool IsAppFolderInPath => FileSystem.IsFolderInPath(AppFolder);
 

SmartImage/Core/AppInterface.cs

@@ -149,13 +149,21 @@ internal static class AppInterface
 					Console.WriteLine();
 					Console.WriteLine(Strings.Separator);
 
+					foreach (string utility in AppInfo.InstalledUtilities) {
+						Console.WriteLine(utility);
+					}
+
+					Console.WriteLine();
+
 					var dependencies = ReflectionHelper.DumpDependencies();
 
 					foreach (var name in dependencies) {
 						Console.WriteLine($"{name.Name} ({name.Version})");
 					}
 
 					NConsole.WaitForInput();
+
+
 					return null;
 				}
 			},
@@ -221,7 +229,7 @@ private static NConsoleOption CreateConfigOption(MemberInfo m, string name)
 					});
 
 					var enumValue = Enums.ReadFromSet<SearchEngineOptions>(selected);
-					var field     = Config.GetType().ResolveField((m).Name);
+					var field     = Config.GetType().GetResolvedField((m).Name);
 					field.SetValue(Config, enumValue);
 
 					Console.WriteLine(enumValue);
@@ -272,7 +280,7 @@ private static NConsoleOption CreateConfigOption(PropertyInfo member, string nam
 				Name = GetName(name, initVal),
 				Function = () =>
 				{
-					var    fi     = Config.GetType().ResolveField(member.Name);
+					var    fi     = Config.GetType().GetResolvedField(member.Name);
 					object curVal = fi.GetValue(Config);
 					bool   newVal = !(bool) curVal;
 					fi.SetValue(Config, newVal);
@@ -360,24 +368,21 @@ public static NConsoleOption[] CreateResultOptions(IEnumerable<ImageResult> resu
 			return result.Select(r => CreateResultOption(r, $"{n} #{i++}", c)).ToArray();
 		}
 
-		private static NConsoleOption CreateResultOption(ImageResult result, string n, Color c)
+		internal static NConsoleOption CreateResultOption(ImageResult result, string n, Color c, float correction=-.3f)
 		{
-
-			const float CORRECTION_FACTOR = -.3f;
-
 			var option = new NConsoleOption
 			{
 				Function      = CreateOpenFunction(result.Url),
 				ComboFunction = CreateDownloadFunction(result),
-				Color         = c.ChangeBrightness(CORRECTION_FACTOR),
+				Color         = c.ChangeBrightness(correction),
 				Name          = n,
 				Data          = result
 			};
 
 			return option;
 		}
 
-		private static NConsoleFunction CreateOpenFunction(Uri url)
+		internal static NConsoleFunction CreateOpenFunction(Uri url)
 		{
 			return () =>
 			{
@@ -389,7 +394,7 @@ private static NConsoleFunction CreateOpenFunction(Uri url)
 			};
 		}
 
-		private static NConsoleFunction CreateDownloadFunction(ImageResult result)
+		internal static NConsoleFunction CreateDownloadFunction(ImageResult result)
 		{
 			return () =>
 			{

SmartImage/Program.cs

@@ -50,8 +50,7 @@ public static class Program
 		//                                                     |___/
 
 		#region Core fields
-
-#line 54 "Initialization"
+		
 		public static readonly SearchConfig Config = new();
 
 		public static readonly SearchClient Client = new(Config);
@@ -61,7 +60,7 @@ public static class Program
 			Options     = new List<NConsoleOption>(),
 			Description = AppInterface.Description
 		};
-#line default
+
 
 		#endregion
 
@@ -121,16 +120,16 @@ private static async Task Main(string[] args)
 				 * Handle CLI args
 				 */
 
-				var enumerator = args.GetEnumerator();
+				var argEnumerator = args.GetEnumerator();
 
-				while (enumerator.MoveNext()) {
-					object? arg = enumerator.Current;
+				while (argEnumerator.MoveNext()) {
+					object? arg = argEnumerator.Current;
 
 					switch (arg) {
 						case CMD_FIND_DIRECT:
-							enumerator.MoveNext();
+							argEnumerator.MoveNext();
 
-							var directImages = ImageHelper.FindDirectImages((string) enumerator.Current);
+							var directImages = ImageHelper.FindDirectImages((string) argEnumerator.Current);
 
 							var imageResults = directImages.Select(ImageResult.FromDirectImage);
 
@@ -146,8 +145,8 @@ private static async Task Main(string[] args)
 
 							return;
 						case CMD_SEARCH:
-							enumerator.MoveNext();
-							Config.Query = (string) enumerator.Current;
+							argEnumerator.MoveNext();
+							Config.Query = (string) argEnumerator.Current;
 							break;
 						default:
 							Config.Query = args.First();
@@ -165,19 +164,25 @@ private static async Task Main(string[] args)
 
 				Client.ResultCompleted += OnResultCompleted;
 
-				Client.SearchCompleted += (_, eventArgs) =>
+				Client.SearchCompleted += (obj, eventArgs) =>
 				{
-					OnSearchCompleted(_, eventArgs, cts);
+					OnSearchCompleted(obj, eventArgs, cts);
 				};
 
 				NConsoleProgress.Queue(cts);
 
 				// Show results
 				var searchTask = Client.RunSearchAsync();
 
+				// Add original image
+				ResultDialog.Options.Add(AppInterface.CreateResultOption(
+					                         Config.Query.GetImageResult(), "(Original image)", 
+					                         AppInterface.ColorMain, -0.1f));
+
 
 				NConsole.ReadOptions(ResultDialog);
 
+
 				await searchTask;
 			}
 			catch (Exception exception) {