Fixes & improvements

Author: Decimation

SmartImage.Lib/Engines/BaseSearchEngine.cs

@@ -82,7 +82,7 @@ public Uri GetRawResultUri(ImageQuery query)
 			//}
 
 			if (!Network.IsAlive(uri, (long) Timeout.TotalMilliseconds)) {
-				Debug.WriteLine($"{Name} is unavailable or timed out after {Timeout:g}", C_WARN);
+				Debug.WriteLine($"{Name} is unavailable or timed out after {Timeout:g} | {uri}", C_WARN);
 				return null;
 			}
 

SmartImage.Lib/Utilities/ImageHelper.cs

@@ -99,7 +99,7 @@ public static bool IsDirect(string url, DirectImageType directType = DirectImage
 		{
 			return directType switch
 			{
-				DirectImageType.Binary => MediaTypes.IsDirect(url, MimeType.Image),
+				DirectImageType.Binary => IsImage(url, 1),
 				DirectImageType.Regex =>
 					/*
 					 * https://github.com/PactInteractive/image-downloader
@@ -179,7 +179,23 @@ public static string Download(Uri direct, string path)
 			return combine;
 		}
 
-		public static bool IsImage(string s, double d) => Network.IsType(s, "image",(long) TimeSpan.FromSeconds(d).TotalMilliseconds);
+		public static bool IsImage(string s, double d)
+		{
+			if (!Network.IsUri(s, out var u)) {
+				return false;
+			}
+
+			var m = Network.GetMetaResponse(u.ToString(), (long) TimeSpan.FromSeconds(d).TotalMilliseconds);
+
+			if (m == null) {
+				return false;
+			}
+
+			var a = m.ContentType.StartsWith("image") && m.ContentType != "image/svg+xml";
+			var b = m.ContentLength >= 2500;
+
+			return a && b;
+		}
 
 		public static Image GetImage(string s)
 		{
@@ -214,7 +230,7 @@ public static List<string> FindDirectImages(string url, int count = 10, double p
 			 */
 
 			var images = new List<string>();
-			
+
 
 			string gallerydl = UtilitiesMap[GALLERY_DL_EXE];
 
@@ -304,14 +320,28 @@ public static List<string> FindDirectImages(string url, int count = 10, double p
 			Parallel.For(0, flat.Count, options, (i, s) =>
 			{
 				string currentUrl = flat[i];
+
 
+
+				if (s.IsStopped) {
+					return;
+				}
+
 				if (!IsImage(currentUrl, pingTimeSec)) {
 					return;
 				}
 
 				Debug.WriteLine($"{nameof(FindDirectImages)}: Adding {currentUrl}");
 
 				imagesCopy.Add(currentUrl);
+
+				if (imagesCopy.Count >= count)
+				{
+					s.Stop();
+					return;
+				}
+
+				
 			});