Misc

Decimation · Decimation · commit 483255fe50ee · 2021-01-25T20:27:21.000-06:00
diff --git a/SmartImage/Core/Integration.cs b/SmartImage/Core/Integration.cs
@@ -5,7 +5,6 @@
 using Microsoft.Win32;
 using Novus.Win32;
 using SimpleCore.Cli;
-using SimpleCore.Cli;
 
 namespace SmartImage.Core
 {
diff --git a/SmartImage/Core/SearchConfig.cs b/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="SearchEngine.FilterThreshold"/> is less than <see cref="BasicSearchResult.Similarity"/>
+		/// <see cref="BasicSearchResult.Filter"/> is <c>true</c> if <see cref="BaseSearchEngine.FilterThreshold"/> is less than <see cref="BasicSearchResult.Similarity"/>
 		/// </summary>
 		[field: ConfigComponent("filter_results", "--filter-results", true, true)]
 		public bool FilterResults { get; set; }
diff --git a/SmartImage/Engines/BaseSearchEngine.cs b/SmartImage/Engines/BaseSearchEngine.cs
@@ -7,11 +7,11 @@ namespace SmartImage.Engines
 	/// <summary>
 	/// Represents a search engine
 	/// </summary>
-	public abstract class SearchEngine
+	public abstract class BaseSearchEngine
 	{
 		public string BaseUrl { get; }
 
-		protected SearchEngine(string baseUrl)
+		protected BaseSearchEngine(string baseUrl)
 		{
 			BaseUrl = baseUrl;
 		}
diff --git a/SmartImage/Engines/Other/BingEngine.cs b/SmartImage/Engines/Other/BingEngine.cs
@@ -14,7 +14,7 @@
 
 namespace SmartImage.Engines.Other
 {
-	public sealed class BingEngine : SearchEngine
+	public sealed class BingEngine : BaseSearchEngine
 	{
 		public BingEngine() : base("https://www.bing.com/images/searchbyimage?cbir=sbi&imgurl=") { }
 		public override SearchEngineOptions Engine => SearchEngineOptions.Bing;
diff --git a/SmartImage/Engines/Other/GoogleImagesEngine.cs b/SmartImage/Engines/Other/GoogleImagesEngine.cs
@@ -7,7 +7,7 @@
 
 namespace SmartImage.Engines.Other
 {
-	public sealed class GoogleImagesEngine : SearchEngine
+	public sealed class GoogleImagesEngine : BaseSearchEngine
 	{
 		public GoogleImagesEngine() : base("http://images.google.com/searchbyimage?image_url=") { }
 
diff --git a/SmartImage/Engines/Other/ImgOpsEngine.cs b/SmartImage/Engines/Other/ImgOpsEngine.cs
@@ -9,13 +9,13 @@
 #nullable enable
 namespace SmartImage.Engines.Other
 {
-	public sealed class ImgOpsEngine : SearchEngine, IUploadEngine
+	public sealed class ImgOpsEngine : BaseSearchEngine, IUploadEngine
 	{
 		public ImgOpsEngine() : base("http://imgops.com/") { }
 
-		public override string Name  => "ImgOps";
-		
-		public override Color  Color => Color.Pink;
+		public override string Name => "ImgOps";
+
+		public override Color Color => Color.Pink;
 
 		public override SearchEngineOptions Engine => SearchEngineOptions.ImgOps;
 
diff --git a/SmartImage/Engines/Other/IqdbEngine.cs b/SmartImage/Engines/Other/IqdbEngine.cs
@@ -12,7 +12,7 @@
 #nullable enable
 namespace SmartImage.Engines.Other
 {
-	public sealed class IqdbEngine : SearchEngine
+	public sealed class IqdbEngine : BaseSearchEngine
 	{
 		public IqdbEngine() : base("https://iqdb.org/?url=") { }
 
diff --git a/SmartImage/Engines/Other/KarmaDecayEngine.cs b/SmartImage/Engines/Other/KarmaDecayEngine.cs
@@ -2,7 +2,7 @@
 
 namespace SmartImage.Engines.Other
 {
-	public sealed class KarmaDecayEngine : SearchEngine
+	public sealed class KarmaDecayEngine : BaseSearchEngine
 	{
 		public KarmaDecayEngine() : base("http://karmadecay.com/search/?q=") { }
 
diff --git a/SmartImage/Engines/Other/TinEyeEngine.cs b/SmartImage/Engines/Other/TinEyeEngine.cs
@@ -2,7 +2,7 @@
 
 namespace SmartImage.Engines.Other
 {
-	public sealed class TinEyeEngine : SearchEngine
+	public sealed class TinEyeEngine : BaseSearchEngine
 	{
 		public TinEyeEngine() : base("https://www.tineye.com/search?url=") { }
 
diff --git a/SmartImage/Engines/Other/YandexEngine.cs b/SmartImage/Engines/Other/YandexEngine.cs
@@ -5,6 +5,7 @@
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Xml.XPath;
 using HtmlAgilityPack;
 using SimpleCore.Net;
 using SimpleCore.Utilities;
@@ -16,31 +17,18 @@
 
 namespace SmartImage.Engines.Other
 {
-	public sealed class YandexEngine : SearchEngine
+	public sealed class YandexEngine : BaseSearchEngine
 	{
 		public YandexEngine() : base("https://yandex.com/images/search?rpt=imageview&url=") { }
 
 		public override SearchEngineOptions Engine => SearchEngineOptions.Yandex;
 
 		public override string Name => "Yandex";
 
-		
 
 		private const int TOTAL_RES_MIN = 500_000;
 
-		private static ISearchResult[] FilterAndSelectBestImages(List<BasicSearchResult> rg)
-		{
-			const int TAKE_N = 5;
-
-			var best = rg.OrderByDescending(i => i.FullResolution)
-				.Take(TAKE_N)
-				.Cast<ISearchResult>()
-				.ToArray();
-
-			return best;
-		}
-
-		private static string GetYandexAnalysis(HtmlDocument doc)
+		private static string GetAnalysis(HtmlDocument doc)
 		{
 			const string TAGS_XP = "//div[contains(@class, 'Tags_type_simple')]/*";
 
@@ -52,7 +40,7 @@ private static string GetYandexAnalysis(HtmlDocument doc)
 		}
 
 
-		private static List<BasicSearchResult> GetYandexImages(HtmlDocument doc)
+		private static List<BasicSearchResult> GetImages(HtmlDocument doc)
 		{
 			const string TAGS_ITEM_XP = "//a[contains(@class, 'Tags-Item')]";
 
@@ -92,6 +80,7 @@ private static List<BasicSearchResult> GetYandexImages(HtmlDocument doc)
 			return images;
 		}
 
+
 		public override FullSearchResult GetResult(string url)
 		{
 			// todo: slow
@@ -110,16 +99,16 @@ public override FullSearchResult GetResult(string url)
 				 * Parse what the image looks like
 				 */
 
-				string? looksLike = GetYandexAnalysis(doc);
+				string? looksLike = GetAnalysis(doc);
 
 
 				/*
 				 * Find and sort through high resolution image matches
 				 */
 
-				var images = GetYandexImages(doc);
+				var images = GetImages(doc);
 
-				ISearchResult[] bestImages = FilterAndSelectBestImages(images);
+				ISearchResult[] bestImages = FullSearchResult.FilterAndSelectBestImages(images);
 
 				//
 				var best = images[0];
@@ -129,7 +118,7 @@ public override FullSearchResult GetResult(string url)
 				sr.Description = looksLike;
 
 				sr.AddExtendedResults(bestImages);
-				
+
 			}
 			catch (Exception e) {
 				// ...
diff --git a/SmartImage/Engines/SauceNao/SauceNaoEngine.cs b/SmartImage/Engines/SauceNao/SauceNaoEngine.cs
@@ -28,9 +28,9 @@ namespace SmartImage.Engines.SauceNao
 
 
 	/// <summary>
-	///     SauceNao API client
+	///     SauceNao client
 	/// </summary>
-	public sealed class SauceNaoEngine : SearchEngine
+	public sealed class SauceNaoEngine : BaseSearchEngine
 	{
 		private const string BASE_URL = "https://saucenao.com/";
 
@@ -61,7 +61,10 @@ public SauceNaoEngine() : this(SearchConfig.Config.SauceNaoAuth) { }
 
 		#region HTML
 
-		private static (string? Creator, string? Material) FindCreator(HtmlNode resultcontent)
+		// todo
+		// https://github.com/Decimation/SmartImage/blob/49b373305d4b9c96df393feabecf3c451a7c6a7d/SmartImage/Searching/Engines/SauceNao/AltSauceNaoClient.cs
+
+		private static (string? Creator, string? Material) FindInfo(HtmlNode resultcontent)
 		{
 			var     resulttitle = resultcontent.ChildNodes[0];
 			string? rti         = resulttitle?.InnerText;
@@ -129,7 +132,7 @@ private static IEnumerable<SauceNaoDataResult> ParseResults(string url)
 
 				string? link = link1 ?? link2;
 
-				var (creator, material) = FindCreator(resultcontent);
+				var (creator, material) = FindInfo(resultcontent);
 				float similarity = Single.Parse(resultsimilarityinfo.InnerText.Replace("%", String.Empty));
 
 
@@ -152,7 +155,7 @@ private static IEnumerable<SauceNaoDataResult> ParseResults(string url)
 
 		#region API
 
-		private ISearchResult[] ConvertResults(SauceNaoDataResult[] results)
+		private ISearchResult[] ConvertDataResults(SauceNaoDataResult[] results)
 		{
 			var rg = new List<ISearchResult>();
 
@@ -175,7 +178,7 @@ private ISearchResult[] ConvertResults(SauceNaoDataResult[] results)
 			return rg.ToArray();
 		}
 
-		private static SauceNaoDataResult[]? ReadResults(string js)
+		private static SauceNaoDataResult[]? ReadDataResults(string js)
 		{
 			// Excerpts of code adapted from https://github.com/Lazrius/SharpNao/blob/master/SharpNao.cs
 
@@ -243,7 +246,7 @@ private ISearchResult[] ConvertResults(SauceNaoDataResult[] results)
 			return null;
 		}
 
-		private SauceNaoDataResult[]? GetResults_API(string url)
+		private SauceNaoDataResult[]? GetDataResults(string url)
 		{
 			var req = new RestRequest();
 			req.AddQueryParameter("db", "999");
@@ -262,7 +265,7 @@ private ISearchResult[] ConvertResults(SauceNaoDataResult[] results)
 
 			string c = res.Content;
 
-			return ReadResults(c);
+			return ReadDataResults(c);
 		}
 
 		#endregion
@@ -273,7 +276,7 @@ public override FullSearchResult GetResult(string url)
 			FullSearchResult result = base.GetResult(url);
 
 			try {
-				var orig = GetResults_API(url);
+				var orig = GetDataResults(url);
 
 				if (orig == null) {
 					//return result;
@@ -288,7 +291,7 @@ public override FullSearchResult GetResult(string url)
 				string? material  = orig.FirstOrDefault(o => !String.IsNullOrWhiteSpace(o.Material))?.Material;
 
 
-				var extended = ConvertResults(orig);
+				var extended = ConvertDataResults(orig);
 
 				var ordered = extended
 					.Where(e => e.Url != null)
diff --git a/SmartImage/Engines/TraceMoe/TraceMoeDataResult.cs b/SmartImage/Engines/TraceMoe/TraceMoeDataResult.cs
@@ -1,46 +1,48 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 
+// ReSharper disable InconsistentNaming
+
 namespace SmartImage.Engines.TraceMoe
 {
 	[UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
 	public class TraceMoeDoc
 	{
-		public double from { get; set; }
-		public double to { get; set; }
-		public long anilist_id { get; set; }
-		public double at { get; set; }
-		public string season { get; set; }
-		public string anime { get; set; }
-		public string filename { get; set; }
+		public double from       { get; set; }
+		public double to         { get; set; }
+		public long   anilist_id { get; set; }
+		public double at         { get; set; }
+		public string season     { get; set; }
+		public string anime      { get; set; }
+		public string filename   { get; set; }
 
 		public long? episode { get; set; }
 
-		public string tokenthumb { get; set; }
-		public double similarity { get; set; }
-		public string title { get; set; }
-		public string title_native { get; set; }
-		public string title_chinese { get; set; }
-		public string title_english { get; set; }
-		public string title_romaji { get; set; }
-		public long mal_id { get; set; }
-		public List<string> synonyms { get; set; }
+		public string       tokenthumb       { get; set; }
+		public double       similarity       { get; set; }
+		public string       title            { get; set; }
+		public string       title_native     { get; set; }
+		public string       title_chinese    { get; set; }
+		public string       title_english    { get; set; }
+		public string       title_romaji     { get; set; }
+		public long         mal_id           { get; set; }
+		public List<string> synonyms         { get; set; }
 		public List<object> synonyms_chinese { get; set; }
-		public bool is_adult { get; set; }
+		public bool         is_adult         { get; set; }
 	}
 
 	[UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
 	public class TraceMoeRootObject
 	{
-		public long RawDocsCount { get; set; }
-		public long RawDocsSearchTime { get; set; }
-		public long ReRankSearchTime { get; set; }
-		public bool CacheHit { get; set; }
-		public long trial { get; set; }
-		public long limit { get; set; }
-		public long limit_ttl { get; set; }
-		public long quota { get; set; }
-		public long quota_ttl { get; set; }
-		public List<TraceMoeDoc> docs { get; set; }
+		public long              RawDocsCount      { get; set; }
+		public long              RawDocsSearchTime { get; set; }
+		public long              ReRankSearchTime  { get; set; }
+		public bool              CacheHit          { get; set; }
+		public long              trial             { get; set; }
+		public long              limit             { get; set; }
+		public long              limit_ttl         { get; set; }
+		public long              quota             { get; set; }
+		public long              quota_ttl         { get; set; }
+		public List<TraceMoeDoc> docs              { get; set; }
 	}
 }
diff --git a/SmartImage/Engines/TraceMoe/TraceMoeEngine.cs b/SmartImage/Engines/TraceMoe/TraceMoeEngine.cs
@@ -6,7 +6,7 @@
 
 namespace SmartImage.Engines.TraceMoe
 {
-	public sealed class TraceMoeEngine : SearchEngine
+	public sealed class TraceMoeEngine : BaseSearchEngine
 	{
 		public TraceMoeEngine() : base("https://trace.moe/?url=") { }
 
diff --git a/SmartImage/Searching/FullSearchResult.cs b/SmartImage/Searching/FullSearchResult.cs
diff --git a/SmartImage/Searching/SearchClient.cs b/SmartImage/Searching/SearchClient.cs

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`using Microsoft.Win32;`
`6`	`6`	`using Novus.Win32;`
`7`	`7`	`using SimpleCore.Cli;`
`8`		`-using SimpleCore.Cli;`
`9`	`8`
`10`	`9`	`namespace SmartImage.Core`
`11`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,11 @@ namespace SmartImage.Engines`
`7`	`7`	`/// <summary>`
`8`	`8`	`/// Represents a search engine`
`9`	`9`	`/// </summary>`
`10`		`- public abstract class SearchEngine`
	`10`	`+ public abstract class BaseSearchEngine`
`11`	`11`	`{`
`12`	`12`	`public string BaseUrl { get; }`
`13`	`13`
`14`		`- protected SearchEngine(string baseUrl)`
	`14`	`+ protected BaseSearchEngine(string baseUrl)`
`15`	`15`	`{`
`16`	`16`	`BaseUrl = baseUrl;`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`namespace SmartImage.Engines.Other`
`16`	`16`	`{`
`17`		`- public sealed class BingEngine : SearchEngine`
	`17`	`+ public sealed class BingEngine : BaseSearchEngine`
`18`	`18`	`{`
`19`	`19`	`public BingEngine() : base("https://www.bing.com/images/searchbyimage?cbir=sbi&imgurl=") { }`
`20`	`20`	`public override SearchEngineOptions Engine => SearchEngineOptions.Bing;`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace SmartImage.Engines.Other`
`9`	`9`	`{`
`10`		`- public sealed class GoogleImagesEngine : SearchEngine`
	`10`	`+ public sealed class GoogleImagesEngine : BaseSearchEngine`
`11`	`11`	`{`
`12`	`12`	`public GoogleImagesEngine() : base("http://images.google.com/searchbyimage?image_url=") { }`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`#nullable enable`
`13`	`13`	`namespace SmartImage.Engines.Other`
`14`	`14`	`{`
`15`		`- public sealed class IqdbEngine : SearchEngine`
	`15`	`+ public sealed class IqdbEngine : BaseSearchEngine`
`16`	`16`	`{`
`17`	`17`	`public IqdbEngine() : base("https://iqdb.org/?url=") { }`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace SmartImage.Engines.Other`
`4`	`4`	`{`
`5`		`- public sealed class KarmaDecayEngine : SearchEngine`
	`5`	`+ public sealed class KarmaDecayEngine : BaseSearchEngine`
`6`	`6`	`{`
`7`	`7`	`public KarmaDecayEngine() : base("http://karmadecay.com/search/?q=") { }`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace SmartImage.Engines.Other`
`4`	`4`	`{`
`5`		`- public sealed class TinEyeEngine : SearchEngine`
	`5`	`+ public sealed class TinEyeEngine : BaseSearchEngine`
`6`	`6`	`{`
`7`	`7`	`public TinEyeEngine() : base("https://www.tineye.com/search?url=") { }`
`8`	`8`