Improvements

Decimation · Decimation · commit 2c2fa65fc2c6 · 2021-09-01T11:12:00.000-05:00
diff --git a/SmartImage.Lib/Engines/Impl/Ascii2DEngine.cs b/SmartImage.Lib/Engines/Impl/Ascii2DEngine.cs
@@ -30,6 +30,9 @@ public Ascii2DEngine() : base("https://ascii2d.net/search/url/") { }
 
 		public override string Name => EngineOption.ToString();
 
+		/// <inheritdoc />
+		public override EngineSearchType SearchType => EngineSearchType.Image | EngineSearchType.Metadata;
+
 		protected override Uri GetRawUri(ImageQuery query)
 		{
 			var uri = base.GetRawUri(query);
@@ -71,9 +74,6 @@ protected override bool GetRawContent(ImageQuery query, out Uri rawUri, out IRes
 			return true;
 		}
 
-		/// <inheritdoc />
-		public override EngineResultType ResultType => EngineResultType.Image | EngineResultType.Metadata;
-
 		protected override SearchResult Process(object obj, SearchResult sr)
 		{
 			var doc = (IDocument) obj;
@@ -146,8 +146,7 @@ protected override SearchResult Process(object obj, SearchResult sr)
 				>= 1 => ResultQuality.High,
 				_    => ResultQuality.Low,
 			};
-
-			doc.Dispose();
+			
 
 			return sr;
 		}
diff --git a/SmartImage.Lib/Engines/Impl/IqdbEngine.cs b/SmartImage.Lib/Engines/Impl/IqdbEngine.cs
@@ -34,7 +34,7 @@ public IqdbEngine() : base("https://iqdb.org/?url=", "https://iqdb.org/") { }
 		public override string Name => "IQDB";
 
 		public override TimeSpan           Timeout      => TimeSpan.FromSeconds(4.5);
