Various improvements, UI/UX refactoring

Author: Decimation

SmartImage/Core/Info.cs

@@ -37,27 +37,20 @@ public static class Info
 			@" |____/|_| |_| |_|\__,_|_|   \__|___|_| |_| |_|\__,_|\__, |\___|" + "\n" +
 			"                                                     |___/\n";
 
-		// @formatter:off — disable formatter after this line
-
-		public const string NAME_BANNER2 = "#############################\n" +
-		                                   "############**###############\n" +
-		                                   "#######*           ,#########" 	 + "  ____                       _   ___\n"+
-		                                   "######   ########   ,.#######" 	 + " / ___| _ __ ___   __ _ _ __| |_|_ _|_ __ ___   __ _  __ _  ___\n" +
-		                                   "#####.  ,,#####.,,   ,,.,####" 	 + @" \___ \| '_ ` _ \ / _` | '__| __|| || '_ ` _ \ / _` |/ _` |/ _ \" + "\n" +
-		                                   "##,.,,   ,,.,,,.,   ,,,.,,,##" 	 + "  ___) | | | | | | (_| | |  | |_ | || | | | | | (_| | (_| |  __/\n" +
-		                                   "(((((((*            (((((((((" 	 + @" |____/|_| |_| |_|\__,_|_|   \__|___|_| |_| |_|\__,_|\__, |\___|" + "\n" +
-		                                   "((((((((((((**((((    *(((((("   + "                                                     |___/\n" +
-										   "((((((((((((((((((((,    ((((\n" +
-		                                   "(((((((((((((((((((((((((((((\n" +
-		                                   "(((((((((((((((((((((((((((((\n";
-
-		// @formatter:on — enable formatter after this line
-
-
+		
+		/// <summary>
+		/// Name
+		/// </summary>
 		public const string NAME = "SmartImage";
 
+		/// <summary>
+		/// Executable file name
+		/// </summary>
 		public const string NAME_EXE = "SmartImage.exe";
 
+		/// <summary>
+		/// Config file name (<see cref="SearchConfig"/>)
+		/// </summary>
 		public const string NAME_CFG = "SmartImage.cfg";
 
 		public const string Author = "Read Stanton";
@@ -77,7 +70,7 @@ public static class Info
 
 		public static string AppFolder
 		{
-			// todo: use ProgramData
+			// todo: use ProgramData?
 
 			get
 			{
@@ -106,21 +99,6 @@ public static void Setup()
 			}
 		}
 
-		internal static Stream? GetResource(string resource)
-		{
-			Assembly a = Assembly.GetExecutingAssembly();
-
-			var n = a.GetName().Name;
-
-			//"SmartImage.hint.wav"
-
-			// [Assembly].[asset]
-
-			resource = n + "." + resource;
-
-			return a.GetManifestResourceStream(resource);
-		}
-
 		internal static void ShowInfo()
 		{
 
@@ -196,10 +174,5 @@ internal static void ShowInfo()
 				NConsole.WriteInfo("{0} ({1})", name.Name, name.Version);
 			}
 		}
-
-		internal static class Resources
-		{
-			internal static readonly Stream SndHint = GetResource("hint.wav")!;
-		}
 	}
 }

SmartImage/Core/Integration.cs

