Toast notification; updates

Author: Decimation

SmartImage.Lib/Searching/ImageResult.cs

@@ -192,11 +192,11 @@ public void UpdateFrom(ImageResult result)
 
 		public async Task FindDirectImagesAsync()
 		{
-			if (Url is not null) {
+			if (Url is not null && Direct == null) {
 
 				if (ImageHelper.IsDirect(Url.ToString())) {
 					Direct = Url;
-
+					
 				}
 				else {
 					try {

SmartImage/Core/MainDialog.cs

@@ -14,6 +14,7 @@
 using SimpleCore.Net;
 using SmartImage.Lib;
 using SmartImage.Utilities;
+
 // ReSharper disable PossibleNullReferenceException
 
 namespace SmartImage.Core
@@ -40,9 +41,13 @@ public static class MainDialog
 
 		internal static string ToToggleString(this bool b) => b ? Enabled : Disabled;
 
-		private static string GetFilterName(bool added)      => $"Filter ({(added.ToToggleString())})";
-		private static string GetName(string s,bool added)      => $"{s} ({(added.ToToggleString())})";
-		private static string GetContextMenuName(bool added) => $"Context menu ({(added.ToToggleString())})";
+		private static string GetFilterName(bool added)     => GetName("Filter", added);
+		private static string GetNotificationName(bool added)      => GetName("Notification", added);
+		private static string GetNotificationImageName(bool added)   => GetName("Notification image", added);
+		private static string GetName(string s, bool added) => $"{s} ({(added.ToToggleString())})";
+		
+
+		private static string GetContextMenuName(bool added) => GetName("Context menu", added);
 
 		#endregion
 
@@ -51,15 +56,15 @@ public static class MainDialog
 		{
 			new()
 			{
-				Name = ">>> Run <<<",
+				Name  = ">>> Run <<<",
 				Color = ColorMain,
 				Function = () =>
 				{
 					ImageQuery query = NConsole.ReadInput("Image file or direct URL", x =>
 					{
 						(bool url, bool file) = ImageQuery.IsUriOrFile(x);
 						return !(url || file);
-					},"Input must be file or direct image link");
+					}, "Input must be file or direct image link");
 
 					Program.Config.Query = query;
 					return true;
@@ -68,7 +73,7 @@ public static class MainDialog
 
 			new()
 			{
-				Name = "Engines",
+				Name  = "Engines",
 				Color = ColorOther,
 				Function = () =>
 				{
@@ -109,24 +114,24 @@ public static class MainDialog
 			},
 			new()
 			{
-				Name = GetName("Notification",Program.Config.Notification),
+				Name = GetNotificationName(Program.Config.Notification),
 				Function = () =>
 				{
 					Program.Config.Notification = !Program.Config.Notification;
 
-					MainMenuOptions[4].Name = GetName("Notification",Program.Config.Notification);
+					MainMenuOptions[4].Name = GetNotificationName(Program.Config.Notification);
 					SaveAndUpdateConfig();
 					return null;
 				}
 			},
 			new()
 			{
-				Name = GetName("Notification",Program.Config.NotificationImage),
+				Name = GetNotificationImageName(Program.Config.NotificationImage),
 				Function = () =>
 				{
 					Program.Config.NotificationImage = !Program.Config.NotificationImage;
 
-					MainMenuOptions[5].Name = GetName("Notification",Program.Config.NotificationImage);
+					MainMenuOptions[5].Name = GetNotificationImageName(Program.Config.NotificationImage);
 					SaveAndUpdateConfig();
 					return null;
 				}
@@ -179,7 +184,7 @@ public static class MainDialog
 					var di = new DirectoryInfo(Info.ExeLocation);
 
 					Console.WriteLine($"Executable location: {di.Parent.Name}");
-					
+
 					Console.WriteLine($"In path: {Info.IsAppFolderInPath}");
 					Console.WriteLine($"Context menu added: {OSIntegration.IsContextMenuAdded}");
 
@@ -216,7 +221,7 @@ public static class MainDialog
 				{
 					WebUtilities.OpenUrl(Info.Wiki);
 
-					
+
 					return null;
 				}
 			},

SmartImage/Core/NConsoleFactory.cs

@@ -67,12 +67,16 @@ public static NConsoleOption Create(SearchResult result)
 
 				NConsoleProgress.Queue(cts);
 
-				result.OtherResults.AsParallel().ForAll(x =>
+				Task.WaitAll(result.OtherResults.Select(async delegate (ImageResult f)
 				{
-					x.FindDirectImagesAsync();
-				});
+					await f.FindDirectImagesAsync();
 
-				result.PrimaryResult.UpdateFrom(result.OtherResults.First());
+				}).ToArray());
+
+
+				result.PrimaryResult = result.OtherResults.First();
+
+				//result.PrimaryResult.UpdateFrom(result.OtherResults.First());
 
 				cts.Cancel();
 				cts.Dispose();

SmartImage/Program.cs

@@ -279,6 +279,7 @@ public static void ShowToast()
 			var bestResult = Client.FindBestResult();
 
 			if (Config.NotificationImage) {
+				Debug.WriteLine("Finding direct");
 				var direct = Client.FindDirectResult();
 				Debug.WriteLine(direct);