Integrate gallery-dl

Author: Decimation

SmartImage.Lib/Utilities/ImageHelper.cs

@@ -4,14 +4,19 @@
 using System.Drawing;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using AngleSharp.Html.Dom;
 using AngleSharp.Html.Parser;
+using Novus.Win32;
 using SimpleCore.Net;
 using SimpleCore.Utilities;
 
+// ReSharper disable CognitiveComplexity
+// ReSharper disable PossibleNullReferenceException
+
 // ReSharper disable UnusedParameter.Local
 
 // ReSharper disable PossibleMultipleEnumeration
@@ -109,6 +114,36 @@ public static bool IsDirect(string url, DirectImageType directType = DirectImage
 
 		}
 
+		public static Dictionary<string,string> InstalledUtilities
+		{
+			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);
+
+
+					rg.Add(s,x);
+				}
+
+				return rg;
+
+			}
+		}
+
+
+		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";
+
 
 		/// <summary>
 		/// Scans for direct images within a webpage.
@@ -124,14 +159,45 @@ public static List<DirectImage> FindDirectImages(string url, DirectImageType dir
 		                                                 int count = 5, int fragmentSize = 10, double pingTimeSec = 1,
 		                                                 bool readImage = true, Predicate<Image> imageFilter = null)
 		{
+			var directImages = new List<DirectImage>();
 
+			string gallerydl = InstalledUtilities[GALLERY_DL_EXE];
 
-			imageFilter ??= (x) => true;
+			if (gallerydl != null) {
 
-			var pingTime = TimeSpan.FromSeconds(pingTimeSec);
+				Trace.WriteLine($"Using gallery-dl!");
+
+				var output = new Process
+				{
+					StartInfo = new ProcessStartInfo
+					{
+						FileName               = gallerydl,
+						Arguments              = $"-G {url}",
+						RedirectStandardOutput = true,
+						CreateNoWindow         = true
+					}
+				};
 
+				output.Start();
 
-			var directImages = new List<DirectImage>();
+				var standardOutput = output.StandardOutput;
+
+				while (!standardOutput.EndOfStream) {
+					string str = standardOutput.ReadLine().Trim().Trim('|');
+
+					directImages.Add(new DirectImage
+					{
+						Direct = new Uri(str),
+						Image  = Image.FromStream(WebUtilities.GetStream(str))
+					});
+				}
+
+				return directImages;
+			}
+
+			imageFilter ??= (x) => true;
+
+			var pingTime = TimeSpan.FromSeconds(pingTimeSec);
 
 
 			IHtmlDocument document;
@@ -174,7 +240,7 @@ public static List<DirectImage> FindDirectImages(string url, DirectImageType dir
 				{
 
 					foreach (string currentUrl in fragments[iCopy]) {
-						
+
 						if (directImages.Count >= count) {
 							return;
 						}

SmartImage/Core/AppInfo.cs

@@ -92,35 +92,7 @@ public static string ExeLocation
 			}
 		}
 
-		public static List<string> InstalledUtilities
-		{
-			get
-			{
-				var utils = new List<string>
-				{
-					"ffmpeg.exe", "ffprobe.exe", "magick.exe", "youtube-dl.exe"
-				};
-
-				var rg = new List<string>();
-
-				foreach (string s in utils) {
-					string[] path = Environment.GetEnvironmentVariable("PATH").Split(';');
-
-					foreach (string directory in path) {
-						if (Directory.Exists(directory)) {
-							foreach (string file in Directory.EnumerateFiles(directory)) {
-								if (Path.GetFileName(file) == s) {
-									rg.Add(file);
-								}
-							}
-						}
-					}
-				}
-
-				return rg;
-
-			}
-		}
+		
 
 
 		public static bool IsAppFolderInPath => FileSystem.IsFolderInPath(AppFolder);

SmartImage/Program.cs

@@ -73,30 +73,25 @@ private static async Task Main(string[] args)
 #if TEST_DEBUG
 			if (!args.Any()) {
 				//args = new string[] {CMD_SEARCH, "https://i.imgur.com/QtCausw.png"};
-
+				args = new[] {CMD_FIND_DIRECT, "https://twitter.com/sciamano240/status/1186775807655587841"};
 			}
 
 
 #endif
-
-
 			/*
 			 * Setup
 			 * Check compatibility
 			 */
 
-
 			Native.SetConsoleOutputCP(Native.CP_WIN32_UNITED_STATES);
 
-
 			Console.Title = $"{AppInfo.NAME}";
 
 			NConsole.Init();
 			Console.Clear();
 
 			Console.CancelKeyPress += (sender, eventArgs) => { };
 
-
 			var process = Process.GetCurrentProcess();
 			process.PriorityClass = ProcessPriorityClass.AboveNormal;
 
@@ -134,13 +129,12 @@ private static async Task Main(string[] args)
 
 							var imageResults = directImages.Select(ImageResult.FromDirectImage);
 
-
-							var options = AppInterface.CreateResultOptions(imageResults, "Image");
+							var directOptions = AppInterface.CreateResultOptions(imageResults, "Image");
 
 
 							NConsole.ReadOptions(new NConsoleDialog
 							{
-								Options     = options,
+								Options     = directOptions,
 								Description = AppInterface.Description
 							});
 

Test/Program.cs

@@ -6,6 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using RestSharp;
+using RestSharp.Authenticators;
 using SimpleCore.Utilities;
 using SmartImage.Lib;
 using SmartImage.Lib.Engines;
@@ -174,7 +175,7 @@ public static async Task Main(string[] args)
 			// 	Console.WriteLine(image);
 			// }
 
-
+			
 		}
 	}
 }