misc

Author: Decimation

SmartImage.Lib/Searching/ImageQuery.cs

@@ -54,7 +54,7 @@ public ImageQuery([NotNull] string value, [CanBeNull] BaseUploadEngine engine =
 			var now = Stopwatch.GetTimestamp();
 
 			if (String.IsNullOrWhiteSpace(value)) {
-				throw new ArgumentNullException(nameof(value));
+				throw new ArgumentNullException(nameof(value), "No input specified");
 			}
 
 
@@ -105,8 +105,8 @@ public ImageResult GetImageResult()
 			result.OtherMetadata.Add("Upload engine", UploadEngine.Name);
 			result.OtherMetadata.Add("Input type", IsUri ? "URI" : "File");
 			result.OtherMetadata.Add("Input value", Value);
-			result.OtherMetadata.Add("Time", $"{UploadTime.TotalSeconds:F3} uploading");
-
+			result.OtherMetadata.Add("Time", $"(upload: {UploadTime.TotalSeconds:F3})");
+			
 
 			result.UpdateImageData();
 

SmartImage/Program.cs

@@ -53,7 +53,6 @@ namespace SmartImage
 	// |____/|_| |_| |_|\__,_|_|   \__|___|_| |_| |_|\__,_|\__, |\___|
 	//                                                     |___/
 
-
 	public static class Program
 	{
 		#region Core fields
@@ -108,12 +107,10 @@ private static async Task Main(string[] args)
 			var process = Process.GetCurrentProcess();
 			process.PriorityClass = ProcessPriorityClass.AboveNormal;
 
-
 			/*
 			 * Start
 			 */
 
-
 			/*
 			 * Configuration precedence
 			 *
@@ -132,45 +129,35 @@ private static async Task Main(string[] args)
 			                        $"| PE: {Config.PriorityEngines} " +
 			                        $"| Filtering: {Config.Filtering.ToToggleString()}";
 
-			try {
+			CancellationTokenSource cts = new();
 
-				CancellationTokenSource cts = new();
+			// Run search
 
-				// Run search
+			Client.ResultCompleted += OnResultCompleted;
 
-				Client.ResultCompleted += OnResultCompleted;
-				Client.SearchCompleted += (obj, eventArgs) =>
-				{
-					OnSearchCompleted(obj, eventArgs, cts);
+			Client.SearchCompleted += (obj, eventArgs) =>
+			{
+				OnSearchCompleted(obj, eventArgs, cts);
 
-					if (Config.Notification) {
-						AppInterface.ShowToast(obj, eventArgs);
-					}
-				};
-
-				NConsoleProgress.Queue(cts);
+				if (Config.Notification) {
+					AppInterface.ShowToast(obj, eventArgs);
+				}
+			};
 
+			NConsoleProgress.Queue(cts);
 
-				// Show results
-				var searchTask = Client.RunSearchAsync();
+			// Show results
+			var searchTask = Client.RunSearchAsync();
 
-				// Add original image
-				ResultDialog.Options.Add(NConsoleFactory.CreateResultOption(
-					                         Config.Query.GetImageResult(), "(Original image)",
-					                         Elements.ColorMain, -0.1f));
+			// Add original image
+			ResultDialog.Options.Add(NConsoleFactory.CreateResultOption(
+				                         Config.Query.GetImageResult(), "(Original image)",
+				                         Elements.ColorMain, -0.1f));
 
+			ResultDialog.Read();
 
-				ResultDialog.Read();
+			await searchTask;
 
-				await searchTask;
-			}
-			catch (Exception exception) {
-#if !DEBUG
-				// ...
-#else
-				Console.WriteLine(exception);
-#endif
-			}
 		}
 
 		private static bool HandleArguments()
@@ -252,18 +239,18 @@ private static bool HandleArguments()
 					Client.Reload();
 				}
 				catch (Exception e) {
-					Console.WriteLine(e);
-					Console.ReadLine();
+					Console.WriteLine($"Error: {e.Message}");
+					return false;
 				}
 			}
 
 			return true;
 		}
 
-
 		#region Event handlers
 
-		private static void OnSearchCompleted(object? sender, SearchCompletedEventArgs eventArgs, CancellationTokenSource cts)
+		private static void OnSearchCompleted(object? sender, SearchCompletedEventArgs eventArgs,
+		                                      CancellationTokenSource cts)
 		{
 			Native.FlashConsoleWindow();
 

SmartImage/UI/AppInterface.cs

@@ -209,7 +209,7 @@ public static void ShowToast(object sender, SearchCompletedEventArgs args)
 			       .AddText($"Results: {Program.Client.Results.Count}");
 
 
-			var direct = args.Direct?.Value.Direct;
+			var direct = args.Direct?.Value?.Direct;
 
 			if (direct != null) {
 				var path = Path.GetTempPath();