Improve IQDB engine

Author: Decimation

SmartImage.Lib/Engines/BaseSearchEngine.cs

@@ -68,9 +68,7 @@ public async Task<SearchResult> GetResultAsync(ImageQuery query)
 		public Uri GetRawResultUrl(ImageQuery query)
 		{
 			var uri = new Uri(BaseUrl + query.Image);
-
-			//var  hostUri = Network.GetHostUri(new Uri(BaseUrl));
-
+			
 			bool ok = Network.IsUriAlive(uri, Timeout);
 
 			if (!ok) {

SmartImage.Lib/Engines/Impl/IqdbEngine.cs

@@ -19,6 +19,8 @@
 using SmartImage.Lib.Searching;
 using SmartImage.Lib.Utilities;
 
+// ReSharper disable StringLiteralTypo
+
 namespace SmartImage.Lib.Engines.Impl
 {
 	public sealed class IqdbEngine : ClientSearchEngine
@@ -113,60 +115,32 @@ private static ImageResult ParseResult(IHtmlCollection<IElement> tr)
 
 		private IDocument GetDocument(ImageQuery query)
 		{
-			//return base.GetDocument(sr);
-
-			/*MultipartFormDataContent form = new MultipartFormDataContent();
-
-			form.Add(new StringContent("8388608"), "MAX_FILE_SIZE");
-
-			for (int i = 1; i <= 13; i++)
-			{
-				if (new[] { 7, 8, 9, 12 }.Contains(i))
-				{
-					continue;
-				}
-
-				form.Add(new StringContent(i.ToString()), "service[]");
-			}
-
-			form.Add(new StreamContent(query.Stream), "file", "image.jpg");
-			form.Add(new StringContent(string.Empty), "url");
-
+			var rq = new RestRequest(Method.POST);
 
-			var h  = new HttpClient();
-			h.BaseAddress = new Uri(EndpointUrl);
-			var r=h.PostAsync("/", form);
-			r.Wait();*/
+			const int MAX_FILE_SIZE = 8388608;
 
-			var rq = new RestRequest(Method.POST);
-			rq.AddParameter("MAX_FILE_SIZE", 8388608, ParameterType.GetOrPost);
+			rq.AddParameter("MAX_FILE_SIZE", MAX_FILE_SIZE, ParameterType.GetOrPost);
 			rq.AddHeader("Content-Type", "multipart/form-data");
 
-			byte[] rg = Array.Empty<byte>();
-			object u  = query.Value;
+			byte[] fileBytes = Array.Empty<byte>();
+			object uri       = string.Empty;
 
 			if (query.IsFile) {
-				rg = File.ReadAllBytes(query.Value);
-
-
+				fileBytes = File.ReadAllBytes(query.Value);
+			}
+			else if (query.IsUri) {
+				uri = query.Value;
 			}
-			else if (query.IsUri) { }
 			else {
 				throw new SmartImageException();
 			}
 
-			rq.AddFile("file", rg, "image.jpg");
-			rq.AddParameter("url", u, ParameterType.GetOrPost);
+			rq.AddFile("file", fileBytes, "image.jpg");
+			rq.AddParameter("url", uri, ParameterType.GetOrPost);
 
 			//rq.AddParameter("service[]", new[] {1, 2, 3, 4, 5, 6, 11, 13}, ParameterType.GetOrPost);
 
 			var response = Client.Execute(rq);
-			Network.DumpResponse(response);
-			Debug.Assert(response.IsSuccessful);
-
-			// var html2   = r.Result.Content.ReadAsStringAsync();
-			// html2.Wait();
-			// var html   = html2.Result;
 
 			var parser = new HtmlParser();
 			return parser.ParseDocument(response.Content);
@@ -179,7 +153,6 @@ public override SearchResult GetResult(ImageQuery query)
 			//var sr = base.GetResult(query);
 			var sr = new SearchResult(this);
 
-
 			try {
 
 				sr = Process(query, sr);
@@ -194,16 +167,10 @@ public override SearchResult GetResult(ImageQuery query)
 
 		protected override SearchResult Process(ImageQuery query, SearchResult sr)
 		{
-
-			// var re = new RestRequest(Method.POST);
-			// re.AddFile("file", File.ReadAllBytes(q.Value), "image.jpg");
-
 			// Don't select other results
 
-
 			var doc = GetDocument(query);
 
-
 			var pages  = doc.Body.SelectSingleNode("//div[@id='pages']");
 			var tables = ((IHtmlElement) pages).SelectNodes("div/table");
 

SmartImage.Lib/Engines/InterpretedSearchEngine.cs

@@ -25,7 +25,6 @@ public abstract class InterpretedSearchEngine : BaseSearchEngine
 
 		protected InterpretedSearchEngine(string baseUrl) : base(baseUrl) { }
 
-		
 
 		[DebuggerHidden]
 		public override SearchResult GetResult(ImageQuery query)
@@ -51,16 +50,6 @@ public override SearchResult GetResult(ImageQuery query)
 
 		protected virtual IDocument GetDocument(SearchResult sr)
 		{
-			/*if (!Network.TryGetString(sr.RawUri.ToString()!, out var html))
-			{
-				sr.RawUri            = null;
-				sr.PrimaryResult.Url = null;
-
-				//sr.AddErrorMessage("Unavailable");
-				throw new SmartImageException();
-			}*/
-
-
 			string response = WebUtilities.GetString(sr.RawUri.ToString()!);
 
 			var parser = new HtmlParser();

SmartImage.Lib/Utilities/ImageHelper.cs

@@ -98,8 +98,7 @@ public static bool IsDirect2(string url)
 				@"(?:([^:\/?#]+):)?(?:\/\/([^\/?#]*))?([^?#]*\.(?:bmp|gif|ico|jfif|jpe?g|png|svg|tiff?|webp))(?:\?([^#]*))?(?:#(.*))?",
 				RegexOptions.IgnoreCase);
 		}
-		
-		
+
 
 		/// <summary>
 		/// Scans for direct image links in <paramref name="url"/>
@@ -135,7 +134,6 @@ public static async Task<string[]> FindDirectImagesAsync(string url)
 			rg.AddRange(a.Select(s => s.GetAttribute("href")));
 
 
-
 			/*var matches = Regex.Matches(html, "<a\\s+(?:[^>]*?\\s+)?href=\"([^\"]*)\"");
 
 
@@ -157,7 +155,8 @@ public static async Task<string[]> FindDirectImagesAsync(string url)
 			{
 
 				string[] results = rg.AsParallel()
-				                     .Where(e => Network.IsUri(e, out var u) && IsDirect2(u == null ? e : u.ToString()))
+				                     .Where(e => Network.IsUri(e, out var u)
+				                                 && IsDirect2(u == null ? e : u.ToString()))
 				                     .ToArray();
 
 

Test/Program.cs

@@ -140,11 +140,18 @@ public static async Task Main(string[] args)
 				Console.WriteLine(result);
 			}*/
 
+
 			var i  = new IqdbEngine();
 			var i2 = i.GetResultAsync(q);
 			var r2 = await i2;
 
 			Console.WriteLine(">> {0}", r2);
+
+			var ix = new SauceNaoEngine() { };
+			var i2x = ix.GetResultAsync(q);
+			var r2x = await i2x;
+
+			Console.WriteLine(">> {0}", r2x);
 		}
 	}
 }