Fixes; UI improvements

Author: Decimation

SmartImage.Lib/Engines/Impl/IqdbEngine.cs

@@ -42,9 +42,7 @@ private static ImageResult ParseResult(IHtmlCollection<IElement> tr)
 				url = img.ChildNodes[0].ChildNodes[0].TryGetAttribute("href");
 
 				// Links must begin with http:// in order to work with "start"
-				//if (url.StartsWith("//")) {
-				//	url = "http:" + url;
-				//}
+
 			}
 			catch {
 				// ignored
@@ -79,7 +77,18 @@ private static ImageResult ParseResult(IHtmlCollection<IElement> tr)
 				sim = null;
 			}
 
-			var uri = url != null ? new Uri(url) : null;
+			Uri uri;
+
+			if (url != null) {
+				if (url.StartsWith("//")) {
+					url = "http:" + url;
+				}
+
+				uri = new Uri(url);
+			}
+			else {
+				uri = null;
+			}
 
 
 			var result = new ImageResult
@@ -93,9 +102,6 @@ private static ImageResult ParseResult(IHtmlCollection<IElement> tr)
 			};
 
 
-			
-
-
 			return result;
 		}
 

SmartImage.Lib/SearchClient.cs

@@ -5,10 +5,13 @@
 using SmartImage.Lib.Utilities;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using SimpleCore.Net;
+using SimpleCore.Utilities;
 using SmartImage.Lib.Upload;
 using static SimpleCore.Diagnostics.LogCategories;
 
@@ -24,16 +27,28 @@ public SearchClient(SearchConfig config)
 
 			Results = new List<SearchResult>();
 
+			Update();
+		}
+
+		public void Update()
+		{
+			if (Config.SearchEngines == SearchEngineOptions.None) {
+				Config.SearchEngines = SearchEngineOptions.All;
+			}
+
 			Engines = GetAllSearchEngines()
 			          .Where(e => Config.SearchEngines.HasFlag(e.Engine))
 			          .ToArray();
+
+			Trace.WriteLine($"Engines: {Config.SearchEngines} | {Engines.QuickJoin()}");
 		}
 
+
 		public SearchConfig Config { get; init; }
 
 		public bool IsComplete { get; private set; }
 
-		public BaseSearchEngine[] Engines { get; init; }
+		public BaseSearchEngine[] Engines { get; private set; }
 
 		public List<SearchResult> Results { get; }
 
@@ -170,7 +185,8 @@ public static BaseSearchEngine[] GetAllSearchEngines()
 
 		public event EventHandler<SearchResultEventArgs> ResultCompleted;
 
-		public event EventHandler SearchCompleted;
+		public event EventHandler                SearchCompleted;
+		public event PropertyChangedEventHandler PropertyChanged;
 	}
 
 	public sealed class SearchResultEventArgs : EventArgs

SmartImage.Lib/SearchConfig.cs

@@ -4,6 +4,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using SimpleCore.Utilities;
 using SmartImage.Lib.Engines;
 using SmartImage.Lib.Searching;
@@ -24,7 +25,7 @@ public sealed class SearchConfig
 		/// <summary>
 		/// Search engines to use
 		/// </summary>
-		public SearchEngineOptions SearchEngines { get; set; } = SearchEngineOptions.All;
+		public SearchEngineOptions SearchEngines { get; set; }
 
 		/// <summary>
 		/// Priority engines

SmartImage.Lib/Searching/ImageResult.cs

@@ -190,18 +190,24 @@ public void UpdateFrom(ImageResult result)
 
 		public void FindDirectImages()
 		{
-			
-				if (Url is not null) {
-					string? images = ImageHelper.FindDirectImages(Url?.ToString()).FirstOrDefault();
+
+			if (Url is not null) {
+				var directImages = ImageHelper.FindDirectImages(Url?.ToString());
+
+				if (directImages is { }) {
+					string? images = directImages.FirstOrDefault();
 
 					if (images is { }) {
-						var uri = new Uri(images);
 
+						var uri = new Uri(images);
 						Direct = uri;
+						Debug.WriteLine($"{Url} -> {Direct}");
 					}
-
 				}
-			
+
+
+			}
+
 		}
 
 		public string ToString(bool indent)

SmartImage.Lib/Utilities/ImageHelper.cs

@@ -114,6 +114,7 @@ public static string[] FindDirectImages(string url)
 				Debug.WriteLine($"{e.Message}", C_ERROR);
 				return null;
 			}
+
 			const string HREF_PATTERN = "<a\\s+(?:[^>]*?\\s+)?href=\"([^\"]*)\"";
 
 			var m2 = Regex.Matches(html, HREF_PATTERN);
@@ -141,20 +142,20 @@ public static string[] FindDirectImages(string url)
 				// todo: is running PLINQ within a task thread-safe?
 
 				results = rg.AsParallel()
-				            .Where(e => Network.IsUri(e, out var u) && Network.IsUriAlive(new Uri(e)) && IsDirect(e))
+				            .Where(e => Network.IsUri(e, out var u) && IsDirect(u == null ? e : u.ToString()))
 				            .ToArray();
 
