Work on UI

Author: Decimation

SmartImage 3/Mode/Shell/ShellMode.Handlers.cs

@@ -3,6 +3,7 @@
 
 using System.Collections;
 using System.Collections.Concurrent;
+using System.Data;
 using System.Diagnostics;
 using System.Reflection;
 using AngleSharp.Dom;
@@ -29,6 +30,10 @@ namespace SmartImage.Mode.Shell;
 
 public sealed partial class ShellMode
 {
+	private const           int                                   INDEX   = 1;
+	private const           int                                   INV     = -1;
+	private static readonly ConcurrentDictionary<object, ustring> Message = new();
+
 	/// <summary>
 	///     <see cref="Tv_Results" />
 	/// </summary>
@@ -39,7 +44,8 @@ private void Result_CellActivated(TableView.CellActivatedEventArgs args)
 		}
 
 		try {
-			var cell = args.Table.Rows[args.Row][args.Col];
+			var rows = args.Table.Rows;
+			var cell = rows[args.Row][args.Col];
 
 			if (cell is Url { } u) {
 				HttpUtilities.TryOpenUrl(u);
@@ -384,7 +390,7 @@ private async void Reload_Clicked()
 
 	private static readonly ConcurrentDictionary<Url, ResultMeta> Scanned = new();
 
-	private static ConcurrentBag<Url> sx = new();
+	private static ConcurrentDictionary<Url, bool> sx = new();
 
 	public sealed record ResultMeta : IDisposable
 	{
@@ -413,6 +419,11 @@ private async void OnResultKeyPress(View.KeyEventEventArgs eventArgs)
 		c = 1;
 		Url v = (Tv_Results.Table.Rows[r][c]).ToString();
 
+		if (!Message.ContainsKey(v)) {
+			Message[v] = $"?";
+
+		}
+
 		switch (k) {
 			case Key.S:
 			{
@@ -421,11 +432,13 @@ private async void OnResultKeyPress(View.KeyEventEventArgs eventArgs)
 				break;
 			}
 			case Key.D:
-				if (sx.Contains(v)) {
+				if (sx.TryGetValue(v, out var b) && b) {
 					return;
 				}
-				sx.Add(v);
-				Lbl_Status2.Text = "....";
+
+				sx.TryAdd(v, true);
+				Message[v] = "Resolving";
+
 				Pbr_Status.Pulse();
 				var u = await UniSource.TryGetAsync(v, whitelist: FileType.Image);
 
@@ -450,16 +463,15 @@ private async void OnResultKeyPress(View.KeyEventEventArgs eventArgs)
 					open:
 					u.Dispose();
 					Novus.OS.FileSystem.ExploreFile(path2);
+					Message[v] = $"Downloaded";
 				}
 				else {
-					Lbl_Status2.Text = $"Invalid";
+					Message[v] = "Invalid";
 				}
 
 				// Pbr_Status.Pulse();
 
-				var list = sx.ToList();
-				var    bx   = list.Remove(v);
-				sx = new(list);
+				sx.TryRemove(v, out var x);
 
 				break;
 		}
@@ -470,15 +482,15 @@ private async void OnResultKeyPress(View.KeyEventEventArgs eventArgs)
 	private static async Task<bool> ScanResult(Url v)
 	{
 
-		if (sx.Contains(v)) {
+		if (sx.ContainsKey(v)) {
 			Lbl_Status2.Text = $"Scanning...!";
 			Lbl_Status2.SetNeedsDisplay();
 			return true;
 		}
 		else {
 			Lbl_Status2.Text = $"Scanning started...!";
 			Lbl_Status2.SetNeedsDisplay();
-			sx.Add(v);
+			sx.TryAdd(v, true);
 
 		}
 
@@ -528,4 +540,25 @@ private static async Task<bool> ScanResult(Url v)
 
 		return false;
 	}
+
+	private static int Norm(int n, int n2=0) => n == INV ? n2 : n;
+
+	private void OnCellSelected(TableView.SelectedCellChangedEventArgs eventArgs)
+	{
+		var nr = (eventArgs.NewRow == INV ? eventArgs.OldRow : eventArgs.NewRow);
+		var nc = eventArgs.NewCol == INV ? eventArgs.OldCol : eventArgs.NewCol;
+		nr = Norm(nr);
+		nc = Norm(nc);
+
+		var cell  = eventArgs.Table.Rows[nr][nc];
+		var cell2 = eventArgs.Table.Rows[nr][INDEX];
+
+		if (Message.ContainsKey(cell)) {
+			Lbl_Status2.Text = Message[cell];
+		}
+
+		else if (Message.ContainsKey(cell2)) {
+			Lbl_Status2.Text = Message[cell2];
+		}
+	}
 }

SmartImage 3/Mode/Shell/ShellMode.cs

@@ -414,7 +414,8 @@ public ShellMode(string[] args)
 		Tv_Results.Table   = Dt_Results;
 		Tv_Results.Visible = false;
 
-		Tv_Results.KeyPress += OnResultKeyPress;
+		Tv_Results.SelectedCellChanged += OnCellSelected;
+		Tv_Results.KeyPress            += OnResultKeyPress;
 
 		Tv_Results.CellActivated += Result_CellActivated;
 		Btn_Run.Clicked          += Run_Clicked;
@@ -495,12 +496,12 @@ private void PostSearch()
 	private void OnResult(object o, SearchResult result)
 	{
 		m_results.Add(result);
-
 		Application.MainLoop.Invoke(() =>
 		{
 			Dt_Results.Rows.Add($"{result.Engine.Name} (Raw)",
 			                    result.RawUrl, 0, 0, null, $"{result.Status}",
 			                    null, null, null, null, null, null);
+			Message[result.RawUrl] = "?";
 
 			for (int i = 0; i < result.Results.Count; i++) {
 				SearchResultItem sri = result.Results[i];
@@ -585,6 +586,7 @@ private void ProcessArgs()
 			Config.AutoSearch = Args.Contains(R2.Arg_AutoSearch);
 
 		}
+
 		var e = Args.GetEnumerator();
 
 		while (e.MoveNext()) {
@@ -766,6 +768,10 @@ private bool ClipboardCallback(MainLoop c)
 			 *	- Input is already ready
 			 *	- Clipboard history contains it already
 			 */
+			if (IsQueryReady()) {
+				Debug.WriteLine($"Ignoring...");
+				goto r1;
+			}
 
 			int curSeq  = Clipboard.SequenceNumber;
 			int prevSeq = m_seq;