Various improvements

Author: Decimation

SmartImage.Lib/SearchClient.cs

@@ -21,6 +21,7 @@
 // ReSharper disable UnusedMember.Global
 
 [assembly: InternalsVisibleTo("SmartImage")]
+
 namespace SmartImage.Lib;
 
 /// <summary>
@@ -77,7 +78,9 @@ public SearchClient(SearchConfig config)
 	/// </summary>
 	public List<SearchResult> FilteredResults { get; }
 
-
+	/// <summary>
+	/// Number of pending results
+	/// </summary>
 	public int Pending { get; private set; }
 
 	/// <summary>
@@ -190,7 +193,7 @@ public async Task RunSearchAsync()
 		var args = new SearchCompletedEventArgs
 		{
 			Results  = Results,
-			Detailed = PredicateFilter(Results, DetailPredicate),
+			Detailed = ApplyPredicateFilter(Results, DetailPredicate),
 			Direct   = DirectResults,
 			Filtered = FilteredResults
 		};
@@ -206,12 +209,27 @@ public Task<List<ImageResult>> WaitForDirectResults()
 	{
 		return Task.Run(() =>
 		{
-			while (Results.Any() && !DirectResults.Any()) { }
+			while (Results.Any() && !DirectResults.Any()) {
+				if (IsComplete) {
+					List<ImageResult> rescan = RescanImageResults(Results);
+					DirectResults.AddRange(rescan);
+
+					break;
+				}
+			}
 
 			return DirectResults;
 		});
 	}
 
+	private static List<ImageResult> RescanImageResults(List<SearchResult> results)
+	{
+		var b = results.SelectMany(x => x.AllResults.Where(x2 => x2.Direct != null))
+		               .OrderByDescending(x => x.PixelResolution)
+		               .ToList();
+		return b;
+	}
+
 	/// <summary>
 	///     Refines search results by searching with the most-detailed result (<see cref="FindDirectResults" />).
 	/// </summary>
@@ -221,7 +239,6 @@ public async Task RefineSearchAsync()
 			throw SearchException;
 		}
 
-
 		var directResult = DirectResults.FirstOrDefault();
 
 		if (directResult == null) {
@@ -264,7 +281,7 @@ private void FindDirectResults(object state, SearchResult value, int take1 = 10,
 	}
 
 
-	public static List<ImageResult> PredicateFilter(List<SearchResult> results, Predicate<SearchResult> predicate)
+	public static List<ImageResult> ApplyPredicateFilter(List<SearchResult> results, Predicate<SearchResult> predicate)
 	{
 		var query = results.Where(r => predicate(r))
 		                   .SelectMany(r => r.AllResults)
@@ -330,7 +347,6 @@ public static BaseSearchEngine[] GetAllSearchEngines()
 	private static readonly SmartImageException SearchException = new("Search must be completed");
 }
 
-
 public sealed class DirectResultsFoundEventArgs : EventArgs
 {
 	/// <remarks>

SmartImage.Lib/Searching/ImageResult.cs

@@ -5,14 +5,15 @@
 using System.Drawing;
 using System.Linq;
 using System.Reflection;
+using JetBrains.Annotations;
 using Kantan.Model;
 using Kantan.Numeric;
 using Kantan.Text;
 using SmartImage.Lib.Utilities;
 
 // ReSharper disable CognitiveComplexity
 #pragma warning disable 8629,CA1416
-#nullable enable
+#nullable disable
 
 namespace SmartImage.Lib.Searching;
 
@@ -38,7 +39,8 @@ public sealed class ImageResult : IOutline
 	/// <summary>
 	/// Direct image link of <see cref="Url"/>
 	/// </summary>
-	public Uri? Direct { get; set; }
+	[CanBeNull]
+	public Uri Direct { get; set; }
 
 	/// <summary>
 	/// Similarity
@@ -58,27 +60,32 @@ public sealed class ImageResult : IOutline
 	/// <summary>
 	/// Description, caption
 	/// </summary>
-	public string? Description { get; set; }
+	[CanBeNull]
+	public string Description { get; set; }
 
 	/// <summary>
 	/// Artist, author, creator
 	/// </summary>
-	public string? Artist { get; set; }
+	[CanBeNull]
+	public string Artist { get; set; }
 
 	/// <summary>
 	/// Source
 	/// </summary>
-	public string? Source { get; set; }
+	[CanBeNull]
+	public string Source { get; set; }
 
 	/// <summary>
 	/// Character(s) present in image
 	/// </summary>
-	public string? Characters { get; set; }
+	[CanBeNull]
+	public string Characters { get; set; }
 
 	/// <summary>
 	/// Site name
 	/// </summary>
-	public string? Site { get; set; }
+	[CanBeNull]
+	public string Site { get; set; }
 
 	/// <summary>
 	/// Date of image
@@ -88,7 +95,8 @@ public sealed class ImageResult : IOutline
 	/// <summary>
 	///     Result name
 	/// </summary>
-	public string? Name { get; set; }
+	[CanBeNull]
+	public string Name { get; set; }
 
 	/// <summary>
 	/// Whether <see cref="Width"/> and <see cref="Height"/> values are available
@@ -124,7 +132,8 @@ public float? MegapixelResolution
 	/// </summary>
 	public Dictionary<string, object> OtherMetadata { get; }
 
-	public Image? Image { get; set; }
+	[CanBeNull]
+	public Image Image { get; set; }
 
 	/// <summary>
 	/// The display resolution of this image
@@ -248,9 +257,6 @@ public void UpdateImageData()
 			Width  = Image.Width;
 			Height = Image.Height;
 
-			//
-			// OtherMetadata.Add("Size", MathHelper.ConvertToUnit(rg.Length));
-			// OtherMetadata.Add("Mime", MediaTypes.ResolveFromData(rg));
 		}
 	}
 

