Tweak metadata handling; improve SauceNao parsing

Author: Decimation

SmartImage 3/Mode/Shell/ShellMode.Handlers.cs

@@ -188,7 +188,7 @@ private async void Filter_Clicked()
 	{
 
 		var res = m_results
-			.Where(r => r.Status == SearchResultStatus.Success || r.Status == SearchResultStatus.None)
+			.Where(r => r.Status is SearchResultStatus.Success or SearchResultStatus.None)
 			.SelectMany(r => r.Results);
 
 		filterOrder     = Math.Clamp(++filterOrder, 0, filterMax);
@@ -197,7 +197,7 @@ private async void Filter_Clicked()
 		for (int j = 0; j < filterOrder - (funcs.Length - 1); j++) {
 			res = res.Where(funcs[j]);
 		}
-
+		
 		if (filterOrder == filterMax) {
 			Btn_Filter.Enabled = false;
 
@@ -230,7 +230,6 @@ await Parallel.ForEachAsync(res3, async (item, token) =>
 		}
 
 		Btn_Filter.Enabled = true;
-
 	}
 
 	private void Queue_Checked(bool b)

SmartImage 3/Mode/Shell/ShellMode.cs

@@ -347,6 +347,16 @@ public bool UseClipboard
 
 	public ShellMode(string[] args)
 	{
+		if (Compat.IsWin) {
+			try {
+				Console.SetWindowSize(150, 35);
+			}
+			catch (Exception e) {
+				Debug.WriteLine($"{e.Message}");
+			}
+
+		}
+
 		Args     = args;
 		m_token  = new();
 		m_tokenu = new();
@@ -602,13 +612,34 @@ private void AddResultToTable(SearchResult result)
 		Dt_Results.Rows.Add($"{result.Engine.Name} (Raw)", string.Empty,
 		                    result.RawUrl, 0, null, null, $"{result.Status}",
 		                    null, null, null, null, null, null);
+
 		// Message[result.RawUrl] = "?";
 		// var rawSri = new SearchResultItem(result) { Url = result.RawUrl, Similarity = null };
 
 		for (int i = 0; i < result.Results.Count; i++) {
 			SearchResultItem sri = result.Results[i];
+
+			object? meta = sri.Metadata switch
+			{
+				/*string[] rg      => rg.QuickJoin(),
+				Array rg         => rg.QuickJoin(),
+				ICollection c    => c.QuickJoin(),*/
+				string s         => s,
+				ExpandoObject eo => eo.QuickJoin(),
+				_                => null,
+
+			};
+
 			add(sri, i);
 
+			if (sri.Metadata is string[] rg) {
+				var extra = sri.FromMetadata().ToArray();
+
+				for (int j = 0; j < extra.Length; j++) {
+					SearchResultItem searchResultItem = extra[j];
+					add(searchResultItem, i, j + 1);
+				}
+			}
 		}
 
 		// Interlocked.Increment(ref ResultCount);
@@ -620,20 +651,10 @@ private void AddResultToTable(SearchResult result)
 
 	}
 
-	void add(SearchResultItem sri, int i)
+	void add(SearchResultItem sri, int i, int j = 0)
 	{
-		object? meta = sri.Metadata switch
-		{
-			string[] rg      => rg.QuickJoin(),
-			Array rg         => rg.QuickJoin(),
-			ICollection c    => c.QuickJoin(),
-			string s         => s,
-			ExpandoObject eo => eo.QuickJoin(),
-			_                => null,
 
-		};
-
-		// object? meta = sri.Metadata;
+		object? meta = sri.Metadata;
 
 		if (sri.Similarity is { } and 0) {
 			sri.Similarity = null;
@@ -644,7 +665,13 @@ void add(SearchResultItem sri, int i)
 
 		IndexColors[st] = cs;
 
-		Dt_Results.Rows.Add($"{sri.Root.Engine.Name} #{i + 1}", "",
+		string s = $"{sri.Root.Engine.Name} #{i + 1}";
+
+		if (j != 0) {
+			s += $".{j}";
+		}
+
+		Dt_Results.Rows.Add(s, "",
 		                    sri.Url, sri.Score, sri.Similarity, sri.Artist, sri.Description, sri.Source,
 		                    sri.Title, sri.Site, sri.Width, sri.Height, meta);
 	}
@@ -861,7 +888,7 @@ private async Task<bool> TrySetQueryAsync(ustring text)
 		Btn_Run.Enabled     = false;
 		Pbr_Status.Fraction = 0;
 		// Btn_Delete.Enabled = true;
-		
+
 		Btn_Browse.Enabled = QueueMode;
 
 		Tf_Input.ReadOnly  = true;

SmartImage.Lib 3/Engines/Impl/Search/SauceNaoEngine.cs

@@ -30,7 +30,10 @@ namespace SmartImage.Lib.Engines.Impl.Search;
 
 public sealed class SauceNaoEngine : BaseSearchEngine, IClientSearchEngine
 {
-	private const string BASE_URL = "https://saucenao.com/";
+	private static readonly string[] Syn_Artists    = new[] { "Creator(s):", "Creator:", "Member:", "Artist:", "Author:" };
+	private static readonly string[] Syn_Characters = new[] { "Characters:" };
+	private static readonly string[] Syn_Material   = new[] { "Material:", "Source:" };
+	private const           string   BASE_URL       = "https://saucenao.com/";
 
 	private const string BASE_ENDPOINT = BASE_URL + "search.php";
 
@@ -226,18 +229,14 @@ static SauceNaoDataResult Parse(INode result)
 			// INode  resultcontentcolumn1 = resultcontent.ChildNodes[1];
 			string rcci = resultcontentcolumn_rg.FuncJoin(e => e.TextContent, ",");
 
-			var synonyms   = new[] { "Creator(s):", "Creator:", "Member:", "Artist:", "Author:" };
-			var material   = new[] { "Material:", "Source:" };
-			var characters = new[] { "Characters:" };
-
 			// string material1 = rcci.SubstringAfter(material);
-			string material1 = rcci.SubstringAfter(material.First());
+			string material1 = rcci.SubstringAfter(Syn_Material.First());
 
 			// string creator1 = rcci;
 			string creator1    = rcci;
 			string characters1 = null;
 
-			foreach (var s in synonyms) {
+			foreach (var s in Syn_Artists) {
 				if (rti.StartsWith(s)) {
 					rti = rti.SubstringAfter(s).Trim(' ');
 				}
@@ -253,7 +252,7 @@ static SauceNaoDataResult Parse(INode result)
 					            or IElement { NodeName: "SPAN" }))
 				.ToArray();
 
-			for (int i = 0; i < nodes.Length - 1; i += 2) {
+			/*for (int i = 0; i < nodes.Length - 1; i += 2) {
 				var n  = nodes[i];
 				var n2 = nodes[i + 1];
 
@@ -271,7 +270,7 @@ static SauceNaoDataResult Parse(INode result)
 				if (characters.Any(nStr.StartsWith)) {
 					characters1 = n2Str;
 				}
-			}
+			}*/
 
 			/*if (resultcontentcolumn.ChildNodes.Length >= 2) {
 				string creatorTitle = null;
@@ -306,12 +305,37 @@ static SauceNaoDataResult Parse(INode result)
 			{
 				Urls       = links.Distinct().ToArray(),
 				Similarity = similarity,
-				Creator    = creator1,
-				Title      = rti,
-				Material   = material1
+				// Creator    = creator1,
+				Title    = rti,
+				Material = material1
 
 			};
 
+			for (int i = 0; i < nodes.Length; i++) {
+				var node = nodes[i];
+				var s    = node.TextContent;
+
+				if (s.StartsWith("Source:")) {
+					dataResult.Source = nodes[++i].TextContent;
+					continue;
+				}
+
+				if (s.StartsWith("Material:")) {
+					dataResult.Material = nodes[++i].TextContent;
+					continue;
+				}
+
+				if (Syn_Characters.Any(s.StartsWith)) {
+					dataResult.Character = nodes[++i].TextContent;
+					continue;
+				}
+
+				if (Syn_Artists.Any(s.StartsWith)) {
+					dataResult.Creator = nodes[++i].TextContent;
+					continue;
+				}
+			}
+
 			/*foreach (INode rccn in resultcontent.ChildNodes) {
 				foreach (string s in material) {
 					if (rccn.TextContent.StartsWith(s)) {
@@ -320,7 +344,7 @@ static SauceNaoDataResult Parse(INode result)
 					}
 				}
 			}*/
-			foreach (IElement element1 in resultcontent.QuerySelectorAll("strong")) {
+			/*foreach (IElement element1 in resultcontent.QuerySelectorAll("strong")) {
 				for (int i = 0; i < element1.Children.Length - 1; i += 2) {
 					IElement ec1 = element1.Children[i];
 
@@ -352,7 +376,7 @@ static SauceNaoDataResult Parse(INode result)
 
 					}
 				}
-			}
+			}*/
 
 			return dataResult;
 
@@ -532,6 +556,7 @@ private sealed class SauceNaoDataResult
 		public string Material { get; internal set; }
 
 		public string Creator { get; internal set; }
+		public string Source  { get; internal set; }
 	}
 }
 

SmartImage.Lib 3/Results/SearchResultItem.cs

@@ -146,6 +146,18 @@ public void UpdateScore()
 		m_isScored = true;
 	}
 
+	public IEnumerable<SearchResultItem> FromMetadata()
+	{
+		if (Metadata is string[] rg) {
+			for (int i = 0; i < rg.Length; i++) {
+				yield return new SearchResultItem(this)
+				{
+					Url = rg[i]
+				};
+			}
+		}
+	}
+
 	[MustUseReturnValue]
 	public async Task<bool> GetUniAsync()
 	{