Improve code design, handle trace.moe deserialization edge case

Author: Decimation

SmartImage.Lib/Engines/Search/Base/ClientSearchEngine.cs

@@ -9,21 +9,18 @@ public abstract class ClientSearchEngine : ProcessedSearchEngine
 {
 	protected ClientSearchEngine(string baseUrl, string endpointUrl) : base(baseUrl)
 	{
-		
 		EndpointUrl = endpointUrl;
 	}
 
 	public abstract override SearchEngineOptions EngineOption { get; }
 
-
 	public abstract override EngineSearchType SearchType { get; }
 
 	protected string EndpointUrl { get; }
 
-
-	protected override object GetProcessingObject(SearchResult r)
+	protected override object GetProcessingObject(SearchResult sr)
 	{
-		return r.Origin.Query;
+		return sr.Origin.Query;
 	}
 
 }

SmartImage.Lib/Engines/Search/Base/ProcessedSearchEngine.cs

@@ -7,6 +7,9 @@
 
 namespace SmartImage.Lib.Engines.Search.Base;
 
+/// <summary>
+/// Represents a search engine whose results require further processing.
+/// </summary>
 public abstract class ProcessedSearchEngine : BaseSearchEngine
 {
 	protected ProcessedSearchEngine(string baseUrl) : base(baseUrl) { }
@@ -54,7 +57,7 @@ public sealed override SearchResult GetResult(ImageQuery query, CancellationToke
 		return sr;
 	}
 
-	protected abstract object GetProcessingObject(SearchResult r);
+	protected abstract object GetProcessingObject(SearchResult sr);
 
 	/// <summary>
 	/// Processes engine results

SmartImage.Lib/Engines/Search/Base/WebClientSearchEngine.cs

@@ -4,28 +4,25 @@
 namespace SmartImage.Lib.Engines.Search.Base;
 
 /// <summary>
-///     Represents a search engine whose results are from HTML.
+///     Represents a search engine whose results are parsed from HTML.
 /// </summary>
 public abstract class WebClientSearchEngine : ProcessedSearchEngine
 {
 	protected WebClientSearchEngine(string baseUrl) : base(baseUrl) { }
 
 	public abstract override SearchEngineOptions EngineOption { get; }
-	
+
 	public abstract override EngineSearchType SearchType { get; }
 
-	protected override object GetProcessingObject(SearchResult r)
-	{
-		return ParseContent(r.Origin);
-	}
+	protected override object GetProcessingObject(SearchResult sr) => ParseContent(sr.Origin);
 
 	protected virtual object ParseContent(SearchResultOrigin s)
 	{
-		var    parser            = new HtmlParser();
-		var async = s.Response.Content.ReadAsStringAsync();
-		async.Wait();
-		var content = async.Result;
-		var document = parser.ParseDocument((string) content);
+		var parser = new HtmlParser();
+		var readStringTask  = s.Response.Content.ReadAsStringAsync();
+		readStringTask.Wait();
+		var content  = readStringTask.Result;
+		var document = parser.ParseDocument(content);
 
 		return document;
 	}

SmartImage.Lib/Engines/Search/Base/WebDriverSearchEngine.cs

@@ -7,6 +7,9 @@
 
 namespace SmartImage.Lib.Engines.Search.Base;
 
+/// <summary>
+/// Represents a search engine whose results are parsed through a web driver.
+/// </summary>
 public abstract class WebDriverSearchEngine : ProcessedSearchEngine
 {
 	protected WebDriverSearchEngine(string baseUrl) : base(baseUrl) { }

SmartImage.Lib/Engines/Search/TinEyeEngine.cs

@@ -26,9 +26,9 @@ public sealed class TinEyeEngine : WebDriverSearchEngine
 {
 	public TinEyeEngine() : base("https://www.tineye.com/search?url=") { }
 
-	protected override object GetProcessingObject(SearchResult r)
+	protected override object GetProcessingObject(SearchResult sr)
 	{
-		return r.Origin.Query;
+		return sr.Origin.Query;
 	}
 
 	public override SearchEngineOptions EngineOption => SearchEngineOptions.TinEye;

SmartImage.Lib/Engines/Search/TraceMoeEngine.cs

@@ -5,6 +5,8 @@
 using Flurl.Http;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using RestSharp.Serialization.Json;
 using SmartImage.Lib.Clients;
 using SmartImage.Lib.Engines.Search.Base;
 using SmartImage.Lib.Searching;
@@ -28,7 +30,7 @@ public TraceMoeEngine() : base("https://trace.moe/?url=", "https://api.trace.moe
 	/// Used to retrieve more information about results
 	/// </summary>
 	private readonly AnilistClient m_anilistClient = new();
-	
+
 
 	public override string Name => "trace.moe";
 
@@ -56,7 +58,38 @@ protected override SearchResult Process(object obj, SearchResult r)
 			var task = request.GetStringAsync();
 
 			task.Wait(Timeout);
-			tm = JsonConvert.DeserializeObject<TraceMoeRootObject>(task.Result);
+			var result = task.Result;
+
+			/*JObject jo;
+
+			jo = JObject.Parse(result);
+			var token = jo["result"];
+
+			Debug.WriteLine(result);
+			var rg    = JsonConvert.DeserializeObject<List<TraceMoeDoc>>(token.ToString());
+
+			tm            = new();
+			tm.result     = rg.ToList();
+			tm.error      = jo["error"].ToString();
+			tm.frameCount = long.Parse(jo["frameCount"].ToString());*/
+
+
+			// tm = JsonConvert.DeserializeObject<TraceMoeRootObject>(result);
+			
+			var settings = new JsonSerializerSettings
+			{
+				Error = (sender, args) =>
+				{
+					if (object.Equals(args.ErrorContext.Member, nameof(TraceMoeDoc.episode)) &&
+					    args.ErrorContext.OriginalObject.GetType() == typeof(TraceMoeDoc))
+					{
+						args.ErrorContext.Handled = true;
+					}
+				}
+			};
+			tm = JsonConvert.DeserializeObject<TraceMoeRootObject>(result, settings);
+
+
 		}
 		catch (Exception e) {
 			Debug.WriteLine($"{e.Message}");
@@ -166,6 +199,7 @@ private class TraceMoeDoc
 
 
 		/// <remarks>Episode field may contain multiple possible results delimited by <c>|</c></remarks>
+		[JsonIgnore]
 		public string episode { get; set; }
 
 		public double similarity { get; set; }
@@ -178,9 +212,11 @@ private class TraceMoeDoc
 	[UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
 	private class TraceMoeRootObject
 	{
-		public long              frameCount { get; set; }
-		public string            error      { get; set; }
-		public List<TraceMoeDoc> result     { get; set; }
+		public long frameCount { get; set; }
+
+		public string error { get; set; }
+
+		public List<TraceMoeDoc> result { get; set; }
 	}
 
 	#endregion

SmartImage.Lib/SearchClient.cs

@@ -1,4 +1,5 @@
 global using static Kantan.Diagnostics.LogCategories;
+global using MN = System.Diagnostics.CodeAnalysis.MaybeNullAttribute;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;

SmartImage.Lib/Searching/IResult.cs

@@ -37,7 +37,7 @@ protected static ConsoleOptionFunction GetDownloadFunction(Func<Uri> f)
 			CPI.Instance.Start(cts);
 
 
-			var file = ImageHelper.Download(direct, path);
+			var file = ImageMedia.Download(direct, path);
 
 			// Program.ResultDialog.Refresh();
 

SmartImage.Lib/Searching/ImageQuery.cs

@@ -32,12 +32,12 @@ public sealed class ImageQuery : IDisposable, IConsoleOption
 	/// <summary>
 	/// Whether <see cref="Value"/> is a file
 	/// </summary>
-	public bool IsFile { get; }
+	public bool IsFile => Info.IsFile;
 
 	/// <summary>
 	/// Whether <see cref="Value"/> is an image link
 	/// </summary>
-	public bool IsUri { get; }
+	public bool IsUri => Info.IsUri;
 
 	/// <summary>
 	/// Uploaded direct image
@@ -53,6 +53,8 @@ public sealed class ImageQuery : IDisposable, IConsoleOption
 
 	public TimeSpan UploadTime { get; }
 
+	public MediaResourceInfo Info { get; }
+
 	public ImageQuery([NotNull] string value, [CanBeNull] BaseUploadEngine engine = null)
 	{
 		var now = Stopwatch.GetTimestamp();
@@ -63,10 +65,10 @@ public ImageQuery([NotNull] string value, [CanBeNull] BaseUploadEngine engine =
 
 		value = value.CleanString();
 
-		(IsUri, IsFile) = IsUriOrFile(value);
+		Info = ImageMedia.GetMediaInfo(value);
 
-		if (!IsUri && !IsFile) {
-			throw new ArgumentException("Input was neither file nor direct image link", nameof(value));
+		if (!((bool) Info)) {
+			throw new ArgumentException($"Input error: {Info.Message?.ReasonPhrase}");
 		}
 
 		Value = value;
@@ -84,7 +86,7 @@ public ImageQuery([NotNull] string value, [CanBeNull] BaseUploadEngine engine =
 		}
 
 
-		var client = new HttpClient();//todo
+		var client = new HttpClient(); //todo
 		Stream = IsFile ? File.OpenRead(value) : client.GetStream(value);
 
 
@@ -97,14 +99,6 @@ public ImageQuery([NotNull] string value, [CanBeNull] BaseUploadEngine engine =
 
 	public static implicit operator ImageQuery(string value) => new(value);
 
-	public static (bool IsUri, bool IsFile) IsUriOrFile(string x)
-	{
-		//todo
-		var isUriOrFile = (ImageHelper.IsBinaryImage(x, out var di,-1), File.Exists(x));
-		// di?.Dispose();
-		return isUriOrFile;
-	}
-
 	public ImageResult GetImageResult()
 	{
 
@@ -117,7 +111,7 @@ public ImageResult GetImageResult()
 
 		var result = new ImageResult(null)
 		{
-			
+
 			// Image = Image.FromStream(Stream),
 			Url = UploadUri
 		};

SmartImage.Lib/Searching/ImageResult.cs

@@ -145,7 +145,7 @@ public DisplayResolutionType DisplayResolution
 
 
 			if (HasImageDimensions) {
-				return ImageHelper.GetDisplayResolution(Width.Value, Height.Value);
+				return ImageManipulation.GetDisplayResolution(Width.Value, Height.Value);
 			}
 
 			throw new SmartImageException("Resolution unavailable");
@@ -236,18 +236,20 @@ public bool ScanForBinaryImages(int ms)
 
 		var url = Url.ToString();
 
-		if (ImageHelper.IsBinaryImage(url, out var br, ms)) {
-			DirectImages.Add(br);
+		var info = ImageMedia.GetMediaInfo(url);
+
+		if ((bool) info) {
+			DirectImages.Add(info.Resource);
 			return true;
 		}
 		else {
-			br.Dispose();
+			info.Dispose();
 		}
 
 		/*if (DirectImage is { Url: { } } || ImageHelper.IsBinaryImage(url, out var di1, ms)) {
 			return true;
 		}*/
-		
+
 		/*if (OtherUrl.Any()) {
 			var plr = Parallel.For(0, OtherUrl.Count, (i, s) =>
 			{
@@ -265,7 +267,7 @@ public bool ScanForBinaryImages(int ms)
 
 		try {
 
-			var directImages = ImageHelper.ScanForBinaryImages(url, ms)
+			var directImages = ImageMedia.Scan(url, ms)
 			                              .Where(x => x is { Url: { } })
 			                              .ToList();