Improvements

Author: Decimation

SmartImage.Lib/Engines/BaseSearchEngine.cs

@@ -3,6 +3,7 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
+using System.Net.NetworkInformation;
 using System.Threading.Tasks;
 using SmartImage.Lib.Utilities;
 using static SimpleCore.Diagnostics.LogCategories;
@@ -71,13 +72,18 @@ public Uri GetRawResultUri(ImageQuery query)
 		{
 			var uri = new Uri(BaseUrl + query.UploadUri);
 
-			bool ok = Network.IsUriAlive(uri, Timeout);
+			var reply = Network.Ping(uri, (long)Timeout.TotalMilliseconds);
 
-			if (!ok) {
-				Debug.WriteLine($"{uri} is unavailable or timed out after {Timeout:g}", C_WARN);
+			//var b = Network.IsAlive(uri, (long) Timeout.TotalMilliseconds);
+
+			//var b1 = ok.Status != IPStatus.Success || ok.Status == IPStatus.TimedOut;
+
+			
+			
+			if (reply.Status != IPStatus.Success) {
+				Debug.WriteLine($"{Name} is unavailable or timed out after {Timeout:g} ({reply.Status})", C_WARN);
 				return null;
 			}
-
 			return uri;
 		}
 	}

SmartImage.Lib/Engines/Impl/TraceMoeEngine.cs

@@ -22,6 +22,7 @@ public sealed class TraceMoeEngine : ClientSearchEngine
 	{
 		public TraceMoeEngine() : base("https://trace.moe/?url=", "https://api.trace.moe") { }
 
+		//public override TimeSpan Timeout => TimeSpan.FromSeconds(4);
 
 		/// <summary>
 		/// Used to retrieve more information about results

SmartImage.Lib/SearchClient.cs

@@ -76,9 +76,8 @@ public void Reload()
 			          .Where(e => Config.SearchEngines.HasFlag(e.EngineOption))
 			          .ToArray();
 
-			Trace.WriteLine($"Engines: {Config.SearchEngines} | {Engines.QuickJoin()}");
-
 
+			Trace.WriteLine($"Engines: {Config.SearchEngines}");
 		}
 
 		/// <summary>

SmartImage.Lib/Searching/ImageResult.cs

@@ -120,6 +120,11 @@ public float? MegapixelResolution
 
 		public Image? Image { get; set; }
 
+		public ImageResult()
+		{
+			OtherMetadata = new Dictionary<string, object>();
+		}
+
 		public static ImageResult FromDirectImage(DirectImage di)
 		{
 			var ir = new ImageResult
@@ -134,11 +139,6 @@ public static ImageResult FromDirectImage(DirectImage di)
 			return ir;
 		}
 
