Updates

Author: Decimation

SmartImage.Lib/Engines/Impl/AnilistClient.cs renamed to SmartImage.Lib/Clients/AnilistClient.cs

@@ -1,17 +1,18 @@
 using Newtonsoft.Json.Linq;
 using SimpleCore.Net;
+// ReSharper disable PossibleNullReferenceException
 
 // ReSharper disable UnusedMember.Global
 
-namespace SmartImage.Lib.Engines.Impl
+namespace SmartImage.Lib.Clients
 {
 	public sealed class AnilistClient
 	{
-		private readonly SimpleGraphQLClient m_client;
+		private readonly GraphQLClient m_client;
 
 		public AnilistClient()
 		{
-			m_client = new SimpleGraphQLClient("https://graphql.anilist.co");
+			m_client = new GraphQLClient("https://graphql.anilist.co");
 		}
 
 		public string GetTitle(int anilistId)

SmartImage.Lib/Engines/Impl/IqdbEngine.cs

@@ -54,7 +54,7 @@ private static ImageResult ParseResult(IHtmlCollection<IElement> tr)
 			if (tr.Length >= 4) {
 				var res = tr[3];
 
-				var wh = res.TextContent.Split(Formatting.MUL_SIGN);
+				var wh = res.TextContent.Split(StringConstants.MUL_SIGN);
 
 				var wStr = wh[0].SelectOnlyDigits();
 				w = Int32.Parse(wStr);

SmartImage.Lib/Engines/Impl/SauceNaoEngine.cs

@@ -10,12 +10,14 @@
 using AngleSharp.Html.Parser;
 using AngleSharp.XPath;
 using RestSharp;
+using SimpleCore.Diagnostics;
 using SimpleCore.Net;
 using SimpleCore.Utilities;
 using SmartImage.Lib.Searching;
 using static SimpleCore.Diagnostics.LogCategories;
 using JsonArray = System.Json.JsonArray;
 using JsonObject = System.Json.JsonObject;
+// ReSharper disable PropertyCanBeMadeInitOnly.Local
 
 // ReSharper disable PossibleMultipleEnumeration
 
@@ -50,7 +52,7 @@ public SauceNaoEngine() : this(String.Empty) { } //todo
 		public string Authentication { get; init; }
 
 		public override SearchEngineOptions EngineOption => SearchEngineOptions.SauceNao;
-		
+
 
 		private static IEnumerable<SauceNaoDataResult> ParseResults(string url)
 		{
@@ -69,17 +71,19 @@ private static IEnumerable<SauceNaoDataResult> ParseResults(string url)
 			 * 208.110.232.218, your IP has exceeded the unregistered user's daily limit of 100 searches.
 			 */
 
-			if (html.Contains("Search Limit Exceeded")) {
+			const string COOLDOWN = "Search Limit Exceeded";
+
+			if (html.Contains(COOLDOWN)) {
 				Trace.WriteLine("SauceNao on cooldown!", C_WARN);
-				
+
 				return null;
 			}
 
 			var doc = docp.ParseDocument(html);
 
-			// todo: improve
+			const string RESULT_NODE = "//div[@class='result']";
 
-			var results = doc.Body.SelectNodes("//div[@class='result']");
+			var results = doc.Body.SelectNodes(RESULT_NODE);
 
 			return results.Select(Parse).ToList();
 		}
@@ -90,20 +94,22 @@ private static SauceNaoDataResult Parse(INode result)
 				return null;
 			}
 
-			if (result.TryGetAttribute("id") == "result-hidden-notification") {
+			const string HIDDEN_ID_VAL = "result-hidden-notification";
+
+			if (result.TryGetAttribute("id") == HIDDEN_ID_VAL) {
 				return null;
 			}
-			
+
 			var resulttablecontent = result.FirstChild.FirstChild.FirstChild.ChildNodes[1];
-			
+
 			var resultmatchinfo      = resulttablecontent.FirstChild;
 			var resultsimilarityinfo = resultmatchinfo.FirstChild;
 
 			// Contains links
 			var resultmiscinfo = resultmatchinfo.ChildNodes[1];
-			
+
 			var resultcontent = resulttablecontent.ChildNodes[1];
-			
+
 			var resultcontentcolumn = resultcontent.ChildNodes[1];
 
 			string link = null;
@@ -125,22 +131,21 @@ private static SauceNaoDataResult Parse(INode result)
 			string rcci                 = resultcontentcolumn1?.TextContent;
 
 			string material1 = rcci?.SubstringAfter("Material: ");
-			
+
 			string creator1 = rti ?? rcci;
 			creator1 = creator1?.SubstringAfter("Creator: ");
-			
 
 
 			float similarity = Single.Parse(resultsimilarityinfo.TextContent.Replace("%", String.Empty));
 
-			var i = new SauceNaoDataResult
+			var dataResult = new SauceNaoDataResult
 			{
 				Urls       = new[] {link}!,
 				Similarity = similarity,
 				Creator    = creator1
 			};
 
-			return i;
+			return dataResult;
 		}
 
 		public override SearchResult GetResult(ImageQuery url)
@@ -154,7 +159,7 @@ public override SearchResult GetResult(ImageQuery url)
 
 				if (orig == null) {
 					//return result;
-					Debug.WriteLine("[info] Parsing HTML from SN!");
+					Debug.WriteLine($"[{Name}] Parsing HTML", LogCategories.C_INFO);
 
 					string urlStr = url.Uri.ToString();
 
@@ -200,12 +205,11 @@ public override SearchResult GetResult(ImageQuery url)
 				sresult.OtherResults.AddRange(extended);
 
 				if (!String.IsNullOrWhiteSpace(Authentication)) {
-					Debug.WriteLine($"SN API key: {Authentication}");
+					Debug.WriteLine($"{Name} API key: {Authentication}");
 				}
 			}
 			catch (Exception e) {
-				Debug.WriteLine($"SauceNao error: {e.StackTrace}");
-				//todo
+				Debug.WriteLine($"{Name} error: {e.StackTrace}", C_ERROR);
 				sresult.Status = ResultStatus.Failure;
 			}
 
@@ -258,7 +262,7 @@ private static ImageResult ConvertToImageResult(SauceNaoDataResult sn)
 
 				// var x = new BasicSearchResult(url, sn.Similarity,
 				// 	sn.WebsiteTitle, sn.Creator, sn.Material, sn.Character, siteName);
-				var x = new ImageResult
+				var imageResult = new ImageResult
 				{
 					Url         = String.IsNullOrWhiteSpace(url) ? default : new Uri(url),
 					Similarity  = MathF.Round(sn.Similarity, 2),
@@ -269,7 +273,7 @@ private static ImageResult ConvertToImageResult(SauceNaoDataResult sn)
 					Site        = siteName
 				};
 
-				return x;
+				return imageResult;
 			}
 
 			return null;

SmartImage.Lib/Engines/Impl/TidderEngine.cs

@@ -55,7 +55,7 @@ protected override SearchResult Process(IDocument doc, SearchResult sr)
 				string? author    = authorNode.TextContent;
 				string? subreddit = subredditNode.TextContent;
 
-				//deentize!
+				//DeEntize!
 				string link = titleNode.FirstChild.TryGetAttribute("href");
 
 				var bsr = new ImageResult()

SmartImage.Lib/Engines/Impl/TraceMoeEngine.cs

@@ -5,7 +5,9 @@
 using System.Net;
 using JetBrains.Annotations;
 using RestSharp;
+using SmartImage.Lib.Clients;
 using SmartImage.Lib.Searching;
+using static SimpleCore.Diagnostics.LogCategories;
 
 // ReSharper disable InconsistentNaming
 #pragma warning disable IDE1006, IDE0051
@@ -125,7 +127,7 @@ public override SearchResult GetResult(ImageQuery url)
 				}
 				catch (Exception e) {
 					r = base.GetResult(url);
-					Debug.WriteLine($"tracemoe: {e.Message}");
+					Debug.WriteLine($"[{Name}] Error: {e.Message}");
 					//r.AddErrorMessage(e.Message);
 					r.Status = ResultStatus.Failure;
 					return r;
@@ -135,7 +137,7 @@ public override SearchResult GetResult(ImageQuery url)
 			}
 			else {
 				r = base.GetResult(url);
-				Debug.WriteLine($"[error] tracemoe: api error");
+				Debug.WriteLine($"[{Name}] API error", C_ERROR);
 				//r.AddErrorMessage(msg);
 			}
 

SmartImage.Lib/Engines/Impl/YandexEngine.cs

@@ -54,7 +54,7 @@ public YandexEngine() : base("https://yandex.com/images/search?rpt=imageview&url
 			const string item = "//li[@class='other-sites__item']";
 
 			var tagsItem = doc.Body.SelectNodes(item);
-			
+
 			if (tagsItem == null) {
 				return null;
 			}
@@ -93,7 +93,7 @@ static ImageResult Parse(INode siz)
 
 		private static (int? w, int? h) ParseResolution(string resText)
 		{
-			string[] resFull = resText.Split(Formatting.MUL_SIGN);
+			string[] resFull = resText.Split(StringConstants.MUL_SIGN);
 
 			int? w = null, h = null;
 
@@ -163,7 +163,7 @@ static ImageResult Parse(INode siz)
 				return yi;
 			}
 
-			
+
 			images.AddRange(sizeTags.AsParallel().Select(Parse));
 
 			return images;

SmartImage.Lib/Engines/InterpretedSearchEngine.cs

@@ -43,7 +43,7 @@ public override SearchResult GetResult(ImageQuery query)
 			}
 			catch (Exception e) {
 				sr.Status = ResultStatus.Failure;
-				Trace.WriteLine($"{Name}: {e.Message} {e.Source} {e.StackTrace}", C_ERROR);
+				Trace.WriteLine($"{Name}: {e.Message}", C_ERROR);
 			}
 
 			return sr;

SmartImage.Lib/SearchClient.cs

@@ -94,7 +94,7 @@ public List<SearchResult> MaximizeResults<T>(Func<SearchResult, T> property)
 			//await t;
 
 			if (!IsComplete) {
-				throw new SmartImageException();
+				throw new SmartImageException($"Search must be completed");
 			}
 
 			var res = Results.OrderByDescending(property).ToList();
@@ -107,10 +107,10 @@ public List<SearchResult> MaximizeResults<T>(Func<SearchResult, T> property)
 		public async Task RefineSearchAsync()
 		{
 			if (!IsComplete) {
-				throw new SmartImageException();
+				throw new SmartImageException($"Search must be completed");
 			}
 
-			Trace.WriteLine($"Finding best result");
+			Trace.WriteLine("Finding best result");
 
 			var best = FindBestResult();
 
@@ -156,9 +156,9 @@ public async Task RunSearchAsync()
 			}
 
 			Trace.WriteLine($"{nameof(SearchClient)}: Search complete", C_SUCCESS);
+
 			SearchCompleted?.Invoke(null, EventArgs.Empty);
 
-			return;
 		}
 
 		public static BaseUploadEngine[] GetAllUploadEngines()
@@ -169,6 +169,7 @@ public static BaseUploadEngine[] GetAllUploadEngines()
 			                               .ToArray();
 		}
 
+
 		public static BaseSearchEngine[] GetAllSearchEngines()
 		{
 			return typeof(BaseSearchEngine).GetAllSubclasses()
@@ -179,8 +180,7 @@ public static BaseSearchEngine[] GetAllSearchEngines()
 
 		public event EventHandler<SearchResultEventArgs> ResultCompleted;
 
-		public event EventHandler                SearchCompleted;
-		
+		public event EventHandler SearchCompleted;
 	}
 
 	public sealed class SearchResultEventArgs : EventArgs

SmartImage.Lib/SearchConfig.cs

@@ -38,11 +38,9 @@ public sealed class SearchConfig
 		public bool Filter { get; set; } = true;
 
 
-
 		public override string ToString()
 		{
 			var sb = new ExtendedStringBuilder();
-			sb.AppendLine("Config");
 			sb.Append(nameof(SearchEngines), SearchEngines);
 			sb.Append(nameof(PriorityEngines), PriorityEngines);
 			sb.Append(nameof(Filter), Filter);