adjust indexing; preview changes

Author: Decimation

SmartImage.Lib/Engines/Results/SearchResultItem.cs

@@ -319,7 +319,11 @@ public async ValueTask<bool> ScanAsync(CancellationToken ct = default)
 
 		var cw = Channel.CreateUnbounded<SearchResultItem>();
 
-		var task = ScanAsync(cw.Writer, s => { return CloneWithUrl(s); }, ct);
+		var task = ScanAsync(cw.Writer, s =>
+		{
+			var obj= CloneWithUrl(s);
+			return obj;
+		}, ct);
 
 		while (await cw.Reader.WaitToReadAsync(ct)) {
 			var val = await cw.Reader.ReadAsync(ct);

SmartImage.Lib/Images/SizeTN.cs

@@ -2,7 +2,7 @@
 // Author: Deci | Project: SmartImage.Lib | Name: SizeTN.cs
 // Date: 2025/08/21 @ 00:08:17
 
-#region Aliasses
+#region Aliases
 
 global using SizeS2N = SmartImage.Lib.Images.SizeTN<short>;
 global using SizeS4N = SmartImage.Lib.Images.SizeTN<int>;

SmartImage.Lib/Images/Uni/UniImage.cs

@@ -199,8 +199,6 @@ public virtual async ValueTask<bool> AllocImageAsync(CancellationToken ct = defa
 				Image = await ISImage.LoadAsync(stream, ct);
 				stream.Rewind();
 				Hash = ImageUtilities.Hasher.Hash(stream);
-				CalculateSimilarity(this);
-
 			}
 			catch (Exception exception) {
 				s_logger.LogError(exception, "{Value} failed to allocate image", Value);

SmartImage.Lib/Images/Uni/UniImageUrl.cs

@@ -56,7 +56,6 @@ public async ValueTask<bool> ScanAsync<TUni>(ChannelWriter<TUni> cw, Func<string
 		await Parallel.ForEachAsync(urls, ct, async (s, token) =>
 		{
 			var item = newItem(s);
-
 			var allocImgOk = await item.AllocImageAsync(token);
 
 			if (allocImgOk) {

SmartImage.Rdx/Commands/Search/SearchCommand.UI.cs

@@ -24,6 +24,7 @@
 using System.Diagnostics;
 using System.Runtime.Caching;
 using System.Runtime.CompilerServices;
+using Kantan.Text;
 using Microsoft.Extensions.Logging;
 using SixLabors.ImageSharp.Processing;
 using SmartImage.Lib;
@@ -283,15 +284,13 @@ private async Task RunInteractiveAsync(CancellationToken ct = default)
 					break;
 				}
 
-				var sel    = ShellSelection.GetSelectionChoice(sr);
-				var sri    = sel.Item;
-				var selIdx = sel.Index();
+				var sel     = ShellSelection.GetSelectionChoice(sr);
+				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);
 
-				// s_logger.LogTrace("Interactive: {ResItem}", sri);
-
 				if (cmd == R2.Chc_Open) {
 					SearchClient.OpenResult(sri.Url);
 					clrWrite = false;
@@ -305,45 +304,18 @@ await AnsiConsole.Live(srTable).StartAsync(async (f) =>
 						bool scannedOk = false;
 						scannedOk = await sri.ScanAsync(m_ctsRun.Token);
 
-
 						if (!scannedOk) {
 							return;
 						}
 
-						/*if (!tbl.TryGetValue(sel.Item, out var idx)) {
-							for (int j = 0; j < sel.Item.ScannedItems.Count; j++) {
-								tbl[sel.Item.ScannedItems[j]] = j;
-							}
-						}*/
-
-						// var idx = tbl[sel.Item.Parent];
-
-						
 						for (int i = 0; i < sri.ScannedItems.Count; i++) {
 							SearchResultItem scnItm = sri.ScannedItems[i];
-							var              scnRow = scnItm.GetItemRow(sel.ItemIdx, i);
-							srTable.InsertRow(selIdx2 + i + 1, scnRow);
-						}
-						
-
-						// row = idx;
-						// row = GetRowForItem(sri);
-						// row = sr.Index(sel.Item, sel.Scanned);
-
-						// row = sr.Index(sri);
-
-						// var row2 = sriPak;
-						// row = row2.RootIdx + (row2.ScnIdx == -1 ? 0 : (row2.ScnIdx + 1));
-
-						if (sri.HasImage) {
-							srTable.Rows.Update(selIdx2, (int) ResultRowIndex.ROW_WH, sri.GetResolution());
+							scnItm.CalculateSimilarity(Query.Source);
 
+							var scnRow = scnItm.GetItemRow(sel.ItemIdx, i);
+							srTable.InsertRow(selIdx + i + 1, scnRow);
 						}
 
-						if (sri.HasHash && !sri.Similarity.HasValue) {
-							sri.CalculateSimilarity(Query.Source);
-							srTable.Rows.Update(selIdx2, (int) ResultRowIndex.ROW_SIMILARITY, sri.GetSimilarity());
-						}
 
 						f.Refresh();
 
@@ -364,7 +336,7 @@ await AnsiConsole.Live(srTable).StartAsync(async (f) =>
 					});
 
 
-					clrWrite = false;
+					clrWrite = true;
 					continue;
 				}
 
@@ -375,7 +347,7 @@ await AnsiConsole.Live(srTable).StartAsync(async (f) =>
 
 					var ci = GetPreview(sri);
 
-					ShowPreview(ci, sri);
+					AnsiConsole.AlternateScreen(() => { ShowPreview(ci, sri); });
 					clrWrite = true;
 				}
 
@@ -385,20 +357,9 @@ await AnsiConsole.Live(srTable).StartAsync(async (f) =>
 
 				}
 
-				if (cmd == "expand") {
-					var si     = sri.ScannedItems;
-					var scnTbl = new ConcurrentDictionary<SearchResultItem, SpcTable>();
-
-					var table = Elements.CreateFullResultTable();
-					scnTbl[sri] = table;
-
-					for (int i = 0; i < si.Count; i++) {
-						SearchResultItem scnI = si[i];
-						var              row  = scnI.GetFullResultRow(i, new Style(link: scnI.Url));
-						scnTbl[sri].AddRow(row);
-					}
-				}
+				if (cmd == "expand") { }
 
+				if (cmd == "retry") { }
 
 			} while (cmd != R2.Chc_Back);
 
@@ -453,7 +414,7 @@ private CanvasImage GetPreview(SearchResultItem sri)
 
 		if (ci is null) {
 			str = sri.GetStream();
-			ci  = new CanvasImage(str);
+			ci  = new CanvasImage(str) { };
 
 
 			m_previewCanvasCache.Set(key, ci, cip);
@@ -462,32 +423,19 @@ private CanvasImage GetPreview(SearchResultItem sri)
 
 		Trace.Assert(ci != null);
 
-		// var ci = new CanvasImage(str);
-
 		return ci;
 	}
 
 	private void ShowPreview(CanvasImage ci, SearchResultItem ui)
 	{
-		// AnsiConsole.Clear();
-
-		// (AnsiConsole.Profile.Width, AC.Profile.Height) = (ui.Image.Width, ui.Image.Height);
-		// ci.MaxWidth = AnsiConsole.Profile.Width;
-
-		// Console.SetWindowSize(ui.Image.Width, ui.Image.Height);
-		// ci.MaxWidth ??= ci.Width;
-		// ci.MaxWidth ??= ui.Image.Width;
+		var (w, h) = (AnsiConsole.Profile.Width, AC.Profile.Height);
 
-		// var panel = new Panel(ci) { Expand = true, };
+		var pnl = new Panel(ci) { Expand = true, Border = BoxBorder.None };
 
-		var (w, h)     = (AnsiConsole.Profile.Width, AC.Profile.Height);
-		var (mwO, pwO) = (ci.MaxWidth, ci.PixelWidth);
-		var (mw, pw)   = (mwO ?? ci.Width, pwO);
-
-		AnsiConsole.Live(ci).Start(ldc =>
+		AnsiConsole.Live(pnl).Start(ldc =>
 		{
 			while (true) {
-
+				// ci.MaxWidth = mw < 0 ? null : mw;
 				ldc.Refresh();
 				var cki = AnsiConsole.Console.Input.ReadKey(true);
 
@@ -496,50 +444,32 @@ private void ShowPreview(CanvasImage ci, SearchResultItem ui)
 				}
 
 				switch (cki.Value.Key) {
-					case ConsoleKey.DownArrow:
-						pw--;
-						break;
 
-					case ConsoleKey.LeftArrow:
-						mw--;
-						break;
 
-					case ConsoleKey.UpArrow:
-						pw++;
+					case ConsoleKey.S:
+						ci.Mutate(act => { act.Resize(ui.Image.Width, ui.Image.Height); });
 						break;
 
-					case ConsoleKey.RightArrow:
-						mw++;
+					case ConsoleKey.M:
+						ci.MaxWidth = w;
 						break;
 
-					case ConsoleKey.Escape:
-						return;
-
 					case ConsoleKey.R:
 						ci.Mutate(act =>
 						{
 							var cs = act.GetCurrentSize();
 
-							act.Resize(cs.ResizeByFactor(new Size(w, h)));
+							var cs2 = cs.ResizeByFactor(new Size(w, h));
+							act.Resize(cs2);
 						});
-						pw = 1;
 
-						// mw = 0;
 						ci.MaxWidth = null;
 						continue;
 
-					case ConsoleKey.A:
-						ci.MaxWidth = mwO;
-						pw          = 0;
-						break;
+					case ConsoleKey.Escape:
+						return;
 
-					case ConsoleKey.C:
-						AnsiConsole.Clear();
-						break;
 				}
-
-				ci.MaxWidth   = mw < 0 ? null : mw;
-				ci.PixelWidth = Math.Clamp(pw, 0, 10);
 			}
 		});
 

SmartImage.Rdx/Commands/Search/SearchCommand.cs

@@ -1,4 +1,10 @@
-using System.Data;
+#region Aliases
+
+global using SizeIS = SixLabors.ImageSharp.Size;
+
+#endregion
+
+using System.Data;
 using System.Data.SqlTypes;
 using Kantan.Text;
 using Novus.OS;

SmartImage.Rdx/Shell/Elements.cs

@@ -2,6 +2,7 @@
 // Date: 2025/12/27 @ 22:12:49
 
 #nullable disable
+using Kantan.Text;
 using SmartImage;
 using SmartImage.Lib.Engines.Results;
 using Spectre.Console;
@@ -36,10 +37,12 @@ public IEnumerable<IRenderable[]> GetFullResultRows()
 
 	}
 
+	public static IRenderable GetResolution(SizeIS sz) => new Text($"{sz.Width}{Strings.Constants.MUL_SIGN}{sz.Height}");
+
 	extension(SearchResultItem sri)
 	{
 
-		public IRenderable GetResolution() => (sri.HasDimensions) ? new Text($"{sri.Width}x{sri.Height}") : Elements.Txt_NA;
+		public IRenderable GetResolution() => (sri.HasDimensions) ? GetResolution(new SizeIS(sri.Width.Value, sri.Height.Value)) : Elements.Txt_NA;
 
 		public IRenderable GetSimilarity() => AsRenderable(sri.Similarity);