refactoring

Author: Decimation

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

@@ -35,22 +35,14 @@ protected override Url GetRawUrl(SearchQuery query)
 		// return (BaseUrl.AppendPathSegments("image").AppendPathSegment(Base64Hash));
 	}
 
-	protected override ValueTask<SearchResultItem> ParseResultItem(INode n, SearchResult r)
-	{
-		// ReSharper disable PossibleNullReferenceException
-
-		var p = ChanPost.Parse(n);
-		return p.ToItem(r);
-
-		// ReSharper restore PossibleNullReferenceException
-	}
+	
 
 	protected static string GetHash(SearchQuery q)
 	{
 		//var digestBase64URL = digestBase64.replace('==', '').replace(/\//g, '_').replace(/\+/g, '-');
 		using Stream stream = q.Source.Image.ToStream();
-		var data   = MD5.HashData(stream);
-		var b64    = Convert.ToBase64String(data).Replace("==", "");
+		var          data   = MD5.HashData(stream);
+		var          b64    = Convert.ToBase64String(data).Replace("==", "");
 		b64 = Regex.Replace(b64, @"\//", "_");
 		b64 = Regex.Replace(b64, @"\+", "-");
 
@@ -72,25 +64,35 @@ public override void Dispose()
 
 }
 
-public record ChanPost : ISearchResultItemConverter<ChanPost>
+public record ChanPost : SearchResultItem, INodeResultParse<ChanPost>
 {
 
-	public string Author;
-	public string Board;
-	public Url    File;
-	public string Filename;
-	public int    Height;
-
-	public long     Id;
-	public string   Size;
-	public string   Text;
-	public string   Time1;
-	public DateTime Time2;
-	public string   Title;
-	public string   Tripcode;
-	public int      Width;
-
-	public static ChanPost Parse(INode n)
+	public string Board { get; private set; }
+
+	public Url File { get; private set; }
+
+	public string Filename { get; private set; }
+
+	public long Id { get; private set; }
+
+	public string Size { get; private set; }
+
+	public string Text { get; private set; }
+
+	// public string Time1 { get; private set; }
+
+	// public DateTime Time2 { get; private set; }
+
+	public string Tripcode { get; private set; }
+
+
+	
+
+	private ChanPost(SearchResult r) : base(r) { }
+
+#region Implementation of IResultParse<in INode,ChanPost>
+
+	public static ValueTask<ChanPost> ParseResultItem(INode n, SearchResult r)
 	{
 		var e = n as HtmlElement;
 
@@ -107,42 +109,28 @@ public static ChanPost Parse(INode n)
 
 		var wh = pfm[1].Split('x');
 
-		var p = new ChanPost
+		var file = Flurl.Url.Parse(pff.GetAttribute("href"));
+
+		var p = new ChanPost(r)
 		{
 			Id       = Int64.Parse(e.GetAttribute("id")),
 			Board    = e.GetAttribute("data-board"),
 			Filename = pff.TextContent,
-			File     = pff.GetAttribute("href"),
+			File     = file,
 			Width    = Int32.Parse(wh[0]),
 			Height   = Int32.Parse(wh[1]),
 			Size     = pfm[0],
 			Title    = pt,
-			Author   = pa,
+			Artist   = pa,
+			Site     = file.Host,
 			Tripcode = ptc,
-			Time1    = time,
-			Time2    = time2,
+			Time     = time2,
 			Text     = text
 		};
 
-		return p;
+		return ValueTask.FromResult(p);
 	}
 
-	public ValueTask<SearchResultItem> ToItem(SearchResult sr)
-	{
-
-		var sri = new SearchResultItem(sr)
-		{
-			Url         = File,
-			Width       = Width,
-			Height      = Height,
-			Artist      = Author,
-			Description = Title,
-			Time        = Time2,
-			Site        = File.Host,
-			Metadata    = this
-		};
-
-		return ValueTask.FromResult(sri);
-	}
+#endregion
 
 }

SmartImage.Lib/Engines/Impl/Search/EHentaiEngine.cs