@@ -93,15 +93,13 @@ internal static void HandlePath(IntegrationOption option)
 			switch (option) {
 				case IntegrationOption.Add:
 				{
-					string oldValue = OS.EnvironmentPath;
-
+					string oldValue  = OS.EnvironmentPath;
 					string appFolder = Info.AppFolder;
 
 					if (Info.IsAppFolderInPath) {
 						return;
 					}
 
-
 					bool appFolderInPath = oldValue
 						.Split(OS.PATH_DELIM)
 						.Any(p => p == appFolder);

SmartImage/Engines/SauceNao/SauceNaoEngine.cs

@@ -101,11 +101,6 @@ public override FullSearchResult GetResult(string url)
 			try {
 				var orig = GetResults(url);
 
-				if (orig == null) {
-					result.ExtendedInfo.Add($"Timed out after {Timeout}");
-					return result;
-				}
-				
 				var sn = orig
 					.OrderByDescending(r => r.Similarity)
 					.ToArray();
@@ -137,33 +132,23 @@ public override FullSearchResult GetResult(string url)
 
 			return result;
 		}
-
-		/// <summary>
-		/// Timeout duration
-		/// </summary>
-		public static readonly TimeSpan Timeout = TimeSpan.FromSeconds(15);
+		
 
 		private IEnumerable<SauceNaoResult>? GetResults(string url)
 		{
 
-			var task = Task.Run(() =>
-			{
-				var req = new RestRequest();
-				req.AddQueryParameter("db", "999");
-				req.AddQueryParameter("output_type", "2");
-				req.AddQueryParameter("numres", "16");
-				req.AddQueryParameter("api_key", m_apiKey);
-				req.AddQueryParameter("url", url);
-
-				var res = m_client.Execute(req);
+			var req = new RestRequest();
+			req.AddQueryParameter("db", "999");
+			req.AddQueryParameter("output_type", "2");
+			req.AddQueryParameter("numres", "16");
+			req.AddQueryParameter("api_key", m_apiKey);
+			req.AddQueryParameter("url", url);
 
-				string c = res.Content;
+			var res = m_client.Execute(req);
 
-				return ReadResults(c);
-			});
+			string c = res.Content;
 
-			// Handle possible timeouts
-			return task.Wait(Timeout) ? task.Result : null;
+			return ReadResults(c);
 		}
 
 

SmartImage/Program.cs

@@ -26,8 +26,8 @@ public static class Program
 		//                                                     |___/
 
 		/*
-		 * todo: refactor access modifiers
-		 * todo: maybe create a separate unit testing project
+		 * todo: use async/tasks
+		 * todo: timeout handling
 		 */
 
 		/*

SmartImage/Searching/FullSearchResult.cs

@@ -37,8 +37,6 @@ public FullSearchResult(Color color, string name, string url, float? similarity
 			Similarity      = similarity;
 			ExtendedInfo    = new List<string>();
 			ExtendedResults = new List<FullSearchResult>();
-
-
 		}
 
 		/// <summary>
@@ -57,15 +55,6 @@ public override NConsoleFunction? CtrlFunction
 			{
 				return () =>
 				{
-					// if (!IsImage.HasValue || !IsImage.Value) {
-					// 	bool ok = NConsoleIO.ReadConfirmation(
-					// 		$"Link may not be an image. Download anyway?");
-					// 	
-					// 	if (!ok) {
-					// 		return null;
-					// 	}
-					// }
-
 					Debug.WriteLine("Downloading");
 
 					string? path = Network.DownloadUrl(Url);
@@ -75,14 +64,13 @@ public override NConsoleFunction? CtrlFunction
 					// Open folder with downloaded file selected
 					FileSystem.ExploreFile(path);
 
-
 					NConsoleIO.WaitForSecond();
 
 					return null;
 				};
 			}
 		}
-		
+
 
 		public override string Data => ToString();
 
@@ -106,6 +94,7 @@ public override NConsoleFunction Function
 			{
 				return () =>
 				{
+					// Open in browser
 					Network.OpenUrl(Url);
 					return null;
 				};
@@ -185,6 +174,7 @@ public override string ToString()
 			if (RawUrl != Url) {
 				sb.Append($"\tResult: {Url}\n");
 			}
+
 			if (RawUrl != null) {
 				sb.Append($"\tRaw: {RawUrl}\n");
 			}
@@ -233,5 +223,29 @@ private IList<FullSearchResult> FromExtendedResult(IReadOnlyList<ISearchResult>
 
 			return rg;
 		}
+
+		public static int CompareResults(FullSearchResult x, FullSearchResult y)
+		{
+			float xSim = x?.Similarity ?? 0;
+			float ySim = y?.Similarity ?? 0;
+
+			if (xSim > ySim) {
+				return -1;
+			}
+
+			if (xSim < ySim) {
+				return 1;
+			}
+
+			if (x?.ExtendedResults.Count > y?.ExtendedResults.Count) {
+				return -1;
+			}
+
+			if (x?.ExtendedInfo.Count > y?.ExtendedInfo.Count) {
+				return -1;
+			}
+
+			return 0;
+		}
 	}
 }