Refactoring; misc

Author: Decimation

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

@@ -16,6 +16,7 @@ namespace SmartImage.Lib.Engines.Impl.Search;
 
 public class ArchiveMoeEngine : WebSearchEngine
 {
+
 	public ArchiveMoeEngine() : this("https://archived.moe/_/search/") { }
 
 	protected ArchiveMoeEngine(string baseUrl) : base(baseUrl) { }
@@ -33,7 +34,7 @@ protected static string GetHash(SearchQuery q)
 	{
 		//var digestBase64URL = digestBase64.replace('==', '').replace(/\//g, '_').replace(/\+/g, '-');
 		var data = MD5.HashData(q.Uni.Stream);
-		var    b64      = Convert.ToBase64String(data).Replace("==", "");
+		var b64  = Convert.ToBase64String(data).Replace("==", "");
 		b64 = Regex.Replace(b64, @"\//", "_");
 		b64 = Regex.Replace(b64, @"\+", "-");
 
@@ -83,17 +84,19 @@ protected override ValueTask<SearchResultItem> ParseResultItem(INode n, SearchRe
 			Text     = text
 		};
 
-		return ValueTask.FromResult(p.Convert(r));
+		return ValueTask.FromResult(p.Convert(r, out _));
 
 		// ReSharper restore PossibleNullReferenceException
 
 	}
 
 	protected override string NodesSelector => "//article[contains(@class,'post')]";
+
 }
 
 internal record ChanPost : IResultConvertable
 {
+
 	public long     Id;
 	public string   Board;
 	public string   Filename;
@@ -108,8 +111,10 @@ internal record ChanPost : IResultConvertable
 	public DateTime Time2;
 	public string   Text;
 
-	public SearchResultItem Convert(SearchResult sr)
+	public SearchResultItem Convert(SearchResult sr, out SearchResultItem[] ch)
 	{
+		ch = [];
+
 		var sri = new SearchResultItem(sr)
 		{
 			Url         = File,
@@ -118,10 +123,11 @@ public SearchResultItem Convert(SearchResult sr)
 			Artist      = Author,
 			Description = Title,
 			Time        = Time2,
-			Site = File.Host,
+			Site        = File.Host,
 			Metadata    = this
 		};
 
 		return sri;
 	}
+
 }

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

@@ -108,7 +108,15 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 		var imageResults = dataResults.Where(o => o != null)
 
 			// .AsParallel()
-			.Select(x => x.Convert(result))
+			.SelectMany(x =>
+			{
+				var i = x.Convert(result, out var rg);
+
+				Array.Resize(ref rg, rg.Length + 1);
+				rg[^1] = i;
+
+				return rg;
+			})
 			.Where(o => o != null)
 
 			// .OrderByDescending(e => e.Similarity)
@@ -127,7 +135,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 
 			// TODO: HACK
 
-			var allSisters = imageResults
+			/*var allSisters = imageResults
 				.SelectMany(ir => ir.Children)
 				.DistinctBy(s => s.Url)
 				.ToList(); // note: need ToList()
@@ -136,7 +144,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 				var ir = imageResults[i];
 				ir.Children.Clear();
 				ir.Children.AddRange(allSisters.Where(irs => irs.Parent == ir));
-			}
+			}*/
 
 		}
 
