Finishing touches; RepostSleuth fixes

Author: Decimation

SmartImage.Lib/Engines/Search/RepostSleuthEngine.cs

@@ -20,7 +20,8 @@ namespace SmartImage.Lib.Engines.Search;
 
 public sealed class RepostSleuthEngine : BaseSearchEngine, IDisposable
 {
-	private const string URL_API   = "https://api.repostsleuth.com/image";
+
+	private const string URL_API   = "https://api.repostsleuth.com/api/image";
 	private const string URL_QUERY = "https://repostsleuth.com/search?url=";
 
 	public Url Endpoint => URL_API;
@@ -41,7 +42,7 @@ public RepostSleuthEngine() : base(URL_QUERY)
 
 	public override void Dispose() { }
 
-	
+
 	public override async Task<SearchResult> GetResultAsync(SearchQuery query, CancellationToken token = default)
 	{
 		var sr = await base.GetResultAsync(query, token);
@@ -51,24 +52,17 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 		try {
 			using var response = await Client.Request(Endpoint)
 				                     .WithTimeout(Timeout)
-				                     .SetQueryParams(new
+				                     .PostMultipartAsync(buildContent: content =>
 				                     {
-					                     filter               = true,
-					                     url                  = query.Upload,
-					                     same_sub             = false,
-					                     filter_author        = true,
-					                     only_older           = false,
-					                     include_crossposts   = false,
-					                     meme_filter          = false,
-					                     target_match_percent = 90,
-					                     filter_dead_matches  = false,
-					                     target_days_old      = 0
-				                     }).GetAsync(cancellationToken: token).ConfigureAwait(false);
+					                     var stream = query.Source.GetStream();
+					                     content.AddFile("image", stream, query.Source.Name);
+				                     }, cancellationToken: token);
 
 			if (response.StatusCode == 530) {
 				goto ret;
 			}
-			var s = await response.GetStreamAsync().ConfigureAwait(false);
+
+			var s = await response.GetStringAsync().ConfigureAwait(false);
 			obj = JsonSerializer.Deserialize<RepostSleuthResult>(s, JsOptions);
 		}
 		catch (JsonException e) {

SmartImage.Lib/Engines/Search/YandexEngine.cs

@@ -92,7 +92,6 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 			var ocr     = jsonNode["initialState"]["cbirOcr"];
 			var ocrText = ocr["hasText"].GetValue<bool>() ? ocr["plainText"] : null;
 			sr.Overview = $"OCR: {ocrText}";
-
 			foreach (var site in sitesObj) {
 				// site.Root = sr;
 				var sri = site.ToItem(sr);
@@ -101,6 +100,8 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 				sr.Results.Add(sri);
 			}
 
+			// var sitesObjDistinct=sitesObj.DistinctBy(x=>x.OriginalImage.Url);
+
 			// sr.Results.AddRange(sitesObj);
 
 

SmartImage.Lib/Images/Uni/UniImage.cs

@@ -250,7 +250,7 @@ public static async Task<UniImage> TryCreateAsync(object o, bool autoInit = true
 				bool allocOk    = false;
 				bool allocImgOk = false;
 
-				(allocOk,allocImgOk) = await ui.AllocAll(ct);
+				(allocOk, allocImgOk) = await ui.AllocAll(ct);
 
 				s_logger.LogTrace("{Value} :: {AllocOk} {AllocImgOk}", o, allocOk, allocImgOk);
 
@@ -302,19 +302,20 @@ public bool TryDeleteFile()
 		return !HasLocalFilePath;
 	}
 
+	public virtual string Name { get; protected set;}
+
 	[MURV]
 	public virtual string WriteImageToFile([CBN] string fn = null)
 	{
 		if (!HasImage) {
 			throw new InvalidOperationException();
 		}
 
-		fn ??= this switch
-		{
-			UniImageUrl uri   => uri.Url.GetFileName(),
-			UniImageFile file => file.LocalFileInfo.Name,
-			_                 => Path.GetRandomFileName()
-		};
+		if (HasLocalFilePath) {
+			return LocalFilePath;
+		}
+
+		fn ??= String.IsNullOrWhiteSpace(Name) ? Path.GetRandomFileName() : Name;
 
 		fn = Path.ChangeExtension(fn, ImageFormat.FileExtensions.First());
 

SmartImage.Lib/Images/Uni/UniImageFile.cs

@@ -20,6 +20,9 @@ internal UniImageFile(FileInfo fi) : base(fi.FullName, UniImageType.File)
 
 	public FileInfo LocalFileInfo { get; }
 
+	public override string Name => LocalFileInfo.Name;
+
+
 	protected override async ValueTask<bool> AllocSourceAsync(CancellationToken ct = default)
 	{
 		if (HasBytes) {

SmartImage.Lib/Images/Uni/UniImageUrl.cs

@@ -9,6 +9,7 @@
 using SixLabors.ImageSharp.PixelFormats;
 using SmartImage.Lib.Engines.Results;
 using SmartImage.Lib.Model;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Immutable;
 using System.Net;
@@ -30,6 +31,10 @@ internal UniImageUrl(Url url) : base(url?.ToString(), UniImageType.Uri)
 		Url = url;
 	}
 
+
+	public override string Name => Url.GetFileName();
+
+
 	/*public static async ValueTask<UniImageUrl> ScanAsync(Url u, ChannelWriter<UniImageUrl> cw, CancellationToken ct=default)
 	{
 		var ui = await TryCreateAsync(u,ct:ct);

SmartImage.Rdx/Commands/Search/SearchCommand.cs

@@ -131,7 +131,7 @@ protected override void InitConfig(SearchCommandSettings scs)
 		Client = new SearchClient(Config);
 
 		m_mainTable = CommandSettings.Interactive ? Renderables.CreateMainTable() : Renderables.CreateFullResultTable();
-
+		m_mainTable.Expand = true;
 	}
 
 	public override async Task<int> ExecuteAsync(CommandContext context, SearchCommandSettings settings, CancellationToken cancellationToken)
@@ -161,7 +161,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, SearchComma
 		m_layout = new Layout("Root").SplitColumns(
 			new Layout("L").SplitRows(
 				new("LC", cfgPanel),
-				new("LT", m_mainTable)
+				new("LT", m_mainTable) { }
 			),
 			new Layout("R", ciPanel) { }
 		);