Regex image link scanning

Author: Decimation

SmartImage.Lib/Utilities/ImageHelper.cs

@@ -91,7 +91,26 @@ public static DisplayResolutionType GetDisplayResolution(int w, int h)
 		/// Determines whether <paramref name="url"/> is a direct image link
 		/// </summary>
 		/// <remarks>A direct image link is a link which points to a binary image file</remarks>
-		public static bool IsDirect(string url) => MediaTypes.IsDirect(url, MimeType.Image);
+		public static bool IsDirect(string url)
+		{
+			return MediaTypes.IsDirect(url, MimeType.Image);
+		}
+		
+
+		public static bool IsDirect2(string url)
+		{
+			// todo
+
+
+			/*
+			 * https://github.com/PactInteractive/image-downloader
+			 */
+
+			return Regex.IsMatch(
+				url,
+				@"(?:([^:\/?#]+):)?(?:\/\/([^\/?#]*))?([^?#]*\.(?:bmp|gif|ico|jfif|jpe?g|png|svg|tiff?|webp))(?:\?([^#]*))?(?:#(.*))?",
+				RegexOptions.IgnoreCase);
+		}
 
 		/// <summary>
 		/// Scans for direct image links in <paramref name="url"/>
@@ -142,7 +161,7 @@ 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) && IsDirect(u == null ? e : u.ToString()))
+				            .Where(e => Network.IsUri(e, out var u) && IsDirect2(u == null ? e : u.ToString()))
 				            .ToArray();
 
 				//Debug.WriteLine($"{nameof(FindDirectImages)}: {rg.Count} -> {results.Length}", C_DEBUG);

SmartImage/Core/DialogBridge.cs

@@ -27,7 +27,7 @@ internal static NConsoleOption CreateOption(SearchResult result)
 		{
 			var option = new NConsoleOption
 			{
-				Function = CreateFunction(result.PrimaryResult),
+				Function = CreateMainFunction(result.PrimaryResult),
 				AltFunction = () =>
 				{
 					if (result.OtherResults.Any()) {
@@ -43,20 +43,8 @@ internal static NConsoleOption CreateOption(SearchResult result)
 
 					return null;
 				},
+				ComboFunction = CreateComboFunction(result.PrimaryResult),
 
-				ComboFunction = () =>
-				{
-					var direct = result.PrimaryResult.Direct;
-
-					var ok = direct != null;
-
-					if (ok) {
-						var p = WebUtilities.Download(direct!.ToString());
-						FileSystem.ExploreFile(p);
-					}
-
-					return null;
-				},
 				Name = result.Engine.Name.AddColor(EngineNameColorMap[result.Engine.EngineOption]),
 				Data = result.ToString(false)
 			};
@@ -67,9 +55,9 @@ internal static NConsoleOption CreateOption(SearchResult result)
 
 				NConsoleProgress.Queue(cts);
 
-
 				result.OtherResults.AsParallel().ForAll(x => x.FindDirectImages());
 
+
 				result.PrimaryResult.UpdateFrom(result.OtherResults.First());
 
 				cts.Cancel();
@@ -87,16 +75,17 @@ private static NConsoleOption CreateOption(ImageResult r)
 		{
 			var option = new NConsoleOption
 			{
-				Function = CreateFunction(r),
-				Name     = $"Other result\n\b",
+				Function      = CreateMainFunction(r),
+				ComboFunction = CreateComboFunction(r),
+				Name          = $"Other result\n\b",
 				//Data     = r.ToString().Replace("\n", "\n\t"),
 				Data = r.ToString(true)
 			};
 
 			return option;
 		}
 
-		private static NConsoleFunction CreateFunction(ImageResult? primaryResult)
+		private static NConsoleFunction CreateMainFunction(ImageResult? primaryResult)
 		{
 			return () =>
 			{
@@ -112,6 +101,23 @@ private static NConsoleFunction CreateFunction(ImageResult? primaryResult)
 			};
 		}
 
+		private static NConsoleFunction CreateComboFunction(ImageResult result)
+		{
+			return () =>
+			{
+				var direct = result.Direct;
+
+				var ok = direct != null;
+
+				if (ok) {
+					var p = WebUtilities.Download(direct!.ToString());
+					FileSystem.ExploreFile(p);
+				}
+
+				return null;
+			};
+		}
+
 		private static readonly Dictionary<SearchEngineOptions, Color> EngineNameColorMap = new()
 		{
 			{SearchEngineOptions.Iqdb, Color.SandyBrown},

Test/Program.cs

@@ -91,19 +91,22 @@ public static async Task Main(string[] args)
 			//Console.WriteLine($">> {r2}");
 			//Console.WriteLine($"{sw.Elapsed.TotalSeconds}");
 
-			
 
 
-			//var sw = Stopwatch.StartNew();
 
-			//var v = ImageHelper.FindDirectImages("https://iqdb.org/?url=https://litter.catbox.moe/151mk9.jpg");
+			var sw = Stopwatch.StartNew();
 
-			//foreach (string s in v) {
-			//	Console.WriteLine(s);
-			//}
-			////
-			//sw.Stop();
-			//Debug.WriteLine($"{sw.Elapsed.TotalSeconds}");
+			var v = ImageHelper.FindDirectImages("https://iqdb.org/?url=https://litter.catbox.moe/hm0muq.jpg");
+
+			foreach (string s in v)
+			{
+				Console.WriteLine(s);
+			}
+
+
+			//
+			sw.Stop();
+			Debug.WriteLine($"{sw.Elapsed.TotalSeconds}");