SmartImage.Lib/Searching/SearchResult.cs

@@ -46,6 +46,9 @@ public enum ResultStatus
 	/// </summary>
 	Extraneous,
 
+	/// <summary>
+	/// Engine which returned the result is on cooldown
+	/// </summary>
 	Cooldown
 }
 

SmartImage.Lib/Utilities/ImageHelper.cs

@@ -13,6 +13,7 @@
 using AngleSharp.Html.Dom;
 using JetBrains.Annotations;
 using Kantan.Net;
+using Kantan.Utilities;
 using Novus.Win32;
 using RestSharp;
 using static Kantan.Diagnostics.LogCategories;
@@ -82,7 +83,7 @@ public static Dictionary<string, string> UtilitiesMap
 	[CanBeNull]
 	public static string Download(Uri src, string path)
 	{
-		var filename = NormalizeFilename(src);
+		var filename = UriUtilities.NormalizeFilename(src);
 
 		string combine = Path.Combine(path, filename);
 
@@ -105,38 +106,7 @@ public static string Download(Uri src, string path)
 		}
 	}
 
-	private static string NormalizeFilename(Uri src)
-	{
-		string filename = Path.GetFileName(src.AbsolutePath);
-
-		if (!Path.HasExtension(filename)) {
-
-			// If no format is specified/found, just append a jpg extension
-			string ext = ".jpg";
-
-			// For Pixiv (?)
-			var kv = HttpUtility.ParseQueryString(src.Query);
-
-			var t = kv["format"];
-
-			if (t != null) {
-				ext = $".{t}";
-			}
-
-			filename += ext;
-
-		}
-
-		// Stupid URI parameter Twitter appends to filenames
-
-		var i = filename.IndexOf(":large", StringComparison.Ordinal);
-
-		if (i != -1) {
-			filename = filename[..i];
-		}
-
-		return filename;
-	}
+	
 
 	/// <summary>
 	/// Scans for direct images within a webpage.
@@ -146,7 +116,6 @@ private static string NormalizeFilename(Uri src)
 	/// <param name="timeoutMS"></param>
 	public static async Task<List<string>> ScanForImages(string url, int count = 10, long timeoutMS = TimeoutMS)
 	{
-
 		var images = new List<string>();
 
 		IHtmlDocument document;
@@ -195,14 +164,7 @@ public static async Task<List<string>> ScanForImages(string url, int count = 10,
 				count--;
 			}
 		}
-
-		/*for (int i = 0; i < images.Count; i++) {
-			for (int j = i + 1; j < images.Count; j++) {
-				if (UrlUtilities.UrlEqual(images[i], images[j])) {
-					Debug.WriteLine($"{images[i]} = {images[j]}");
-				}
-			}
-		}*/
+		
 
 		return images;
 	}
@@ -229,10 +191,24 @@ public static bool IsImage(string url, long timeout, DirectImageCriterion direct
 					return false;
 				}
 
-				var a = response.ContentType.StartsWith("image") && response.ContentType != "image/svg+xml";
-				var b = response.ContentLength >= 50_000;
+				/* Check content-type */
 
-				return a && b;
+				// The content-type returned from the response may not be the actual content-type, so
+				// we'll resolve it using binary data instead to be sure
+
+				var stream  = WebUtilities.GetStream(url);
+				var buffer = new byte[256];
+				stream.Read(buffer, 0, buffer.Length);
+				// var rg = response.RawBytes;
+				var m  = MediaTypes.ResolveFromData(buffer);
+
+				// var a  = response.ContentType.StartsWith("image") && response.ContentType != "image/svg+xml";
+				// var b = response.ContentLength >= 50_000;
+
+				var a = m.StartsWith("image") && m != "image/svg+xml";
+				// var b = stream.Length >= 50_000;
+
+				return a;
 			default:
 				throw new ArgumentOutOfRangeException(nameof(directCriterion), directCriterion, null);
 		}
@@ -291,6 +267,9 @@ public static DisplayResolutionType GetDisplayResolution(int w, int h)
 	public static Bitmap ResizeImage(Bitmap mg, Size newSize)
 	{
 		// todo
+		/*
+		 * Adapted from https://stackoverflow.com/questions/5243203/how-to-compress-jpg-image
+		 */
 		double ratio         = 0d;
 		double myThumbWidth  = 0d;
 		double myThumbHeight = 0d;

SmartImage/Core/AppInfo.cs

@@ -96,14 +96,11 @@ public static void Setup()
 		foreach (string s in oldFolders) {
 			FileSystem.RemoveFromPath(s);
 		}
-			
-
+		
 		if (!IsAppFolderInPath) {
 			AppIntegration.HandlePath(true);
 		}
 
 		Debug.WriteLine($"Cli utilities: {ImageHelper.Utilities.QuickJoin()}", C_INFO);
-
-			
 	}
 }