Misc improvements

Author: Decimation

SmartImage.Lib/Engines/BaseSearchEngine.cs

@@ -28,7 +28,6 @@ protected BaseSearchEngine(string baseUrl)
 
 		public virtual string Name => EngineOption.ToString();
 
-
 		public virtual TimeSpan Timeout { get; set; } = TimeSpan.FromSeconds(3);
 
 		public virtual SearchResult GetResult(ImageQuery query)
@@ -81,7 +80,7 @@ public Uri GetRawResultUri(ImageQuery query)
 			//	return null;
 			//}
 
-			if (!Network.IsAlive(uri, (long) Timeout.TotalMilliseconds)) {
+			if (!Network.IsAlive(uri, (int) Timeout.TotalMilliseconds)) {
 				Debug.WriteLine($"{Name} is unavailable or timed out after {Timeout:g} | {uri}", C_WARN);
 				return null;
 			}

SmartImage.Lib/Engines/ClientSearchEngine.cs

@@ -30,10 +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);
+			/*var sr = base.GetResult(query);
 
 			if (!sr.IsSuccessful) {
 				return sr;
@@ -48,7 +48,10 @@ public override SearchResult GetResult(ImageQuery query)
 				Trace.WriteLine($"{Name}: {e.Message}", C_ERROR);
 			}
 
-			return sr;
+			return sr;*/
+
+			var sr1 = base.GetResult(query);
+			return EngineHelper.TryGet(sr1, query, (sr) => Process(query, sr));
 		}
 
 		protected abstract SearchResult Process(ImageQuery query, SearchResult r);

SmartImage.Lib/Engines/EngineHelper.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Kantan.Diagnostics;
+using SmartImage.Lib.Searching;
+
+namespace SmartImage.Lib.Engines
+{
+	public static class EngineHelper
+	{
+		public static SearchResult TryGet(SearchResult sr, ImageQuery query, Func<SearchResult, SearchResult> f)
+		{
+			
+
+			if (!sr.IsSuccessful) {
+				return sr;
+			}
+
+			try {
+
+				sr = f(sr);
+			}
+			catch (Exception e) {
+				sr.Status = ResultStatus.Failure;
+				Trace.WriteLine($"{sr.Engine.Name}: {e.Message}", LogCategories.C_ERROR);
+			}
+
+			return sr;
+		}
+	}
+}

SmartImage.Lib/Engines/Impl/Ascii2DEngine.cs

@@ -5,6 +5,7 @@
 using SmartImage.Lib.Searching;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 // ReSharper disable CognitiveComplexity
 
@@ -36,6 +37,7 @@ private static Uri ConvertToDetailUri(Uri url)
 			 *
 			 */
 
+
 			var res = Network.GetResponse(url.ToString());
 
 			// Get redirect url (color url)
@@ -46,15 +48,20 @@ private static Uri ConvertToDetailUri(Uri url)
 
 			string detailUrl = newUrl.Replace("/color/", "/bovw/");
 
+			
 			return new Uri(detailUrl);
 		}
 
 		protected override IDocument GetDocument(SearchResult sr)
 		{
 			var url = sr.RawUri;
 
+		
+
 			sr.RawUri = ConvertToDetailUri(url);
 
+			
+
 			return base.GetDocument(sr);
 		}
 

SmartImage.Lib/Engines/Impl/IqdbEngine.cs

@@ -171,6 +171,7 @@ protected override SearchResult Process(ImageQuery query, SearchResult sr)
 
 			var doc = GetDocument(query);
 
+
 			var pages  = doc.Body.SelectSingleNode("//div[@id='pages']");
 			var tables = ((IHtmlElement) pages).SelectNodes("div/table");
 
@@ -199,6 +200,7 @@ protected override SearchResult Process(ImageQuery query, SearchResult sr)
 			sr.PrimaryResult.UpdateFrom(best);
 			sr.OtherResults.AddRange(images);
 
+
 			return sr;
 		}
 	}

SmartImage.Lib/Engines/Impl/SauceNaoEngine.cs