-				Debug.WriteLine($"{nameof(FindDirectImages)}: {rg.Count} -> {results.Length}", C_DEBUG);
+				//Debug.WriteLine($"{nameof(FindDirectImages)}: {rg.Count} -> {results.Length}", C_DEBUG);
 			});
 
 
-			var timeout = TimeSpan.FromSeconds(3);
+			var timeout = TimeSpan.FromSeconds(5);
 
 			if (t.Wait(timeout)) {
 				//
 			}
 			else {
-				Debug.WriteLine($"{nameof(FindDirectImages)}: timeout!", C_WARN);
+				//Debug.WriteLine($"{nameof(FindDirectImages)}: timeout!", C_WARN);
 			}
 
 

SmartImage/Core/DialogUtilities.cs

@@ -3,8 +3,10 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Net;
 using System.Text;
 using System.Threading.Tasks;
+using Novus.Win32;
 using SimpleCore.Cli;
 using SimpleCore.Net;
 using SimpleCore.Utilities;
@@ -35,39 +37,35 @@ internal static NConsoleOption Convert(SearchResult result)
 
 					return null;
 				},
-				/*CtrlFunction = () =>
-				{
-					var flatten = new List<ImageResult>()
-					{
-						result.PrimaryResult,
-					};
-					flatten.AddRange(result.OtherResults);
-
-					flatten = flatten.Where(f => f.Url != null).ToList();
-
-					//var direct = flatten.AsParallel().SelectMany(x => ImageHelper.FindDirectImages(x?.Url?.ToString()));
-
-
-
-					Parallel.ForEach(flatten, f =>
-					{
-						f.FindDirectImages();
-					});
 
+				ComboFunction = () =>
+				{
+					var direct = result.PrimaryResult.Direct;
 
+					var ok = direct != null;
 
-					foreach (var s in flatten) {
-						Debug.WriteLine($"{s.Direct}");
+					if (ok) {
+						var p = WebUtilities.Download(direct!.ToString());
+						FileSystem.ExploreFile(p);
 					}
 
-					
-
 					return null;
-				},*/
+				},
 				//Name = result.Engine.Name,
 				Data = result.ToString()
 			};
 
+			option.CtrlFunction = () =>
+			{
+				result.OtherResults.AsParallel().ForAll(x => x.FindDirectImages());
+
+				result.PrimaryResult.UpdateFrom(result.OtherResults.First());
+
+				option.Data = result.ToString();
+
+				return null;
+			};
+
 			return option;
 		}
 

SmartImage/Core/MainDialog.cs

@@ -61,6 +61,7 @@ public static class MainDialog
 
 					Console.WriteLine(Program.Config.SearchEngines);
 					NConsole.WaitForSecond();
+					Program.Client.Update();
 					return null;
 				}
 			},
@@ -74,6 +75,7 @@ public static class MainDialog
 
 					Console.WriteLine(Program.Config.PriorityEngines);
 					NConsole.WaitForSecond();
+					Program.Client.Update();
 					return null;
 				}
 			},
@@ -86,7 +88,7 @@ public static class MainDialog
 
 					//hack: hacky 
 					MainMenuOptions[3].Name = GetFilterName(Program.Config.Filter);
-					
+					Program.Client.Update();
 					return null;
 				}
 			},
@@ -99,7 +101,7 @@ public static class MainDialog
 
 					//hack: hacky 
 					MainMenuOptions[4].Name = GetDirectName(Program.Config.DirectUri);
-
+					Program.Client.Update();
 					return null;
 				}
 			},

SmartImage/Program.cs

@@ -10,6 +10,7 @@
 using System.IO;
 using System.Linq;
 using System.Media;
+using System.Threading;
 using System.Threading.Tasks;
 using Novus.Win32;
 using SimpleCore.Net;
@@ -91,6 +92,7 @@ private static async Task Main(string[] args)
 							var directImages = ImageHelper.FindDirectImages((string) arg);
 
 							Console.WriteLine("Links:");
+
 							foreach (string s in directImages) {
 								Console.WriteLine(s);
 							}
@@ -112,10 +114,13 @@ private static async Task Main(string[] args)
 				Client.ResultCompleted += ResultCompleted;
 				Client.SearchCompleted += SearchCompleted;
 
-				// Show results
 
+				StartProgressBar();
+
+				// Show results
 				var searchTask = Client.RunSearchAsync();
 
+
 				NConsole.ReadOptions(ResultDialog);
 
 				await searchTask;
@@ -129,10 +134,21 @@ private static async Task Main(string[] args)
 		}
 
 
+		private static void StartProgressBar()
+		{
+			// Pass the token to the cancelable operation.
+			ThreadPool.QueueUserWorkItem(NConsoleProgress.Show, ProgressCancellationToken.Token);
+		}
+
+		
+		private static readonly CancellationTokenSource ProgressCancellationToken = new();
+
 		private static void SearchCompleted(object? sender, EventArgs eventArgs)
 		{
 			NativeImports.FlashConsoleWindow();
 			SystemSounds.Exclamation.Play();
+			
+			ProgressCancellationToken.Cancel();
 		}
 
 		private static void ResultCompleted(object? sender, SearchResultEventArgs eventArgs)