Remove similarity comparison (WIP)

Author: Decimation

SmartImage/Engines/Other/ImgOpsEngine.cs

@@ -3,6 +3,7 @@
 using Novus.Win32;
 using RestSharp;
 using SimpleCore.Console.CommandLine;
+using SimpleCore.Numeric;
 using SimpleCore.Utilities;
 
 #nullable enable

SmartImage/Searching/FullSearchResult.cs

@@ -11,6 +11,7 @@
 using Novus.Win32;
 using SimpleCore.Console.CommandLine;
 using SimpleCore.Net;
+using SimpleCore.Numeric;
 using SimpleCore.Utilities;
 using SmartImage.Core;
 using SmartImage.Engines;
@@ -36,7 +37,7 @@ public FullSearchResult(SearchEngineOptions src, Color color, string name, strin
 			Similarity      = similarity;
 			ExtendedInfo    = new List<string>();
 			ExtendedResults = new List<FullSearchResult>();
-			
+
 		}
 
 		/// <summary>
@@ -45,7 +46,7 @@ public FullSearchResult(SearchEngineOptions src, Color color, string name, strin
 		public SearchEngineOptions Engine { get; }
 
 		/// <summary>
-		/// Whether this result is a result from a priority engine
+		/// Whether this result is a result from a priority engine (<see cref="SearchConfig.PriorityEngines"/>)
 		/// </summary>
 		public bool IsPriority => SearchConfig.Config.PriorityEngines.HasFlag(Engine);
 
@@ -87,7 +88,11 @@ public override NConsoleFunction CtrlFunction
 					Debug.WriteLine("Downloading");
 
 					try {
-						string? path = Network.DownloadUrl(Url);
+						NConsole.WriteSuccess("Downloading...");
+
+
+
+						string? path  = Network.DownloadUrl(Url);
 
 						NConsole.WriteSuccess("Downloaded to {0}", path);
 
@@ -364,7 +369,10 @@ public static FullSearchResult GetOriginalImageResult(string imageUrl, FileInfo
 
 			double mpx = MathHelper.ConvertToUnit(width * height, MetricUnit.Mega);
 
-			string infoStr = $"Info: {imageFile.Name} ({fileSizeMegabytes:F} MB) ({mpx:F} MP) ({fileFormat.Name})";
+			var aspectRatio = new Fraction(width, height).ToString().Replace('/', ':');
+
+			string infoStr =
+				$"Info: {imageFile.Name} ({aspectRatio}) ({mpx:F} MP) ({fileSizeMegabytes:F} MB) ({fileFormat.Name})";
 
 			result.ExtendedInfo.Add(infoStr);
 

SmartImage/Searching/SearchClient.cs

@@ -123,18 +123,12 @@ private static async void RunAnalysis(FullSearchResult best)
 			var task = Task.Run(() =>
 			{
 				if (!best.IsAnalyzed) {
-					var d = Images.Similarity(best.Url, SearchConfig.Config.Image);
-
-					if (d.HasValue)
-					{
-						best.Similarity = ((float)d);
-					}
+					//todo
 				}
 
 				best.IsAnalyzed = true;
 
 
-
 			});
 
 			await task;
@@ -219,13 +213,11 @@ public async void Start()
 			/*
 			 *
 			 */
-			
+
 			Debug.WriteLine($"Analyzing");
 
 
-			while (!Results.All(r=>r.IsAnalyzed)) {
-				
-			}
+			while (!Results.All(r => r.IsAnalyzed)) { }
 
 			Debug.WriteLine($"Analysis complete");
 

SmartImage/Utilities/Images.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
+//using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -24,37 +25,7 @@ internal static class Images
 		 * Shipwreck phash - cross correlation
 		 */
 
-		public static double? Similarity(string url, string f)
-		{
-			var m = Network.IdentifyType(url);
-
-			if (m == null) {
-				return null;
-			}
-
-			var t = Network.IsImage(m);
-
-			Debug.WriteLine($"{url} is image: {t}");
-
-
-			if (t) {
-
-
-				// using var s  = Image.FromFile(f);
-				// using var s2 = Image.FromStream(new WebClient().OpenRead(url));
-				//
-				//
-				//
-				// return Similarity(s, s2);
-			}
-
-			return null;
-		}
-
-		public static double? Similarity(Image a, Image b)
-		{
-			return null;
-		}
+		
 
 		internal static (int Width, int Height) GetDimensions(string img)
 		{