@@ -165,7 +173,7 @@ private async Task<IEnumerable<SauceNaoDataResult>> GetWebResultsAsync(SearchQue
 		IFlurlResponse response = null;
 
 		response = await EndpointUrl.AllowHttpStatus()
-			           .OnError( x =>
+			           .OnError(x =>
 			           {
 
 				           x.ExceptionHandled = true;
@@ -501,7 +509,7 @@ private sealed class SauceNaoDataResult : IResultConvertable
 
 		public string ThumbnailTitle { get; internal set; }
 
-		public SearchResultItem Convert(SearchResult r)
+		public SearchResultItem Convert(SearchResult r, out SearchResultItem[] children)
 		{
 			var    idxStr   = Index.ToString();
 			string siteName = Index != 0 ? idxStr : null;
@@ -555,7 +563,7 @@ public SearchResultItem Convert(SearchResult r)
 
 			};
 
-			imageResult.AddChildren(meta);
+			children = imageResult.AddChildren(meta);
 
 			return imageResult;
 

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

@@ -119,7 +119,7 @@ private async Task<IEnumerable<SearchResultItem>> ConvertResultsAsync(TraceMoeRo
 
 		for (int i = 0; i < items.Length; i++) {
 			var doc    = results[i];
-			var result = doc.Convert(sr);
+			var result = doc.Convert(sr, out var ch);
 
 			try {
 				string anilistUrl = ANILIST_URL.AppendPathSegment(doc.anilist);
@@ -203,8 +203,9 @@ public string EpisodeString
 			}
 		}
 
-		public SearchResultItem Convert(SearchResult sr)
+		public SearchResultItem Convert(SearchResult sr, out SearchResultItem[] children)
 		{
+			children = [];
 			var sim = Math.Round(similarity * 100.0f, 2);
 
 			string epStr = EpisodeString;

SmartImage.Lib 3/Model/IResultConvertable.cs

@@ -7,6 +7,6 @@ namespace SmartImage.Lib.Model;
 
 public interface IResultConvertable
 {
-	public SearchResultItem Convert(SearchResult sr);
+	public SearchResultItem Convert(SearchResult sr, out SearchResultItem[] children);
 
 }

SmartImage.Lib 3/Results/SearchResult.cs

@@ -71,7 +71,8 @@ public sealed class SearchResult : IDisposable, INotifyPropertyChanged
 
 	public IEnumerable<SearchResultItem> GetAllResults()
 	{
-		return Results.Union(Results.SelectMany(r => r.Children));
+		return Results;
+		// return Results.Union(Results.SelectMany(r => r.Children));
 	}
 
 	[CBN]
@@ -82,6 +83,7 @@ public IEnumerable<SearchResultItem> GetAllResults()
 	[CBN]
 	public string Overview { get; internal set; }
 
+	/*
 	[CBN]
 	public SearchResultItem GetBestResult()
 	{
@@ -92,6 +94,7 @@ public SearchResultItem GetBestResult()
 		return Results.OrderByDescending(r => r.Similarity)
 			.FirstOrDefault(r => Url.IsValid(r.Url));
 	}
+	*/
 
 	public bool IsStatusSuccessful => Status.IsSuccessful();
 
@@ -156,4 +159,11 @@ private bool SetField<T>(ref T field, T value, [CallerMemberName] string propert
 		return true;
 	}
 
+	public SearchResultItem GetRaw()
+		=> new SearchResultItem(this)
+		{
+			IsRaw = true,
+			Url   = RawUrl
+		};
+
 }

SmartImage.Lib 3/Results/SearchResultItem.cs

@@ -13,9 +13,10 @@
 namespace SmartImage.Lib.Results;
 
 public sealed record SearchResultItem : IDisposable,
-	IComparable<SearchResultItem>, IComparable,
-	IValidity<SearchResultItem>
+										IComparable<SearchResultItem>, IComparable,
+										IValidity<SearchResultItem>
 {
+
 	private bool m_isScored;
 
 	public const int MAX_SCORE = 13;
@@ -109,12 +110,25 @@ public sealed record SearchResultItem : IDisposable,
 	[CBN]
 	public SearchResultItem Parent { get; internal set; }
 
-	public List<SearchResultItem> Children { get; internal set; }
+	// public List<SearchResultItem> Children { get; internal set; }
 
 	// public bool IsUniType { get; internal set; }
 
 	public bool IsRaw { get; internal set; }
 
+	public bool Equals(SearchResultItem other)
+	{
+		if (ReferenceEquals(null, other)) return false;
+		if (ReferenceEquals(this, other)) return true;
+
+		return Root.Equals(other.Root) && Uni == other.Uni;
+	}
+
+	public override int GetHashCode()
+	{
+		return HashCode.Combine(Root, Uni);
+	}
+
 	internal SearchResultItem(SearchResult r)
 	{
 		Root       = r;
@@ -123,7 +137,7 @@ internal SearchResultItem(SearchResult r)
 		Uni        = null;
 		Parent     = null;
 		IsRaw      = false;
-		Children   = [];
+		// Children   = [];
 	}
 
 	/*
@@ -146,12 +160,6 @@ internal SearchResultItem[] FromUni()
 		return u;
 	}
 	*/
-	internal static SearchResultItem GetRaw(SearchResult r)
-		=> new SearchResultItem(r)
-		{
-			IsRaw = true,
-			Url   = r.RawUrl
-		};
 
 	public static bool IsValid([CBN] SearchResultItem r)
 	{
@@ -197,6 +205,7 @@ public void UpdateScore()
 		m_isScored = true;
 	}
 
+	/*
 	public void AddChildren(string[] rg)
 	{
 		for (int i = 0; i < rg.Length; i++) {
@@ -212,6 +221,25 @@ public void AddChildren(string[] rg)
 		}
 
 	}
+	*/
+	public SearchResultItem[] AddChildren(string[] rg)
+	{
+		var rg2 = new SearchResultItem[rg.Length];
+
+		for (int i = 0; i < rg.Length; i++) {
+
+			rg2[i] = new SearchResultItem(this)
+			{
+				Url      = rg[i],
+				// Children = [],
+				Parent   = this,
+			};
+
+			// Children.Add(sri);
+		}
+
+		return rg2;
+	}
 
 	// [MustUseReturnValue]
 	public async Task<bool> LoadUniAsync(CancellationToken ct = default)
@@ -271,8 +299,8 @@ public int CompareTo(object obj)
 		if (ReferenceEquals(this, obj)) return 0;
 
 		return obj is SearchResultItem other
-			       ? CompareTo(other)
-			       : throw new ArgumentException($"Object must be of type {nameof(SearchResultItem)}");
+				   ? CompareTo(other)
+				   : throw new ArgumentException($"Object must be of type {nameof(SearchResultItem)}");
 	}
 
 	public static bool operator <(SearchResultItem left, SearchResultItem right)
@@ -296,4 +324,5 @@ public int CompareTo(object obj)
 	}
 
 	#endregion
+
 }

SmartImage.Rdx/Cli/CliFormat.cs

@@ -23,7 +23,7 @@ internal enum ResultTableFormat
 	Similarity = 1 << 1,
 	Url        = 1 << 2,
 
-	Default = Name | Similarity | Url
+	Full = Name | Similarity | Url
 
 }
 

SmartImage.Rdx/ResultModel.cs

@@ -27,7 +27,7 @@ public ResultModel(SearchResult result, int id)
 	{
 		Result = result;
 		Id     = id;
-		Grid   = Create();
+		Grid   = CreateGrid();
 
 		// Table  = Create();
 	}
@@ -39,7 +39,7 @@ public void Dispose()
 		Result.Dispose();
 	}
 
-	private static Grid Create()
+	private static Grid CreateGrid()
 	{
 		var gr = new Grid();
 		gr.AddColumns(2);
@@ -94,7 +94,7 @@ private static STable CreateTable()
 	internal Grid UpdateGrid(int ix = -1, bool clear = false)
 	{
 		if (clear) {
-			Grid = Create();
+			Grid = CreateGrid();
 		}
 
 		var allRes = Result.GetAllResults();