Refactoring; cleanup; misc

Author: Decimation

SmartImage/Core/SearchConfig.cs

@@ -78,7 +78,7 @@ private SearchConfig()
 		/// <summary>
 		///     Does not open results from priority engines if the result similarity (if available) is below a certain threshold,
 		/// or there are no relevant results.
-		/// <see cref="BasicSearchResult.Filter"/> is <c>true</c> if <see cref="ISearchEngine.FilterThreshold"/> is less than <see cref="BasicSearchResult.Similarity"/>
+		/// <see cref="BasicSearchResult.Filter"/> is <c>true</c> if <see cref="SearchEngine.FilterThreshold"/> is less than <see cref="BasicSearchResult.Similarity"/>
 		/// </summary>
 		[field: ConfigComponent("filter_results", "--filter-results", true, true)]
 		public bool FilterResults { get; set; }

SmartImage/Engines/ISearchEngine.cs

@@ -2,7 +2,7 @@
 
 namespace SmartImage.Engines.Other
 {
-	public sealed class BingEngine : BasicSearchEngine
+	public sealed class BingEngine : SearchEngine
 	{
 		public BingEngine() : base("https://www.bing.com/images/searchbyimage?cbir=sbi&imgurl=") { }
 		public override SearchEngineOptions Engine => SearchEngineOptions.Bing;

SmartImage/Engines/Other/BingEngine.cs

@@ -7,7 +7,7 @@
 
 namespace SmartImage.Engines.Other
 {
-	public sealed class GoogleImagesEngine : BasicSearchEngine
+	public sealed class GoogleImagesEngine : SearchEngine
 	{
 		public GoogleImagesEngine() : base("http://images.google.com/searchbyimage?image_url=") { }
 

SmartImage/Engines/Other/GoogleImagesEngine.cs

@@ -9,7 +9,7 @@
 #nullable enable
 namespace SmartImage.Engines.Other
 {
-	public sealed class ImgOpsEngine : BasicSearchEngine, IUploadEngine
+	public sealed class ImgOpsEngine : SearchEngine, IUploadEngine
 	{
 		public ImgOpsEngine() : base("http://imgops.com/") { }
 

SmartImage/Engines/Other/ImgOpsEngine.cs

@@ -12,7 +12,7 @@
 #nullable enable
 namespace SmartImage.Engines.Other
 {
-	public sealed class IqdbEngine : BasicSearchEngine
+	public sealed class IqdbEngine : SearchEngine
 	{
 		public IqdbEngine() : base("https://iqdb.org/?url=") { }
 
@@ -125,10 +125,9 @@ public override FullSearchResult GetResult(string url)
 				sr.UpdateFrom(best);
 				sr.AddExtendedResults(images.ToArray());
 			}
-			catch (Exception) {
+			catch (Exception e) {
 				// ...
-
-				sr.ExtendedInfo.Add("Error parsing");
+				sr.AddErrorMessage(e.Message);
 			}
 
 			return sr;

SmartImage/Engines/Other/IqdbEngine.cs

@@ -2,7 +2,7 @@
 
 namespace SmartImage.Engines.Other
 {
-	public sealed class KarmaDecayEngine : BasicSearchEngine
+	public sealed class KarmaDecayEngine : SearchEngine
 	{
 		public KarmaDecayEngine() : base("http://karmadecay.com/search/?q=") { }
 

SmartImage/Engines/Other/KarmaDecayEngine.cs

@@ -2,7 +2,7 @@
 
 namespace SmartImage.Engines.Other
 {
-	public sealed class TinEyeEngine : BasicSearchEngine
+	public sealed class TinEyeEngine : SearchEngine
 	{
 		public TinEyeEngine() : base("https://www.tineye.com/search?url=") { }
 

SmartImage/Engines/Other/TinEyeEngine.cs

@@ -16,7 +16,7 @@
 
 namespace SmartImage.Engines.Other
 {
-	public sealed class YandexEngine : BasicSearchEngine
+	public sealed class YandexEngine : SearchEngine
 	{
 		public YandexEngine() : base("https://yandex.com/images/search?rpt=imageview&url=") { }
 
@@ -133,8 +133,7 @@ public override FullSearchResult GetResult(string url)
 			}
 			catch (Exception e) {
 				// ...
-
-				sr.ExtendedInfo.Add($"Error parsing: {e.Message}");
+				sr.AddErrorMessage(e.Message);
 			}
 
 

SmartImage/Engines/Other/YandexEngine.cs

@@ -26,7 +26,7 @@ namespace SmartImage.Engines.SauceNao
 	/// <summary>
 	///     SauceNao API client
 	/// </summary>
-	public sealed class SauceNaoEngine : BasicSearchEngine
+	public sealed class SauceNaoEngine : SearchEngine
 	{
 		private const string BASE_URL = "https://saucenao.com/";
 
@@ -114,13 +114,13 @@ public override FullSearchResult GetResult(string url)
 				result.AddExtendedResults(extended);
 
 				if (!String.IsNullOrWhiteSpace(m_apiKey)) {
-					result.ExtendedInfo.Add("Using API");
+					result.Metadata.Add("API", m_apiKey);
 				}
 
 			}
 			catch (Exception e) {
 				Debug.WriteLine($"SauceNao error: {e.StackTrace}");
-				result.ExtendedInfo.Add("Error parsing");
+				result.AddErrorMessage(e.Message);
 			}
 
 			return result;