SauceNao stuff

Author: Decimation

SmartImage/Engines/Imgur/ImgurClient.cs

@@ -23,17 +23,6 @@ private ImgurClient(string apiKey)
 
 		public ImgurClient() : this(SearchConfig.Config.ImgurAuth) { }
 
-		
-		private static string PhotoStreamToBase64(Stream stream)
-		{
-			using var ms = new MemoryStream();
-
-			stream.CopyTo(ms);
-
-			var result = ms.ToArray();
-			return Convert.ToBase64String(result);
-		}
-
 		public string Upload(string path)
 		{
 

SmartImage/Engines/Other/ImgOpsEngine.cs

@@ -13,6 +13,7 @@ public sealed class ImgOpsEngine : BasicSearchEngine, IUploadEngine
 		public ImgOpsEngine() : base("http://imgops.com/") { }
 
 		public override string Name  => "ImgOps";
+		
 		public override Color  Color => Color.Pink;
 
 		public override SearchEngineOptions Engine => SearchEngineOptions.ImgOps;
@@ -51,37 +52,9 @@ public string UploadImage(string path)
 
 			string imgOpsUrl = UploadImage(img);
 
-			// var imgOpsPageUrl = imgOpsUrl;
-
-			// string html = Network.GetString(imgOpsUrl);
-			//
-			// const string HREF_REGEX = "href=\"(.*)\"";
-			//
-			// var    match = Regex.Matches(html, HREF_REGEX);
-			/*string link = null;
-			
-			
-			foreach (Match match1 in match) {
-				foreach (Group @group in match1.Groups) {
-					var v = group.Value;
-
-					if (v.StartsWith("http://imgops.com/") && v.Contains("userUploadTempCache")) {
-						link = v;
-						break;
-					}
-				}
-			}*/
-
-			// May change in the future
-			// const int HREF_N = 7;
-			//
-			// string link = match[HREF_N].Groups[1].Value;
-
-			var link = imgOpsUrl;
+			string? link = imgOpsUrl;
 			link = "http://" + link.SubstringAfter(BaseUrl);
 
-			//Debug.WriteLine("> " + link);
-
 			return link;
 		}
 	}

SmartImage/Engines/Other/IqdbEngine.cs

@@ -50,14 +50,6 @@ public IqdbResult(string caption, string source, string url, int width, int heig
 				Similarity = similarity;
 				Filter     = false; // set later
 			}
-
-			public override string ToString()
-			{
-				return
-					$"{nameof(Caption)}: {Caption}, {nameof(Source)}: "       +
-					$"{Source}, {nameof(Width)}: {Width}, {nameof(Height)}: " +
-					$"{Height}, {nameof(Url)}: {Url}, {nameof(Similarity)}: {Similarity}";
-			}
 		}
 
 		private IqdbResult ParseResult(HtmlNodeCollection tr)
@@ -84,11 +76,13 @@ private IqdbResult ParseResult(HtmlNodeCollection tr)
 				url = origUrl;
 			}
 
+
 			int w = 0, h = 0;
 
 			if (tr.Count >= 4) {
 				var res = tr[3];
-				var wh  = res.InnerText.Split("×");
+
+				var wh = res.InnerText.Split(Formatting.MUL_SIGN);
 
 				var wStr = wh[0].SelectOnlyDigits();
 				w = int.Parse(wStr);
@@ -147,16 +141,10 @@ public override FullSearchResult GetResult(string url)
 					return sr;
 				}
 
-				var images = new List<ISearchResult>();
-
-				foreach (var table in tables) {
-
-					var tr = table.SelectNodes("tr");
-
-					var i = ParseResult(tr);
-
-					images.Add(i);
-				}
+				var images = tables.Select(table => table.SelectNodes("tr"))
+					.Select(ParseResult)
+					.Cast<ISearchResult>()
+					.ToList();
 
 				// First is original image
 				images.RemoveAt(0);

SmartImage/Engines/Other/YandexEngine.cs