@@ -335,13 +335,15 @@ public override ValueTask<bool> ApplyConfigAsync(SearchConfig cfg, CancellationT
 
 #endregion
 
-	protected override ValueTask<SearchResultItem> ParseResultItem(INode n, SearchResult r)
+#region Overrides of WebSearchEngine
+
+	protected override async ValueTask<IEnumerable<SearchResultItem>> GetItems(IEnumerable<INode> n, SearchResult r)
 	{
-		var eh  = EhResult.Parse(n);
-		var sri = eh.ToItem(r);
-		return sri;
+		
 	}
 
+#endregion
+
 	public override void Dispose()
 	{
 		// m_client.Dispose();
@@ -370,47 +372,33 @@ private bool SetField<T>(ref T field, T value, [CallerMemberName] string propert
 
 }
 
-public sealed record EhResult : ISearchResultItemConvertable
+public sealed record EhResult : SearchResultItem, INodeResultParse<EhResult>
 {
 
-	public string Type { get; internal set; }
-
-	public string Pages { get; internal set; }
+	public string Type { get; private set; }
 
-	public string Title { get; internal set; }
+	public string Pages { get; private set; }
 
-	public string Author { get; internal set; }
 
-	public string AuthorUrl { get; internal set; }
+	public string Author { get; private set; }
 
-	public Url Url { get; internal set; }
+	public string AuthorUrl { get; private set; }
 
-	public ConcurrentDictionary<string, ConcurrentBag<string>> Tags { get; } = new();
 
+	public Dictionary<string, string[]> Tags { get; }
 
-#region Implementation of IResultConverter2<out EhResult,out SearchResultItem>
-
-	public ValueTask<SearchResultItem> ToItem(SearchResult sr)
+	private EhResult(SearchResult r) : base(r)
 	{
-		var sb = Tags.Select(t => $"{t.Key}: {t.Value.QuickJoin()}").QuickJoin(" | ");
-
-		var sri = new SearchResultItem(sr)
-		{
-			Title       = Title,
-			Url         = Url,
-			Artist      = Author,
-			Description = $"{Pages} ({sb})"
-		};
-
-		return ValueTask.FromResult(sri);
+		Tags = [];
 	}
 
-	public static EhResult Parse(INode n)
-	{
-		var item = new EhResult();
+#region Implementation of IResultConverter2<out EhResult,out SearchResultItem>
 
+	
+	public static ValueTask<EhResult>  ParseResultItem(INode n, SearchResult sr)
+	{
 		// ReSharper disable InconsistentNaming
-		var eh = new EhResult();
+		var eh = new EhResult(sr);
 
 		var gl1c = n.ChildNodes.FirstOrDefaultElementByClassName("gl1c");
 
@@ -480,20 +468,20 @@ public static EhResult Parse(INode n)
 
 
 		if (eh.Tags.TryGetValue("artist", out var v)) {
-			item.Author = v.FirstOrDefault();
+			eh.Author = v.FirstOrDefault();
 		}
 
+		var sb = eh.Tags.Select(t => $"{t.Key}: {t.Value.QuickJoin()}").QuickJoin(" | ");
 
-		item.Title = eh.Title;
-		item.Url   = eh.Url;
+		eh.Description=sb;
 
 		/*var gl1c        = n.ChildNodes[0];
 		var gl2c        = n.ChildNodes[1];
 		var ehx_compact = n.ChildNodes[2];
 		var gl3c        = n.ChildNodes[3];
 		var gl4c        = n.ChildNodes[4];*/
 
-		return item;
+		return ValueTask.FromResult(eh);
 
 	}
 

SmartImage.Lib/Engines/Impl/Search/FluffleEngine.cs

@@ -147,7 +147,7 @@ public class FluffleResultCredit
 
 }
 
-public class FluffleResult : ISearchResultItemConvertable
+public class FluffleResult : IToSearchResultItem
 {
 
 	[JsonPropertyName("id")]

SmartImage.Lib/Engines/Impl/Search/GoogleLensEngine.cs

@@ -21,7 +21,7 @@
 #pragma warning disable IDE0051
 namespace SmartImage.Lib.Engines.Impl.Search;
 
-public class GoogleLensItem : ISearchResultItemConverter<GoogleLensItem>
+public class GoogleLensItem : INodeToSearchResultItemParseable<GoogleLensItem>
 {
 
 	public string Title { get; private set; }

SmartImage.Lib/Engines/Impl/Search/RepostSleuthEngine.cs

@@ -105,7 +105,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 
 #region API Objects
 
-	private class RepostSleuthMatch : ISearchResultItemConvertable
+	private class RepostSleuthMatch : IToSearchResultItem
 	{
 
 		public int              hamming_distance;

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

@@ -326,7 +326,7 @@ public static bool IsLookupUrl(Url url)
 /// <summary>
 /// Origin result
 /// </summary>
-public sealed class SauceNaoDataResult : IItemConverter<SauceNaoDataResult, IEnumerable<SearchResultItem>>
+public sealed class SauceNaoDataResult : INodeParseable<SauceNaoDataResult>
 {
 
 	/// <summary>

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

@@ -150,7 +150,7 @@ public class TraceMoeQuotaObject
 }
 
 [UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
-public class TraceMoeDoc : ISearchResultItemConvertable
+public class TraceMoeDoc : IToSearchResultItem
 {
 
 	public double From { get; set; }