-		public override EngineResultType ResultType => EngineResultType.Image | EngineResultType.Metadata;
+		public override EngineSearchType SearchType => EngineSearchType.Image | EngineSearchType.Metadata;
 
 		private static ImageResult ParseResult(IHtmlCollection<IElement> tr)
 		{
diff --git a/SmartImage.Lib/Engines/Impl/Other/BingEngine.cs b/SmartImage.Lib/Engines/Impl/Other/BingEngine.cs
@@ -8,7 +8,7 @@ public BingEngine() : base("https://www.bing.com/images/searchbyimage?cbir=sbi&i
 
 		public override SearchEngineOptions EngineOption => SearchEngineOptions.Bing;
 
-		public override EngineResultType ResultType => EngineResultType.Image;
+		public override EngineSearchType SearchType => EngineSearchType.Image;
 
 
 		// Parsing does not seem feasible ATM
diff --git a/SmartImage.Lib/Engines/Impl/Other/GoogleImagesEngine.cs b/SmartImage.Lib/Engines/Impl/Other/GoogleImagesEngine.cs
@@ -10,7 +10,7 @@ public GoogleImagesEngine() : base("http://images.google.com/searchbyimage?image
 
 		public override SearchEngineOptions EngineOption => SearchEngineOptions.GoogleImages;
 
-		public override EngineResultType ResultType => EngineResultType.Image;
+		public override EngineSearchType SearchType => EngineSearchType.Image;
 
 
 
diff --git a/SmartImage.Lib/Engines/Impl/Other/ImgOpsEngine.cs b/SmartImage.Lib/Engines/Impl/Other/ImgOpsEngine.cs
@@ -8,7 +8,7 @@ public sealed class ImgOpsEngine : BaseSearchEngine
 		public override SearchEngineOptions EngineOption => SearchEngineOptions.ImgOps;
 
 		//public int MaxSize => 5;
-		public override EngineResultType ResultType => EngineResultType.Other;
+		public override EngineSearchType SearchType => EngineSearchType.Other;
 
 		public ImgOpsEngine() : base("http://imgops.com/") { }
 
diff --git a/SmartImage.Lib/Engines/Impl/Other/KarmaDecayEngine.cs b/SmartImage.Lib/Engines/Impl/Other/KarmaDecayEngine.cs
@@ -5,7 +5,7 @@ namespace SmartImage.Lib.Engines.Impl.Other
 	public sealed class KarmaDecayEngine : BaseSearchEngine
 	{
 		public KarmaDecayEngine() : base("http://karmadecay.com/search/?q=") { }
-		public override EngineResultType ResultType => EngineResultType.External | EngineResultType.Metadata;
+		public override EngineSearchType SearchType => EngineSearchType.External | EngineSearchType.Metadata;
 
 		public override SearchEngineOptions EngineOption => SearchEngineOptions.KarmaDecay;
 	}
diff --git a/SmartImage.Lib/Engines/Impl/Other/TinEyeEngine.cs b/SmartImage.Lib/Engines/Impl/Other/TinEyeEngine.cs
@@ -9,7 +9,7 @@ public TinEyeEngine() : base("https://www.tineye.com/search?url=") { }
 
 		public override SearchEngineOptions EngineOption => SearchEngineOptions.TinEye;
 
-		public override EngineResultType ResultType => EngineResultType.Image;
+		public override EngineSearchType SearchType => EngineSearchType.Image;
 
 		/*
 		 * https://github.com/Jabeyjabes/TinEye-API/blob/master/TinEye_API
diff --git a/SmartImage.Lib/Engines/Impl/SauceNaoEngine.cs b/SmartImage.Lib/Engines/Impl/SauceNaoEngine.cs
@@ -46,7 +46,7 @@ public sealed class SauceNaoEngine : ClientSearchEngine
 		 * https://github.com/luk1337/SauceNAO/blob/master/app/src/main/java/com/luk/saucenao/MainActivity.java
 		 */
 
-		public override EngineResultType ResultType => EngineResultType.Image | EngineResultType.Metadata;
+		public override EngineSearchType SearchType => EngineSearchType.Image | EngineSearchType.Metadata;
 
 		public SauceNaoEngine(string authentication) : base(BASIC_RESULT, BASE_URL)
 		{
diff --git a/SmartImage.Lib/Engines/Impl/TidderEngine.cs b/SmartImage.Lib/Engines/Impl/TidderEngine.cs
@@ -23,7 +23,7 @@ public TidderEngine() : base("http://tidder.xyz/?imagelink=") { }
 
 		public override string Name => EngineOption.ToString();
 
-		public override EngineResultType ResultType => EngineResultType.External | EngineResultType.Metadata;
+		public override EngineSearchType SearchType => EngineSearchType.External | EngineSearchType.Metadata;
 
 		protected override SearchResult Process(object obj, SearchResult sr)
 		{
diff --git a/SmartImage.Lib/Engines/Impl/TraceMoeEngine.cs b/SmartImage.Lib/Engines/Impl/TraceMoeEngine.cs
@@ -33,7 +33,7 @@ public TraceMoeEngine() : base("https://trace.moe/?url=", "https://api.trace.moe
 
 		public override string Name => "trace.moe";
 
-		public override EngineResultType ResultType => EngineResultType.External | EngineResultType.Metadata;
+		public override EngineSearchType SearchType => EngineSearchType.External | EngineSearchType.Metadata;
 
 		public override SearchEngineOptions EngineOption => SearchEngineOptions.TraceMoe;
 
diff --git a/SmartImage.Lib/Engines/Impl/YandexEngine.cs b/SmartImage.Lib/Engines/Impl/YandexEngine.cs
@@ -31,7 +31,7 @@ public YandexEngine() : base("https://yandex.com/images/search?rpt=imageview&url
 
 		public override TimeSpan Timeout => TimeSpan.FromSeconds(6.5);
 
-		public override EngineResultType ResultType => EngineResultType.Image;
+		public override EngineSearchType SearchType => EngineSearchType.Image;
 
 		private static string? GetAnalysis(IDocument doc)
 		{
diff --git a/SmartImage.Lib/Engines/Model/BaseSearchEngine.cs b/SmartImage.Lib/Engines/Model/BaseSearchEngine.cs
@@ -32,8 +32,7 @@ protected BaseSearchEngine(string baseUrl)
 
 		protected bool FollowRedirects { get; set; } = true;
 
-
-		public abstract EngineResultType ResultType { get; }
+		public abstract EngineSearchType SearchType { get; }
 
 		protected SearchResult GetResult(ImageQuery query, out IRestResponse response)
 		{
@@ -98,12 +97,11 @@ protected virtual bool GetRawContent(ImageQuery query, out Uri rawUri, out IRest
 			return true;
 		}
 	}
-
 	/// <summary>
 	/// Indicates the search criteria and result type of an engine.
 	/// </summary>
 	[Flags]
-	public enum EngineResultType
+	public enum EngineSearchType
 	{
 		/// <summary>
 		/// The engine returns image results
diff --git a/SmartImage.Lib/Engines/Model/ClientSearchEngine.cs b/SmartImage.Lib/Engines/Model/ClientSearchEngine.cs
@@ -20,7 +20,7 @@ protected ClientSearchEngine(string baseUrl, string endpointUrl) : base(baseUrl)
 
 		public abstract override string Name { get; }
 
-		public abstract override EngineResultType ResultType { get; }
+		public abstract override EngineSearchType SearchType { get; }
 
 		protected string EndpointUrl { get; }
 
diff --git a/SmartImage.Lib/Engines/Model/ProcessedSearchEngine.cs b/SmartImage.Lib/Engines/Model/ProcessedSearchEngine.cs
@@ -16,7 +16,7 @@ protected ProcessedSearchEngine(string baseUrl) : base(baseUrl) { }
 
 		public abstract override string Name { get; }
 
-		public abstract override EngineResultType ResultType { get; }
+		public abstract override EngineSearchType SearchType { get; }
 
 
 		/// <summary>
@@ -63,6 +63,10 @@ public sealed override SearchResult GetResult(ImageQuery query)
 
 				sr = Process(o, sr);
 
+				if (o is IDisposable d) {
+					d.Dispose();
+				}
+
 				return sr;
 			}
 			catch (Exception e) {
diff --git a/SmartImage.Lib/Engines/Model/WebSearchEngine.cs b/SmartImage.Lib/Engines/Model/WebSearchEngine.cs
@@ -22,23 +22,13 @@ protected WebSearchEngine(string baseUrl) : base(baseUrl) { }
 
 		public abstract override string Name { get; }
 
-		public abstract override EngineResultType ResultType { get; }
+		public abstract override EngineSearchType SearchType { get; }
 
 		protected internal virtual IDocument GetContent(IRestResponse response)
 		{
 			var parser = new HtmlParser();
 
-
-			/*var s=AsyncHelpers.RunSync<string>(async () =>
-			{
-				var r = response.Content.ReadAsStringAsync();
-				await r;
-				return r.Result;
-			});*/
-
-			var s = response.Content;
-
-			var document = parser.ParseDocument(s);
+			var document = parser.ParseDocument(response.Content);
 
 			return document;
 		}
diff --git a/SmartImage.Lib/SearchClient.cs b/SmartImage.Lib/SearchClient.cs
diff --git a/SmartImage.Lib/Searching/ImageQuery.cs b/SmartImage.Lib/Searching/ImageQuery.cs
diff --git a/SmartImage.Lib/Searching/ImageResult.cs b/SmartImage.Lib/Searching/ImageResult.cs
diff --git a/SmartImage.Lib/Searching/SearchResult.cs b/SmartImage.Lib/Searching/SearchResult.cs
diff --git a/SmartImage.Lib/Utilities/ImageHelper.cs b/SmartImage.Lib/Utilities/ImageHelper.cs
diff --git a/SmartImage/UI/AppInterface.cs b/SmartImage/UI/AppInterface.cs

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,9 @@ public Ascii2DEngine() : base("https://ascii2d.net/search/url/") { }`
`30`	`30`
`31`	`31`	`public override string Name => EngineOption.ToString();`
`32`	`32`
	`33`	`+ /// <inheritdoc />`
	`34`	`+ public override EngineSearchType SearchType => EngineSearchType.Image \| EngineSearchType.Metadata;`
	`35`	`+`
`33`	`36`	`protected override Uri GetRawUri(ImageQuery query)`
`34`	`37`	`{`
`35`	`38`	`var uri = base.GetRawUri(query);`
`@@ -71,9 +74,6 @@ protected override bool GetRawContent(ImageQuery query, out Uri rawUri, out IRes`
`71`	`74`	`return true;`
`72`	`75`	`}`
`73`	`76`
`74`		`- /// <inheritdoc />`
`75`		`- public override EngineResultType ResultType => EngineResultType.Image \| EngineResultType.Metadata;`
`76`		`-`
`77`	`77`	`protected override SearchResult Process(object obj, SearchResult sr)`
`78`	`78`	`{`
`79`	`79`	`var doc = (IDocument) obj;`
`@@ -146,8 +146,7 @@ protected override SearchResult Process(object obj, SearchResult sr)`
`146`	`146`	`>= 1 => ResultQuality.High,`
`147`	`147`	`_ => ResultQuality.Low,`
`148`	`148`	`};`
`149`		`-`
`150`		`- doc.Dispose();`
	`149`	`+`
`151`	`150`
`152`	`151`	`return sr;`
`153`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public IqdbEngine() : base("https://iqdb.org/?url=", "https://iqdb.org/") { }`
`34`	`34`	`public override string Name => "IQDB";`
`35`	`35`
`36`	`36`	`public override TimeSpan Timeout => TimeSpan.FromSeconds(4.5);`
`37`		`- public override EngineResultType ResultType => EngineResultType.Image \| EngineResultType.Metadata;`
	`37`	`+ public override EngineSearchType SearchType => EngineSearchType.Image \| EngineSearchType.Metadata;`
`38`	`38`
`39`	`39`	`private static ImageResult ParseResult(IHtmlCollection<IElement> tr)`
`40`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public GoogleImagesEngine() : base("http://images.google.com/searchbyimage?image`
`10`	`10`
`11`	`11`	`public override SearchEngineOptions EngineOption => SearchEngineOptions.GoogleImages;`
`12`	`12`
`13`		`- public override EngineResultType ResultType => EngineResultType.Image;`
	`13`	`+ public override EngineSearchType SearchType => EngineSearchType.Image;`
`14`	`14`
`15`	`15`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace SmartImage.Lib.Engines.Impl.Other`
`5`	`5`	`public sealed class KarmaDecayEngine : BaseSearchEngine`
`6`	`6`	`{`
`7`	`7`	`public KarmaDecayEngine() : base("http://karmadecay.com/search/?q=") { }`
`8`		`- public override EngineResultType ResultType => EngineResultType.External \| EngineResultType.Metadata;`
	`8`	`+ public override EngineSearchType SearchType => EngineSearchType.External \| EngineSearchType.Metadata;`
`9`	`9`
`10`	`10`	`public override SearchEngineOptions EngineOption => SearchEngineOptions.KarmaDecay;`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public sealed class SauceNaoEngine : ClientSearchEngine`
`46`	`46`	`* https://github.com/luk1337/SauceNAO/blob/master/app/src/main/java/com/luk/saucenao/MainActivity.java`
`47`	`47`	`*/`
`48`	`48`
`49`		`- public override EngineResultType ResultType => EngineResultType.Image \| EngineResultType.Metadata;`
	`49`	`+ public override EngineSearchType SearchType => EngineSearchType.Image \| EngineSearchType.Metadata;`
`50`	`50`
`51`	`51`	`public SauceNaoEngine(string authentication) : base(BASIC_RESULT, BASE_URL)`
`52`	`52`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public TidderEngine() : base("http://tidder.xyz/?imagelink=") { }`
`23`	`23`
`24`	`24`	`public override string Name => EngineOption.ToString();`
`25`	`25`
`26`		`- public override EngineResultType ResultType => EngineResultType.External \| EngineResultType.Metadata;`
	`26`	`+ public override EngineSearchType SearchType => EngineSearchType.External \| EngineSearchType.Metadata;`
`27`	`27`
`28`	`28`	`protected override SearchResult Process(object obj, SearchResult sr)`
`29`	`29`	`{`