@@ -23,7 +23,7 @@ public YandexEngine() : base("https://yandex.com/images/search?rpt=imageview&url
 
 		private struct YandexResult : ISearchResult
 		{
-			public bool  Filter     { get; set; }
+			public bool   Filter     { get; set; }
 			public float? Similarity { get; set; }
 
 			public int? Width { get; set; }
@@ -47,7 +47,7 @@ internal YandexResult(int width, int height, string url)
 
 			public override string ToString()
 			{
-				return String.Format("{0}x{1} {2} [{3:N}]", Width, Height, Url, ((ISearchResult) this).FullResolution);
+				return $"{Width}x{Height} {Url} [{((ISearchResult) this).FullResolution:N}]";
 			}
 		}
 
@@ -66,33 +66,42 @@ private static ISearchResult[] FilterAndSelectBestImages(List<ISearchResult> rg)
 
 		private static string GetYandexAnalysis(HtmlDocument doc)
 		{
-			var nodes = doc.DocumentNode.SelectNodes("//div[contains(@class, 'Tags_type_simple')]/*");
+			const string TAGS_XP = "//div[contains(@class, 'Tags_type_simple')]/*";
 
+			var nodes = doc.DocumentNode.SelectNodes(TAGS_XP);
 
-			var appearsToContain = nodes.Select(n=>n.InnerText).QuickJoin();
-
+			string? appearsToContain = nodes.Select(n => n.InnerText).QuickJoin();
 
 			return appearsToContain;
 		}
 
+
 		private static List<ISearchResult> GetYandexImages(HtmlDocument doc)
 		{
-			var tagsItem = doc.DocumentNode.SelectNodes("//a[contains(@class, 'Tags-Item')]");
+			const string TAGS_ITEM_XP = "//a[contains(@class, 'Tags-Item')]";
+
+			const string CBIR_ITEM = "CbirItem";
+
+
+			var tagsItem = doc.DocumentNode.SelectNodes(TAGS_ITEM_XP);
 
 			var sizeTags = tagsItem.Where(sx =>
-				!sx.ParentNode.ParentNode.Attributes["class"].Value.Contains("CbirItem"));
+				!sx.ParentNode.ParentNode.Attributes["class"].Value.Contains(CBIR_ITEM));
 
+			
 
 			var images = new List<ISearchResult>();
 
 			foreach (var siz in sizeTags) {
-				var link = siz.Attributes["href"].Value;
+				string? link = siz.Attributes["href"].Value;
 
-				var resText = siz.FirstChild.InnerText;
-				var resFull = resText.Split('×');
-				var w = Int32.Parse(resFull[0]);
-				var h = Int32.Parse(resFull[1]);
-				var totalRes = w * h;
+				string? resText = siz.FirstChild.InnerText;
+
+				string[]? resFull  = resText.Split(Formatting.MUL_SIGN);
+				
+				int       w        = Int32.Parse(resFull[0]);
+				int       h        = Int32.Parse(resFull[1]);
+				int       totalRes = w * h;
 
 				if (totalRes >= TOTAL_RES_MIN) {
 					var restRes = Network.GetSimpleResponse(link);
@@ -103,9 +112,6 @@ private static List<ISearchResult> GetYandexImages(HtmlDocument doc)
 						images.Add(yi);
 					}
 				}
-
-
-				// todo
 			}
 
 			return images;
@@ -116,20 +122,20 @@ public override FullSearchResult GetResult(string url)
 			// todo: slow
 
 			var sr = base.GetResult(url);
-			
+
 			try {
 
 				// Get more info from Yandex
 
-				var html = Network.GetString(sr.RawUrl);
-				var doc = new HtmlDocument();
+				string? html = Network.GetString(sr.RawUrl);
+				var     doc  = new HtmlDocument();
 				doc.LoadHtml(html);
 
 				/*
 				 * Parse what the image looks like
 				 */
 
-				var looksLike = GetYandexAnalysis(doc);
+				string? looksLike = GetYandexAnalysis(doc);
 				sr.Caption = looksLike;
 
 
@@ -143,9 +149,9 @@ public override FullSearchResult GetResult(string url)
 
 				//
 				var best = images[0];
-				sr.Width = best.Width;
+				sr.Width  = best.Width;
 				sr.Height = best.Height;
-				sr.Url = best.Url;
+				sr.Url    = best.Url;
 
 
 				sr.AddExtendedResults(bestImages);

SmartImage/Engines/SauceNao/SauceNaoDataResult.cs

@@ -1,5 +1,7 @@
 using System;
+using System.ComponentModel;
 using System.Runtime.Serialization;
+using JetBrains.Annotations;
 
 namespace SmartImage.Engines.SauceNao
 {
@@ -42,10 +44,21 @@ public class SauceNaoDataResult
 		[IgnoreDataMember]
 		public float Rating { get; internal set; }
 
-
 		[IgnoreDataMember]
 		public string WebsiteTitle { get; set; }
 
+		[IgnoreDataMember]
+		public string Character { get; internal set; }
+
+		[IgnoreDataMember]
+
+		public string Material { get; internal set; }
+
+		[IgnoreDataMember]
+
+		public string Creator { get; internal set; }
+
+
 		public override string ToString()
 		{
 			string firstUrl = Url != null ? Url[0] : "-";