Final changes for Rdx 1.2.0

Author: Decimation

SmartImage.Lib/Engines/Search/RepostSleuthEngine.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Net;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
@@ -59,7 +60,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 				                     }, cancellationToken: token);
 
 			if (response.StatusCode == 530) {
-				goto ret;
+				goto ret;	
 			}
 
 			var s = await response.GetStringAsync().ConfigureAwait(false);
@@ -98,7 +99,7 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 
 #region API Objects
 
-	private class RepostSleuthMatch
+	public class RepostSleuthMatch
 	{
 
 		public int              hamming_distance;
@@ -119,13 +120,14 @@ public ValueTask<SearchResultItem> ToItem(SearchResult sr)
 				Site       = post.subreddit,
 				Url        = post.url,
 				Title      = post.title,
-				Time       = DateTimeOffset.FromUnixTimeSeconds((long) post.created_at).LocalDateTime
+				Time       = DateTimeOffset.FromUnixTimeSeconds((long) post.created_at).LocalDateTime,
+				Metadata = this
 			});
 		}
 
 	}
 
-	private class RepostSleuthPost
+	public class RepostSleuthPost
 	{
 
 		public string post_id;
@@ -142,7 +144,7 @@ private class RepostSleuthPost
 	}
 
 	[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
-	private class RepostSleuthResult
+	public class RepostSleuthResult
 	{
 
 		public object                     meme_template;
@@ -155,7 +157,7 @@ private class RepostSleuthResult
 
 	}
 
-	private class RepostSleuthSearchSettings
+	public class RepostSleuthSearchSettings
 	{
 
 		public bool   filter_crossposts;
@@ -177,7 +179,7 @@ private class RepostSleuthSearchSettings
 
 	}
 
-	private class RepostSleuthSearchTimes
+	public class RepostSleuthSearchTimes
 	{
 
 		public double pre_annoy_filter_time;

SmartImage.Rdx/Commands/Search/SearchCommand.cs

@@ -130,7 +130,7 @@ protected override void InitConfig(SearchCommandSettings scs)
 
 		Client = new SearchClient(Config);
 
-		m_mainTable = CommandSettings.Interactive ? Renderables.CreateMainTable() : Renderables.CreateFullResultTable();
+		m_mainTable        = CommandSettings.Interactive ? Renderables.CreateMainTable() : Renderables.CreateFullResultTable();
 		m_mainTable.Expand = true;
 	}
 
@@ -307,6 +307,7 @@ private async Task RunInteractiveAsync(CancellationToken ct = default)
 				var sri     = sel.Item;
 				var selIdx  = sel.Index();
 				var selIdx2 = sel.Index2();
+				
 
 				s_logger.LogDebug("Selected {Item} {Scn} | {Idx1}, {Idx2}", sel.Item, sel.IsScannedItem, selIdx, selIdx2);
 
@@ -326,7 +327,7 @@ await AnsiConsole.Live(srTable).StartAsync(async (f) =>
 						if (!scannedOk) {
 							return;
 						}
-
+						
 						for (int i = 0; i < sri.ScannedItems.Count; i++) {
 							SearchResultItem scnItm = sri.ScannedItems[i];
 							scnItm.CalculateSimilarity(Query.Source);
@@ -446,7 +447,7 @@ private void ShowPreview(CanvasImage ci, SearchResultItem sri)
 	{
 		var (w, h) = (AnsiConsole.Profile.Width, AC.Profile.Height);
 
-		var pnl        = new Panel(ci) { Expand = true, Border = BoxBorder.None, Header = new PanelHeader($"{sri.Value}")};
+		var pnl = new Panel(ci) { Expand = true, Border = BoxBorder.None, Header = new PanelHeader($"{sri.Value}") };
 		/*var sriLayout = new Layout("Info");
 
 		sriLayout.SplitColumns(

SmartImage.Rdx/Shell/Renderables.cs

@@ -140,7 +140,7 @@ public IRenderable[] GetItemRow(int idx, int subIdx)
 			return
 			[
 				new Text($"#{idx}.{subIdx}", style),
-				new Text(Markup.Escape(sri.Url)),
+				new Text(Markup.Escape(sri.Url), new Style(link: sri.Url)),
 				sri.GetSimilarity(),
 				Elements.Txt_NA,
 				sri.GetResolution()
@@ -203,7 +203,7 @@ private static SpcTable CreateResultTable()
 	{
 		var tb = new SpcTable()
 		{
-			Caption     = new TableTitle("Results", Elements.Sty_ResultHeader),
+			// Caption     = new TableTitle("Results", Elements.Sty_ResultHeader),
 			Border      = TableBorder.Simple,
 			ShowHeaders = true,
 		};

SmartImage.Rdx/Shell/ShellSelection.cs

@@ -36,7 +36,7 @@ public int Index2()
 		var rg = ItemIdx + Item.Root.Results[..ItemIdx].Sum(x => x.ScannedItems.Count);
 
 
-		var sumIdx = rg + ScanIdx + (IsScannedItem ? ((ScanIdx == 0) ? 1 : 0) : 0);
+		var sumIdx  = rg + ScanIdx + (IsScannedItem ? ((ScanIdx == 0) ? 1 : 0) : 0);
 		var sumIdx2 = rg + ScanIdx + (IsScannedItem ? ((ScanIdx == 0) ? 1 : 0) : 1);
 
 		return sumIdx2;
@@ -133,4 +133,45 @@ public static ShellSelection GetSelectionChoice(SearchResult res)
 
 	}
 
+	/*public static ShellSelection GetSelectionChoice2(SearchResult sr)
+	{
+		var prompt = new SelectionPrompt<SearchResultItem>()
+		{
+			Mode = SelectionMode.Independent,
+			SearchEnabled = true,
+			Converter = item =>
+			{
+				//
+				return item.Url;
+			}
+		};
+
+		foreach (var item in sr.Results) {
+
+			if (item.HasScannedItems) {
+				prompt.AddChoiceGroup(item, item.ScannedItems);
+
+			}
+			else {
+				prompt.AddChoice(item);
+
+			}
+		}
+
+		var resp    = AnsiConsole.Prompt(prompt);
+		int itemIdx = 0, scanIdx = 0;
+
+		if (resp.IsChild) {
+			scanIdx = resp.Parent.ScannedItems.IndexOf(resp);
+			itemIdx = sr.Results.IndexOf(resp.Parent);
+		}
+		else {
+			itemIdx = sr.Results.IndexOf(resp);
+
+		}
+
+
+		return new ShellSelection(resp, itemIdx, scanIdx, resp.IsChild);
+	}*/
+
 }