-		public ImageResult()
-		{
-			OtherMetadata = new Dictionary<string, object>();
-		}
-
 		private static List<FieldInfo> GetDetailFields()
 		{
 			var fields = typeof(ImageResult).GetRuntimeFields().Where(f => !f.IsStatic).ToList();
@@ -209,35 +209,34 @@ public void UpdateFrom(ImageResult result)
 
 		public void FindDirectImages()
 		{
-			if (Url is not null && Direct == null) {
 
-				if (ImageHelper.IsDirect(Url.ToString())) {
-					Direct = Url;
+			if (Url == null || Direct != null) 
+				return;
 
-				}
-				else {
-					try {
+			if (ImageHelper.IsDirect(Url.ToString())) {
+				Direct = Url;
+			}
+			else {
+				try {
 
-						var directImages = ImageHelper.FindDirectImages(Url.ToString());
+					var directImages = ImageHelper.FindDirectImages(Url.ToString());
 
-						var direct = directImages?.FirstOrDefault();
+					var direct = directImages?.FirstOrDefault();
 
-						if (direct != null) {
-							Direct = (direct.Value.Direct);
-							Image  = direct.Value.Image;
-							//Debug.WriteLine($"{Url} -> {Direct}");
+					if (direct != null) {
+						Direct = (direct.Value.Direct);
+						Image  = direct.Value.Image;
+						//Debug.WriteLine($"{Url} -> {Direct}");
 
-						}
-					}
-					catch {
-						//
 					}
 				}
+				catch {
+					//
+				}
+			}
 
 
-				UpdateImageData();
-
-			}
+			UpdateImageData();
 		}
 
 		public void UpdateImageData()

SmartImage.Lib/Utilities/ImageHelper.cs

@@ -13,6 +13,7 @@
 using Novus.Win32;
 using SimpleCore.Net;
 using SimpleCore.Utilities;
+using static SimpleCore.Diagnostics.LogCategories;
 
 // ReSharper disable CognitiveComplexity
 // ReSharper disable PossibleNullReferenceException
@@ -114,35 +115,39 @@ public static bool IsDirect(string url, DirectImageType directType = DirectImage
 
 		}
 
-		public static Dictionary<string,string> InstalledUtilities
+
+		#region Cli
+
+		private const string MAGICK_EXE     = "magick.exe";
+		private const string GALLERY_DL_EXE = "gallery-dl.exe";
+		private const string YOUTUBE_DL_EXE = "youtube-dl.exe";
+		private const string FFPROBE_EXE    = "ffprobe.exe";
+		private const string FFMPEG_EXE     = "ffmpeg.exe";
+
+		public static Dictionary<string, string> UtilitiesMap
 		{
 			get
 			{
-				var utils = new List<string>
-				{
-					FFMPEG_EXE, FFPROBE_EXE, MAGICK_EXE, YOUTUBE_DL_EXE, GALLERY_DL_EXE
-				};
-
 				var rg = new Dictionary<string, string>();
 
-				foreach (string s in utils) {
-					var x = FileSystem.SearchInPath(s);
+				foreach (string exe in Utilities) {
+					var path = FileSystem.SearchInPath(exe);
 
 
-					rg.Add(s,x);
+					rg.Add(exe, path);
 				}
 
 				return rg;
 
 			}
 		}
 
+		public static readonly List<string> Utilities = new()
+		{
+			FFMPEG_EXE, FFPROBE_EXE, MAGICK_EXE, YOUTUBE_DL_EXE, GALLERY_DL_EXE
+		};
 
-		private const string MAGICK_EXE     = "magick.exe";
-		private const string GALLERY_DL_EXE = "gallery-dl.exe";
-		private const string YOUTUBE_DL_EXE = "youtube-dl.exe";
-		private const string FFPROBE_EXE    = "ffprobe.exe";
-		private const string FFMPEG_EXE     = "ffmpeg.exe";
+		#endregion
 
 
 		/// <summary>
@@ -161,11 +166,11 @@ public static List<DirectImage> FindDirectImages(string url, DirectImageType dir
 		{
 			var directImages = new List<DirectImage>();
 
-			string gallerydl = InstalledUtilities[GALLERY_DL_EXE];
+			string gallerydl = UtilitiesMap[GALLERY_DL_EXE];
 
 			if (gallerydl != null) {
 
-				Trace.WriteLine($"Using gallery-dl!");
+				//Trace.WriteLine($"Using gallery-dl!");
 
 				var output = new Process
 				{
@@ -174,6 +179,7 @@ public static List<DirectImage> FindDirectImages(string url, DirectImageType dir
 						FileName               = gallerydl,
 						Arguments              = $"-G {url}",
 						RedirectStandardOutput = true,
+						RedirectStandardError  = true,
 						CreateNoWindow         = true
 					}
 				};
@@ -190,9 +196,17 @@ public static List<DirectImage> FindDirectImages(string url, DirectImageType dir
 						Direct = new Uri(str),
 						Image  = Image.FromStream(WebUtilities.GetStream(str))
 					});
+					//Debug.WriteLine($">>{d}");
+				}
+
+				var standardError = output.StandardError;
+
+				while (!standardError.EndOfStream) {
+					var line = standardError.ReadLine();
+					Debug.WriteLine($"{GALLERY_DL_EXE}: {line}", C_ERROR);
 				}
 
-				return directImages;
+				return directImages.OrderByDescending(x => x.Image.Width * x.Image.Height).ToList();
 			}
 
 			imageFilter ??= (x) => true;
@@ -248,7 +262,7 @@ public static List<DirectImage> FindDirectImages(string url, DirectImageType dir
 						if (!Network.IsUri(currentUrl, out var uri))
 							continue;
 
-						if (!Network.IsUriAlive(uri, pingTime))
+						if (!Network.IsAlive(uri, (long)pingTime.TotalMilliseconds))
 							continue;
 
 						if (!IsDirect(currentUrl, directType))
@@ -301,7 +315,7 @@ public static List<DirectImage> FindDirectImages(string url, DirectImageType dir
 			Task.WaitAll(tasks.ToArray());
 
 
-			return directImages;
+			return directImages.OrderByDescending(x => x.Image.Width * x.Image.Height).ToList();
 
 		}
 

SmartImage/Core/AppIntegration.cs

@@ -12,6 +12,8 @@
 using SimpleCore.Utilities;
 using static SimpleCore.Diagnostics.LogCategories;
 
+// ReSharper disable CognitiveComplexity
+
 // ReSharper disable InconsistentNaming
 
 // ReSharper disable UnusedMember.Global

SmartImage/Core/AppInterface.cs

@@ -20,6 +20,7 @@
 using Novus.Win32;
 using SimpleCore.Net;
 using SmartImage.Lib;
+using SmartImage.Lib.Utilities;
 using SmartImage.Utilities;
 using static Novus.Utilities.ReflectionOperatorHelpers;
 using static SmartImage.Program;
@@ -149,11 +150,12 @@ internal static class AppInterface
 					Console.WriteLine();
 					Console.WriteLine(Strings.Separator);
 
-					foreach (string utility in AppInfo.InstalledUtilities) {
+					foreach (var utility in ImageHelper.UtilitiesMap) {
 						Console.WriteLine(utility);
 					}
 
 					Console.WriteLine();
+					Console.WriteLine(Strings.Separator);
 
 					var dependencies = ReflectionHelper.DumpDependencies();
 

SmartImage/Program.cs

@@ -37,6 +37,7 @@
 using SmartImage.Lib.Searching;
 using SmartImage.Lib.Utilities;
 using SmartImage.Utilities;
+
 // ReSharper disable CognitiveComplexity
 
 namespace SmartImage
@@ -49,9 +50,9 @@ public static class Program
 		//  ___) | | | | | | (_| | |  | |_ | || | | | | | (_| | (_| |  __/
 		// |____/|_| |_| |_|\__,_|_|   \__|___|_| |_| |_|\__,_|\__, |\___|
 		//                                                     |___/
-		
+
 		#region Core fields
-		
+
 		public static readonly SearchConfig Config = new();
 
 		public static readonly SearchClient Client = new(Config);
@@ -62,7 +63,6 @@ public static class Program
 			Description = AppInterface.Description
 		};
 
-
 		#endregion
 
 		/// <summary>
@@ -78,6 +78,8 @@ private static async Task Main(string[] args)
 
 
 #endif
+			
+
 			/*
 			 * Setup
 			 * Check compatibility
@@ -125,10 +127,8 @@ private static async Task Main(string[] args)
 						case CMD_FIND_DIRECT:
 							argEnumerator.MoveNext();
 
-							var directImages = ImageHelper.FindDirectImages((string) argEnumerator.Current);
-
-							var imageResults = directImages.Select(ImageResult.FromDirectImage);
-
+							var directImages  = ImageHelper.FindDirectImages((string) argEnumerator.Current);
+							var imageResults  = directImages.Select(ImageResult.FromDirectImage);
 							var directOptions = AppInterface.CreateResultOptions(imageResults, "Image");
 
 
@@ -171,7 +171,7 @@ private static async Task Main(string[] args)
 
 				// Add original image
 				ResultDialog.Options.Add(AppInterface.CreateResultOption(
-					                         Config.Query.GetImageResult(), "(Original image)", 
+					                         Config.Query.GetImageResult(), "(Original image)",
 					                         AppInterface.ColorMain, -0.1f));
 
 
@@ -235,6 +235,5 @@ private static void OnResultCompleted(object? sender, SearchResultEventArgs even
 		private const string CMD_SEARCH = "search";
 
 		#endregion
-		
 	}
 }