Fixes

Author: Decimation

SmartImage.Lib/Engines/BaseSearchEngine.cs

@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Net.NetworkInformation;
 using System.Threading.Tasks;
+using Kantan.Diagnostics;
 using SmartImage.Lib.Utilities;
 using static Kantan.Diagnostics.LogCategories;
 
@@ -87,5 +88,23 @@ public Uri GetRawResultUri(ImageQuery query)
 
 			return uri;
 		}
+
+		protected static SearchResult TryRun(SearchResult sr, Func<SearchResult, SearchResult> process)
+		{
+			if (!sr.IsSuccessful) {
+				return sr;
+			}
+
+			try {
+
+				sr = process(sr);
+			}
+			catch (Exception e) {
+				sr.Status = ResultStatus.Failure;
+				Trace.WriteLine($"{sr.Engine.Name}: {e.Message}", LogCategories.C_ERROR);
+			}
+
+			return sr;
+		}
 	}
 }

SmartImage.Lib/Engines/ClientSearchEngine.cs

@@ -30,28 +30,10 @@ protected ClientSearchEngine(string baseUrl, string endpointUrl) : base(baseUrl)
 
 		protected RestClient Client { get; }
 
-		//[DebuggerHidden]
+		[DebuggerHidden]
 		public override SearchResult GetResult(ImageQuery query)
 		{
-			/*var sr = base.GetResult(query);
-
-			if (!sr.IsSuccessful) {
-				return sr;
-			}
-
-			try {
-
-				sr = Process(query, sr);
-			}
-			catch (Exception e) {
-				sr.Status = ResultStatus.Failure;
-				Trace.WriteLine($"{Name}: {e.Message}", C_ERROR);
-			}
-
-			return sr;*/
-
-			var sr1 = base.GetResult(query);
-			return EngineHelper.TryGet(sr1, query, (sr) => Process(query, sr));
+			return TryRun(base.GetResult(query), sr => Process(query, sr));
 		}
 
 		protected abstract SearchResult Process(ImageQuery query, SearchResult r);

SmartImage.Lib/Engines/EngineHelper.cs

@@ -29,29 +29,9 @@ protected InterpretedSearchEngine(string baseUrl) : base(baseUrl) { }
 		[DebuggerHidden]
 		public override SearchResult GetResult(ImageQuery query)
 		{
-			/*var sr = base.GetResult(query);
-
-			if (!sr.IsSuccessful) {
-				return sr;
-			}
-
-			try {
-				var doc = GetDocument(sr);
-
-
-				sr = Process(doc, sr);
-			}
-			catch (Exception e) {
-				sr.Status = ResultStatus.Failure;
-				Trace.WriteLine($"{Name}: {e.Message}", C_ERROR);
-			}
-
-			return sr;*/
-			
-			var sr1 = base.GetResult(query);
-			return EngineHelper.TryGet(sr1, query, sr =>
+			return TryRun(base.GetResult(query), sr =>
 			{
-				var doc = this.GetDocument(sr);
+				var doc = GetDocument(sr);
 				sr = Process(doc, sr);
 				return sr;
 			});