Optimize Ascii2D

Author: Decimation

SmartImage.Lib/Engines/Impl/Ascii2DEngine.cs

@@ -21,7 +21,6 @@ namespace SmartImage.Lib.Engines.Impl
 {
 	public sealed class Ascii2DEngine : WebSearchEngine
 	{
-		
 		public Ascii2DEngine() : base("https://ascii2d.net/search/url/")
 		{
 			FollowRedirects = true;
@@ -34,8 +33,14 @@ public Ascii2DEngine() : base("https://ascii2d.net/search/url/")
 
 		public override string Name => EngineOption.ToString();
 
-		private Uri ConvertToDetailUri(Uri url)
+		protected override Uri GetRaw(ImageQuery query)
 		{
+			var a = base.GetRaw(query);
+
+			var request = WebRequest.Create(a);
+
+			using var response = request.GetResponse();
+
 			/*
 			 * URL parameters
 			 *
@@ -50,46 +55,21 @@ private Uri ConvertToDetailUri(Uri url)
 			 *
 			 */
 
-			var res = Network.GetResponse(url.ToString(), (int) Timeout.TotalMilliseconds, Method.GET, false);
-
-			// Get redirect url (color url)
-
-			string newUrl = res.ResponseUri.ToString();
-
 			// Convert to detail url
 
-			string detailUrl = newUrl.Replace("/color/", "/bovw/");
+			string detailUrl = response.ResponseUri.ToString().Replace("/color/", "/bovw/");
 
 			return new Uri(detailUrl);
-		}
-
-		protected override Uri GetRaw(ImageQuery query)
-		{
-			var a = base.GetRaw(query);
-			return WebRequest.Create(a).GetResponse().ResponseUri;
 
 		}
 
-		protected internal override IDocument GetContent(IRestResponse response)
-		{
-			var url = response.ResponseUri;
-
-			response.ResponseUri = ConvertToDetailUri(url);
-
-			response.Content = WebUtilities.GetString(response.ResponseUri.ToString());
-
-			return base.GetContent(response);
-
-		}
 
 		protected override bool GetInitialResult(ImageQuery query, out Uri rawUri, out IRestResponse res)
 		{
 			rawUri = GetRaw(query);
 
-			// NOTE: wtf?
+			res = new RestResponse();
 
-			res = Network.GetResponse(rawUri.ToString(), (int) Timeout.TotalMilliseconds, Method.GET, FollowRedirects);
-			
 			res.Content = WebUtilities.GetString(rawUri.ToString());
 
 			return true;

SmartImage.Lib/Engines/Model/BaseSearchEngine.cs

@@ -25,7 +25,6 @@ protected BaseSearchEngine(string baseUrl)
 
 		public abstract SearchEngineOptions EngineOption { get; }
 
-
 		public virtual string Name => EngineOption.ToString();
 
 		public virtual TimeSpan Timeout { get; set; } = TimeSpan.FromSeconds(3);
@@ -45,13 +44,11 @@ protected SearchResult GetResult(ImageQuery query, out IRestResponse response)
 				sr.Status = ResultStatus.Success;
 			}
 
-
 			return sr;
 		}
 
 		public virtual SearchResult GetResult(ImageQuery query) => GetResult(query, out _);
 
-
 		public async Task<SearchResult> GetResultAsync(ImageQuery query)
 		{
 
@@ -87,7 +84,6 @@ protected virtual bool GetInitialResult(ImageQuery query, out Uri rawUri, out IR
 			}*/
 
 			res = Network.GetResponse(rawUri.ToString(), (int) Timeout.TotalMilliseconds, Method.GET, FollowRedirects);
-			
 
 			if (!res.IsSuccessful) {
 				if ((FollowRedirects && res.StatusCode == HttpStatusCode.Redirect)) {
@@ -101,24 +97,5 @@ protected virtual bool GetInitialResult(ImageQuery query, out Uri rawUri, out IR
 
 			return true;
 		}
-
-		protected static SearchResult TryProcess(SearchResult sr, Func<SearchResult, SearchResult> process)
-		{
-			if (!sr.IsSuccessful) {
-				return sr;
-			}
-
-			try {
-
-				sr = process(sr);
-			}
-			catch (Exception e) {
-				sr.Status       = ResultStatus.Failure;
-				sr.ErrorMessage = e.Message;
-				Trace.WriteLine($"{sr.Engine.Name}: {e.Message}", LogCategories.C_ERROR);
-			}
-
-			return sr;
-		}
 	}
 }

SmartImage.Lib/Engines/Model/ProcessedSearchEngine.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using AngleSharp.Dom;
+using Kantan.Diagnostics;
 using RestSharp;
 using SmartImage.Lib.Searching;
 
@@ -28,30 +29,33 @@ public override SearchResult GetResult(ImageQuery query)
 		{
 			// HACK: this is questionable, but it resolves the edge case with polymorphism
 
-			SearchResult result;
-
 			ClientSearchEngine c;
 			WebSearchEngine    w;
 
-			IRestResponse response = null;
+			var sr = GetResult(query, out IRestResponse response);
 
 			switch (this) {
 				case ClientSearchEngine:
-					result = base.GetResult(query);
+					//sr = base.GetResult(query);
 					c      = this as ClientSearchEngine;
 					w      = null;
 					break;
 				case WebSearchEngine:
-					result = GetResult(query, out response);
+					//sr = GetResult(query, out response);
 					w      = this as WebSearchEngine;
 					c      = null;
 					break;
 				default:
 					throw new InvalidOperationException();
 			}
+			
+
+			if (!sr.IsSuccessful) {
+				return sr;
+			}
+
+			try {
 
-			return TryProcess(result, sr =>
-			{
 				object o;
 
 				if (c != null) {
@@ -64,10 +68,20 @@ public override SearchResult GetResult(ImageQuery query)
 					throw new InvalidOperationException();
 				}
 
-
 				sr = Process(o, sr);
+
 				return sr;
-			});
+			}
+			catch (Exception e) {
+
+				sr.Status       = ResultStatus.Failure;
+				sr.ErrorMessage = e.Message;
+
+				Trace.WriteLine($"{sr.Engine.Name}: {e.Message}", LogCategories.C_ERROR);
+			}
+
+			return sr;
+
 		}
 	}
 }

SmartImage/Program.cs

@@ -96,7 +96,7 @@ public static class Program
 					}
 
 					foreach (NConsoleOption? option in buffer.Select(NConsoleFactory.CreateResultOption)) {
-						Program.ResultDialog.Options.Add(option);
+						ResultDialog.Options.Add(option);
 					}
 
 					_isFilteredShown = !_isFilteredShown;
@@ -161,13 +161,7 @@ private static async Task Main(string[] args)
 			ResultDialog.Subtitle = $"SE: {Config.SearchEngines} "     +
 			                        $"| PE: {Config.PriorityEngines} " +
 			                        $"| Filtering: {Config.Filtering.ToToggleString()}";
-
-			await Run();
-		}
-
-		private static async Task Run()
-		{
-
+			
 			CancellationTokenSource cts = new();
 
 			// Run search