Updates & improvements

Decimation · Decimation · commit fc757ce6a443 · 2021-06-08T23:15:15.000-05:00
diff --git a/SmartImage.Lib/Engines/BaseSearchEngine.cs b/SmartImage.Lib/Engines/BaseSearchEngine.cs
@@ -18,9 +18,9 @@ protected BaseSearchEngine(string baseUrl)
 			BaseUrl = baseUrl;
 		}
 
-		public abstract SearchEngineOptions Engine { get; }
+		public abstract SearchEngineOptions EngineOption { get; }
 
-		public virtual string Name => Engine.ToString();
+		public virtual string Name => EngineOption.ToString();
 
 
 		public virtual SearchResult GetResult(ImageQuery query)
diff --git a/SmartImage.Lib/Engines/Impl/Ascii2DEngine.cs b/SmartImage.Lib/Engines/Impl/Ascii2DEngine.cs
@@ -13,9 +13,9 @@ public sealed class Ascii2DEngine : InterpretedSearchEngine
 	{
 		public Ascii2DEngine() : base("https://ascii2d.net/search/url/") { }
 
-		public override SearchEngineOptions Engine => SearchEngineOptions.Ascii2D;
+		public override SearchEngineOptions EngineOption => SearchEngineOptions.Ascii2D;
 
-		public override string Name => Engine.ToString();
+		public override string Name => EngineOption.ToString();
 
 		/*
 		 *
diff --git a/SmartImage.Lib/Engines/Impl/IqdbEngine.cs b/SmartImage.Lib/Engines/Impl/IqdbEngine.cs
@@ -20,7 +20,7 @@ public sealed class IqdbEngine : InterpretedSearchEngine
 	{
 		public IqdbEngine() : base("https://iqdb.org/?url=") { }
 
-		public override SearchEngineOptions Engine => SearchEngineOptions.Iqdb;
+		public override SearchEngineOptions EngineOption => SearchEngineOptions.Iqdb;
 
 		public override string Name => "IQDB";
 
diff --git a/SmartImage.Lib/Engines/Impl/Other/BingEngine.cs b/SmartImage.Lib/Engines/Impl/Other/BingEngine.cs
@@ -4,7 +4,7 @@ public sealed class BingEngine : BaseSearchEngine
 	{
 		public BingEngine() : base("https://www.bing.com/images/searchbyimage?cbir=sbi&imgurl=") { }
 
-		public override SearchEngineOptions Engine => SearchEngineOptions.Bing;
+		public override SearchEngineOptions EngineOption => SearchEngineOptions.Bing;
 		
 
 		// Parsing does not seem feasible ATM
diff --git a/SmartImage.Lib/Engines/Impl/Other/GoogleImagesEngine.cs b/SmartImage.Lib/Engines/Impl/Other/GoogleImagesEngine.cs
@@ -6,7 +6,7 @@ public GoogleImagesEngine() : base("http://images.google.com/searchbyimage?image
 
 		public override string Name => "Google Images";
 
-		public override SearchEngineOptions Engine => SearchEngineOptions.GoogleImages;
+		public override SearchEngineOptions EngineOption => SearchEngineOptions.GoogleImages;
 
 		
 
diff --git a/SmartImage.Lib/Engines/Impl/Other/ImgOpsEngine.cs b/SmartImage.Lib/Engines/Impl/Other/ImgOpsEngine.cs
@@ -3,7 +3,7 @@ namespace SmartImage.Lib.Engines.Impl.Other
 {
 	public sealed class ImgOpsEngine : BaseSearchEngine
 	{
-		public override SearchEngineOptions Engine => SearchEngineOptions.ImgOps;
+		public override SearchEngineOptions EngineOption => SearchEngineOptions.ImgOps;
 
 		//public int MaxSize => 5;
 
diff --git a/SmartImage.Lib/Engines/Impl/Other/KarmaDecayEngine.cs b/SmartImage.Lib/Engines/Impl/Other/KarmaDecayEngine.cs
@@ -4,6 +4,6 @@ public sealed class KarmaDecayEngine : BaseSearchEngine
 	{
 		public KarmaDecayEngine() : base("http://karmadecay.com/search/?q=") { }
 
-		public override SearchEngineOptions Engine => SearchEngineOptions.KarmaDecay;
+		public override SearchEngineOptions EngineOption => SearchEngineOptions.KarmaDecay;
 	}
 }
diff --git a/SmartImage.Lib/Engines/Impl/Other/TinEyeEngine.cs b/SmartImage.Lib/Engines/Impl/Other/TinEyeEngine.cs
@@ -5,7 +5,7 @@ public sealed class TinEyeEngine : BaseSearchEngine
 		public TinEyeEngine() : base("https://www.tineye.com/search?url=") { }
 		
 
-		public override SearchEngineOptions Engine => SearchEngineOptions.TinEye;
+		public override SearchEngineOptions EngineOption => SearchEngineOptions.TinEye;
 
 
 		/*
diff --git a/SmartImage.Lib/Engines/Impl/SauceNaoEngine.cs b/SmartImage.Lib/Engines/Impl/SauceNaoEngine.cs
@@ -49,7 +49,8 @@ public SauceNaoEngine() : this(String.Empty) { } //todo
 
 		public string Authentication { get; init; }
 
-		public override SearchEngineOptions Engine => SearchEngineOptions.SauceNao;
+		public override SearchEngineOptions EngineOption => SearchEngineOptions.SauceNao;
+		
 
 		private static IEnumerable<SauceNaoDataResult> ParseResults(string url)
 		{
@@ -70,6 +71,7 @@ private static IEnumerable<SauceNaoDataResult> ParseResults(string url)
 
 			if (html.Contains("Search Limit Exceeded")) {
 				Trace.WriteLine("SauceNao on cooldown!", C_WARN);
+				
 				return null;
 			}
 
diff --git a/SmartImage.Lib/Engines/Impl/TidderEngine.cs b/SmartImage.Lib/Engines/Impl/TidderEngine.cs
@@ -16,9 +16,9 @@ public sealed class TidderEngine : InterpretedSearchEngine
 	{
 		public TidderEngine() : base("http://tidder.xyz/?imagelink=") { }
 
-		public override SearchEngineOptions Engine => SearchEngineOptions.Tidder;
+		public override SearchEngineOptions EngineOption => SearchEngineOptions.Tidder;
 
-		public override string Name => Engine.ToString();
+		public override string Name => EngineOption.ToString();
 
 
 		protected override SearchResult Process(IDocument doc, SearchResult sr)
diff --git a/SmartImage.Lib/Engines/Impl/TraceMoeEngine.cs b/SmartImage.Lib/Engines/Impl/TraceMoeEngine.cs
@@ -23,7 +23,7 @@ public TraceMoeEngine() : base("https://api.trace.moe") { }
 
 		public override string Name => "trace.moe";
 
-		public override SearchEngineOptions Engine => SearchEngineOptions.TraceMoe;
+		public override SearchEngineOptions EngineOption => SearchEngineOptions.TraceMoe;
 
 		[UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
 		internal class TraceMoeDoc
diff --git a/SmartImage.Lib/Engines/Impl/YandexEngine.cs b/SmartImage.Lib/Engines/Impl/YandexEngine.cs
@@ -20,9 +20,9 @@ public sealed class YandexEngine : InterpretedSearchEngine
 	{
 		public YandexEngine() : base("https://yandex.com/images/search?rpt=imageview&url=") { }
 
-		public override SearchEngineOptions Engine => SearchEngineOptions.Yandex;
+		public override SearchEngineOptions EngineOption => SearchEngineOptions.Yandex;
 
-		public override string Name => Engine.ToString();
+		public override string Name => EngineOption.ToString();
 
 
 		private static string? GetAnalysis(IDocument doc)
diff --git a/SmartImage.Lib/Engines/InterpretedSearchEngine.cs b/SmartImage.Lib/Engines/InterpretedSearchEngine.cs
@@ -19,7 +19,7 @@ namespace SmartImage.Lib.Engines
 	/// </summary>
 	public abstract class InterpretedSearchEngine : BaseSearchEngine
 	{
-		public abstract override SearchEngineOptions Engine { get; }
+		public abstract override SearchEngineOptions EngineOption { get; }
 
 		public abstract override string Name { get; }
 
diff --git a/SmartImage.Lib/SearchClient.cs b/SmartImage.Lib/SearchClient.cs
@@ -37,7 +37,7 @@ public void Update()
 			}
 
 			Engines = GetAllSearchEngines()
-			          .Where(e => Config.SearchEngines.HasFlag(e.Engine))
+			          .Where(e => Config.SearchEngines.HasFlag(e.EngineOption))
 			          .ToArray();
 
 			Trace.WriteLine($"Engines: {Config.SearchEngines} | {Engines.QuickJoin()}");
@@ -63,9 +63,6 @@ public void Reset()
 
 		public ImageResult[] FindBestResults(int n)
 		{
-			//todo: WIP
-			Debug.WriteLine($"Finding best results");
-
 			var best = Results.Where(r => r.IsNonPrimitive)
 			                  .SelectMany(r =>
 			                  {
@@ -146,9 +143,6 @@ public async Task RunSearchAsync()
 
 				tasks.Remove(finished);
 
-				if (Config.DirectUri) {
-					value.PrimaryResult.FindDirectImages();
-				}
 
 				if (!(Config.Filter && !value.IsNonPrimitive)) {
 					Results.Add(value);
diff --git a/SmartImage.Lib/SearchConfig.cs b/SmartImage.Lib/SearchConfig.cs
@@ -36,11 +36,7 @@ public sealed class SearchConfig
 		/// Filters any non-primitive results; <see cref="SearchResult.IsNonPrimitive"/>
 		/// </summary>
 		public bool Filter { get; set; } = true;
-
-		/// <summary>
-		/// Scan for direct image links; <see cref="ImageResult.FindDirectImages"/>
-		/// </summary>
-		public bool DirectUri { get; set; } = false;
+		
 
 
 		public override string ToString()
@@ -50,7 +46,6 @@ public override string ToString()
 			sb.Append(nameof(SearchEngines), SearchEngines);
 			sb.Append(nameof(PriorityEngines), PriorityEngines);
 			sb.Append(nameof(Filter), Filter);
-			sb.Append(nameof(DirectUri), DirectUri);
 
 			return sb.ToString();
 		}
diff --git a/SmartImage.Lib/Searching/SearchResult.cs b/SmartImage.Lib/Searching/SearchResult.cs
@@ -74,13 +74,19 @@ public SearchResult(BaseSearchEngine engine)
 			OtherResults  = new List<ImageResult>();
 		}
 
-		public override string ToString()
+
+		public string ToString(bool name)
 		{
 			var sb = new ExtendedStringBuilder() { };
 
-			var name = $"[{Engine.Name}]";
+			if (name) {
+				sb.AppendLine($"[{Engine.Name}] :: ({Status}; {(!IsNonPrimitive ? RANK_P : RANK_S)})");
 
-			sb.AppendLine($"{name} :: ({Status}; {(!IsNonPrimitive ? RANK_P : RANK_S)})");
+			}
+			else {
+				sb.Append("\n");
+
+			}
 
 			if (PrimaryResult.Url != null) {
 				//var    resStr    = sb.IndentFields(PrimaryResult.ToString());
@@ -101,6 +107,11 @@ public override string ToString()
 			return sb.Append(sb.IndentFields(sb2.ToString())).ToString();
 		}
 
+		public override string ToString()
+		{
+			return ToString(true);
+		}
+
 		internal const string RANK_P = "P";
 
 		internal const string RANK_S = "S";
diff --git a/SmartImage/Core/DialogBridge.cs b/SmartImage/Core/DialogBridge.cs
@@ -2,22 +2,25 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Drawing;
 using System.Linq;
 using System.Net;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Novus.Win32;
 using SimpleCore.Cli;
 using SimpleCore.Net;
 using SimpleCore.Utilities;
+using SmartImage.Lib.Engines;
 using SmartImage.Lib.Searching;
 using SmartImage.Lib.Utilities;
 
 namespace SmartImage.Core
 {
-	internal static class DialogUtilities
+	internal static class DialogBridge
 	{
-		internal static NConsoleOption Convert(SearchResult result)
+		internal static NConsoleOption CreateOption(SearchResult result)
 		{
 			var option = new NConsoleOption
 			{
@@ -27,7 +30,7 @@ internal static NConsoleOption Convert(SearchResult result)
 					if (result.OtherResults.Any()) {
 						//var x=NConsoleOption.FromArray(result.OtherResults.ToArray());
 
-						var options = result.OtherResults.Select(Convert).ToArray();
+						var options = result.OtherResults.Select(CreateOption).ToArray();
 
 						NConsole.ReadOptions(new NConsoleDialog
 						{
@@ -51,16 +54,22 @@ internal static NConsoleOption Convert(SearchResult result)
 
 					return null;
 				},
-				//Name = result.Engine.Name,
-				Data = result.ToString()
+				Name = result.Engine.Name.AddColor(EngineNameColorMap[result.Engine.EngineOption]),
+				Data = result.ToString(false)
 			};
 
 			option.CtrlFunction = () =>
 			{
+				var cts = new CancellationTokenSource();
+
+				NConsoleProgress.Queue(cts);
+
 				result.OtherResults.AsParallel().ForAll(x => x.FindDirectImages());
 
 				result.PrimaryResult.UpdateFrom(result.OtherResults.First());
 
+				cts.Cancel();
+
 				option.Data = result.ToString();
 
 				return null;
@@ -69,6 +78,19 @@ internal static NConsoleOption Convert(SearchResult result)
 			return option;
 		}
 
+		private static NConsoleOption CreateOption(ImageResult r)
+		{
+			var option = new NConsoleOption
+			{
+				Function = CreateFunction(r),
+				Name     = $"Other result\n\b",
+				//Data     = r.ToString().Replace("\n", "\n\t"),
+				Data = r.ToString(true)
+			};
+
+			return option;
+		}
+
 		private static NConsoleFunction CreateFunction(ImageResult? primaryResult)
 		{
 			return () =>
@@ -85,17 +107,19 @@ private static NConsoleFunction CreateFunction(ImageResult? primaryResult)
 			};
 		}
 
-		private static NConsoleOption Convert(ImageResult r)
+		private static readonly Dictionary<SearchEngineOptions, Color> EngineNameColorMap = new()
 		{
-			var option = new NConsoleOption
-			{
-				Function = CreateFunction(r),
-				Name     = $"Other result\n\b",
-				//Data     = r.ToString().Replace("\n", "\n\t"),
-				Data = r.ToString(true)
-			};
-
-			return option;
-		}
+			{SearchEngineOptions.Iqdb, Color.SandyBrown},
+			{SearchEngineOptions.SauceNao, Color.SpringGreen},
+			{SearchEngineOptions.Ascii2D, Color.NavajoWhite},
+			{SearchEngineOptions.Bing, Color.DeepSkyBlue},
+			{SearchEngineOptions.GoogleImages, Color.Violet},
+			{SearchEngineOptions.ImgOps, Color.Gray},
+			{SearchEngineOptions.KarmaDecay, Color.Orange},
+			{SearchEngineOptions.Tidder, Color.OrangeRed},
+			{SearchEngineOptions.TraceMoe, Color.MediumSlateBlue},
+			{SearchEngineOptions.Yandex, Color.IndianRed},
+			{SearchEngineOptions.TinEye, Color.CornflowerBlue},
+		};
 	}
 }
diff --git a/SmartImage/Core/MainDialog.cs b/SmartImage/Core/MainDialog.cs
diff --git a/SmartImage/Core/OSIntegration.cs b/SmartImage/Core/OSIntegration.cs
diff --git a/SmartImage/Program.cs b/SmartImage/Program.cs
diff --git a/SmartImage/SmartImage.csproj b/SmartImage/SmartImage.csproj
diff --git a/SmartImage/Utilities/NativeImports.cs b/SmartImage/Utilities/NativeImports.cs
diff --git a/Test/Program.cs b/Test/Program.cs
diff --git a/UnitTest/UnitTest1.cs b/UnitTest/UnitTest1.cs

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,9 @@ protected BaseSearchEngine(string baseUrl)`
`18`	`18`	`BaseUrl = baseUrl;`
`19`	`19`	`}`
`20`	`20`
`21`		`- public abstract SearchEngineOptions Engine { get; }`
	`21`	`+ public abstract SearchEngineOptions EngineOption { get; }`
`22`	`22`
`23`		`- public virtual string Name => Engine.ToString();`
	`23`	`+ public virtual string Name => EngineOption.ToString();`
`24`	`24`
`25`	`25`
`26`	`26`	`public virtual SearchResult GetResult(ImageQuery query)`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ public sealed class Ascii2DEngine : InterpretedSearchEngine`
`13`	`13`	`{`
`14`	`14`	`public Ascii2DEngine() : base("https://ascii2d.net/search/url/") { }`
`15`	`15`
`16`		`- public override SearchEngineOptions Engine => SearchEngineOptions.Ascii2D;`
	`16`	`+ public override SearchEngineOptions EngineOption => SearchEngineOptions.Ascii2D;`
`17`	`17`
`18`		`- public override string Name => Engine.ToString();`
	`18`	`+ public override string Name => EngineOption.ToString();`
`19`	`19`
`20`	`20`	`/*`
`21`	`21`	`*`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public sealed class IqdbEngine : InterpretedSearchEngine`
`20`	`20`	`{`
`21`	`21`	`public IqdbEngine() : base("https://iqdb.org/?url=") { }`
`22`	`22`
`23`		`- public override SearchEngineOptions Engine => SearchEngineOptions.Iqdb;`
	`23`	`+ public override SearchEngineOptions EngineOption => SearchEngineOptions.Iqdb;`
`24`	`24`
`25`	`25`	`public override string Name => "IQDB";`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ public sealed class BingEngine : BaseSearchEngine`
`4`	`4`	`{`
`5`	`5`	`public BingEngine() : base("https://www.bing.com/images/searchbyimage?cbir=sbi&imgurl=") { }`
`6`	`6`
`7`		`- public override SearchEngineOptions Engine => SearchEngineOptions.Bing;`
	`7`	`+ public override SearchEngineOptions EngineOption => SearchEngineOptions.Bing;`
`8`	`8`
`9`	`9`
`10`	`10`	`// Parsing does not seem feasible ATM`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public GoogleImagesEngine() : base("http://images.google.com/searchbyimage?image`
`6`	`6`
`7`	`7`	`public override string Name => "Google Images";`
`8`	`8`
`9`		`- public override SearchEngineOptions Engine => SearchEngineOptions.GoogleImages;`
	`9`	`+ public override SearchEngineOptions EngineOption => SearchEngineOptions.GoogleImages;`
`10`	`10`
`11`	`11`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ namespace SmartImage.Lib.Engines.Impl.Other`
`3`	`3`	`{`
`4`	`4`	`public sealed class ImgOpsEngine : BaseSearchEngine`
`5`	`5`	`{`
`6`		`- public override SearchEngineOptions Engine => SearchEngineOptions.ImgOps;`
	`6`	`+ public override SearchEngineOptions EngineOption => SearchEngineOptions.ImgOps;`
`7`	`7`
`8`	`8`	`//public int MaxSize => 5;`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ public sealed class KarmaDecayEngine : BaseSearchEngine`
`4`	`4`	`{`
`5`	`5`	`public KarmaDecayEngine() : base("http://karmadecay.com/search/?q=") { }`
`6`	`6`
`7`		`- public override SearchEngineOptions Engine => SearchEngineOptions.KarmaDecay;`
	`7`	`+ public override SearchEngineOptions EngineOption => SearchEngineOptions.KarmaDecay;`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,8 @@ public SauceNaoEngine() : this(String.Empty) { } //todo`
`49`	`49`
`50`	`50`	`public string Authentication { get; init; }`
`51`	`51`
`52`		`- public override SearchEngineOptions Engine => SearchEngineOptions.SauceNao;`
	`52`	`+ public override SearchEngineOptions EngineOption => SearchEngineOptions.SauceNao;`
	`53`	`+`
`53`	`54`
`54`	`55`	`private static IEnumerable<SauceNaoDataResult> ParseResults(string url)`
`55`	`56`	`{`
`@@ -70,6 +71,7 @@ private static IEnumerable<SauceNaoDataResult> ParseResults(string url)`
`70`	`71`
`71`	`72`	`if (html.Contains("Search Limit Exceeded")) {`
`72`	`73`	`Trace.WriteLine("SauceNao on cooldown!", C_WARN);`
	`74`	`+`
`73`	`75`	`return null;`
`74`	`76`	`}`
`75`	`77`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,9 @@ public sealed class TidderEngine : InterpretedSearchEngine`
`16`	`16`	`{`
`17`	`17`	`public TidderEngine() : base("http://tidder.xyz/?imagelink=") { }`
`18`	`18`
`19`		`- public override SearchEngineOptions Engine => SearchEngineOptions.Tidder;`
	`19`	`+ public override SearchEngineOptions EngineOption => SearchEngineOptions.Tidder;`
`20`	`20`
`21`		`- public override string Name => Engine.ToString();`
	`21`	`+ public override string Name => EngineOption.ToString();`
`22`	`22`
`23`	`23`
`24`	`24`	`protected override SearchResult Process(IDocument doc, SearchResult sr)`