@@ -115,6 +115,7 @@ public override SearchResult GetResult(ImageQuery query)
 
 		private IEnumerable<SauceNaoDataResult> GetHTMLResults(ImageQuery query)
 		{
+
 			Trace.WriteLine($"{Name}: | Parsing HTML", LogCategories.C_INFO);
 
 			var docp = new HtmlParser();
@@ -135,6 +136,7 @@ private IEnumerable<SauceNaoDataResult> GetHTMLResults(ImageQuery query)
 			var execute = m_client.Execute(req);
 
 			string html = execute.Content;
+			
 
 			/*
 			 * Daily Search Limit Exceeded.

SmartImage.Lib/Engines/InterpretedSearchEngine.cs

@@ -29,7 +29,7 @@ protected InterpretedSearchEngine(string baseUrl) : base(baseUrl) { }
 		[DebuggerHidden]
 		public override SearchResult GetResult(ImageQuery query)
 		{
-			var sr = base.GetResult(query);
+			/*var sr = base.GetResult(query);
 
 			if (!sr.IsSuccessful) {
 				return sr;
@@ -38,15 +38,23 @@ public override SearchResult GetResult(ImageQuery query)
 			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;
-
+			return sr;*/
+			
+			var sr1 = base.GetResult(query);
+			return EngineHelper.TryGet(sr1, query, sr =>
+			{
+				var doc = this.GetDocument(sr);
+				sr = Process(doc, sr);
+				return sr;
+			});
 		}
 
 		protected virtual IDocument GetDocument(SearchResult sr)

SmartImage.Lib/SearchClient.cs

@@ -245,7 +245,7 @@ public ImageResult[] FindDirectResults(int count = 5)
 
 			var best = FindBestResults().ToList();
 
-			Debug.WriteLine($"Found {best.Count} best results");
+			Debug.WriteLine($"{nameof(SearchClient)}: Found {best.Count} best results", C_DEBUG);
 
 			var images = new ConcurrentBag<ImageResult>();
 
@@ -262,15 +262,15 @@ public ImageResult[] FindDirectResults(int count = 5)
 					continue;
 				}
 
-				Debug.WriteLine($"{nameof(FindDirectResult)}: Adding {item.Direct}");
+				//Debug.WriteLine($"{nameof(FindDirectResult)}: Adding {item.Direct}");
 
 				images.Add(item);
 
-				
+
 			} while (++i != best.Count && i < count /*!images.Any(x=>x.Direct!=null)*/);
 
 
-			Debug.WriteLine($"Found {images.Count} direct results");
+			Debug.WriteLine($"{nameof(SearchClient)}: Found {images.Count} direct results", C_DEBUG);
 
 			return images.OrderByDescending(r => r.Similarity)
 			             .ToArray();
@@ -291,16 +291,11 @@ public ImageResult[] FindBestResults()
 				                  var x = r.OtherResults;
 				                  x.Insert(0, r.PrimaryResult);
 				                  return x;
-			                  });
-
-			//==================================================================//
-
-
-			best = best
-			       .AsParallel()
-			       .OrderByDescending(r => r.Similarity)
-			       .ThenByDescending(r => r.PixelResolution)
-			       .ThenByDescending(r => r.DetailScore);
+			                  })
+			                  .AsParallel()
+			                  .OrderByDescending(r => r.Similarity)
+			                  .ThenByDescending(r => r.PixelResolution)
+			                  .ThenByDescending(r => r.DetailScore);
 
 
 			return best.ToArray();

SmartImage.Lib/Searching/ImageQuery.cs

@@ -64,7 +64,7 @@ public ImageQuery([NotNull] string value, [CanBeNull] BaseUploadEngine engine =
 			Value = value;
 
 
-			UploadEngine = engine ?? new LitterboxEngine(); //todo
+			UploadEngine = engine ?? new LitterboxEngine(); //note: default upload engine
 
 			UploadUri = IsUri ? new Uri(Value) : UploadEngine.Upload(Value);
 

SmartImage.Lib/Searching/ImageResult.cs

@@ -154,7 +154,7 @@ public int DetailScore
 		{
 			get
 			{
-				//todo: WIP
+
 
 				/*
 				 * The number of non-null fields