Rdx: Remove table mode, remove interactive mode

Author: Decimation

SmartImage.Rdx/SearchCommand.cs

@@ -257,18 +257,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, SearchComma
 
 		int act;
 
-		if (m_scs.TableFormat == OutputFields.None) {
-			act = await RunSimpleAsync();
-		}
-		else {
-			act = await RunTableAsync();
-
-		}
-
-		if (settings.Interactive.HasValue && settings.Interactive.Value) {
-			act = await RunInteractiveAsync();
-
-		}
+		act = await RunSimpleAsync();
 
 		return (int) act;
 	}
@@ -312,164 +301,6 @@ private async Task<int> RunSimpleAsync()
 		return EC_OK;
 	}
 
-	private async Task<int> RunTableAsync()
-	{
-		var format = m_scs.TableFormat;
-		var table  = CliFormat.GetTableForFormat(format);
-
-		var live = AConsole.Live(table)
-			.StartAsync(async (l) =>
-			{
-
-				// Client.OnResult += OnResultComplete;
-
-				var run = Client.RunSearchAsync(Query, token: m_cts.Token);
-
-				while (await Client.ResultChannel.Reader.WaitToReadAsync()) {
-					var sr = await Client.ResultChannel.Reader.ReadAsync();
-					int i  = 0;
-
-					var rm = new ResultModel(sr)
-						{ };
-
-					m_results.Add(rm);
-
-					if (!sr.IsStatusSuccessful) {
-						// Debugger.Break();
-						var rows = rm.GetRowsForFormat(format);
-						table.AddRow(rows);
-					}
-					else {
-						var results = rm.GetRowsForFormat2(format);
-
-						foreach (IRenderable[] allResult in results) {
-							table.AddRow(allResult);
-
-						}
-					}
-
-					rm.UpdateGrid();
-
-					l.Refresh();
-				}
-
-				await run;
-
-				// Client.OnResult -= OnResultComplete;
-				return;
-
-			});
-
-		await live;
-
-		return EC_OK;
-	}
-
-	public async Task<int> RunInteractiveAsync()
-	{
-
-		AConsole.Clear();
-
-		//todo
-
-		int i   = 0;
-		var gr1 = new Grid();
-		gr1.AddColumns(2);
-
-		foreach (ResultModel result in m_results) {
-			gr1.AddRow($"{result.Result.Engine.Name}", $"{i++}");
-		}
-
-		var res = m_results.ToArray();
-
-		ConsoleKeyInfo prompt = default;
-
-		const string L_ROOT = "Root";
-		const string L_LEFT = "Left";
-
-		const string L_RIGHT  = "Right";
-		const string L_TOP    = "Top";
-		const string L_BOTTOM = "Bottom";
-
-		var layout = new Layout(L_ROOT)
-			.SplitColumns(
-				new Layout(L_LEFT, gr1) { },
-				new Layout(L_RIGHT) { }
-					.SplitRows(
-						new Layout(L_TOP) { },
-						new Layout(L_BOTTOM) { }));
-
-		do {
-			// prompt = AConsole.Prompt(choices);
-
-			AConsole.Clear();
-			layout[L_LEFT].Update(new Panel(gr1));
-			AConsole.Write(layout);
-
-			prompt = Console.ReadKey(true);
-
-			var keyChar = prompt.KeyChar;
-			var idx     = (int) Char.GetNumericValue(keyChar);
-
-			var b = idx >= 0 && idx < res.Length;
-
-			if (b) {
-				var rm = res[idx];
-				Debug.WriteLine($"{prompt} {idx} {rm}");
-
-				if (Query.Uni == null) {
-					throw new SmartImageException();
-				}
-
-				var stream = Query.Uni.Stream;
-				stream.TrySeek();
-
-				var gr2 = rm.UpdateGrid(clear: true);
-
-				// Update the left column
-				layout[L_LEFT].Update(new Panel(rm.Grid));
-
-				// layout["Top"].Update(new Panel(gr2));
-
-				AConsole.Clear();
-				AConsole.Write(layout);
-
-				do {
-					prompt = Console.ReadKey(true);
-
-					if (prompt.Key == ConsoleKey.Backspace) {
-						break;
-					}
-
-					/*
-					if (prompt.Key == ConsoleKey.Backspace) {
-						continue;
-					}*/
-					var keyChar2 = prompt.KeyChar;
-					var idx2     = (int) Char.GetNumericValue(keyChar2);
-
-					// var val      = rm.Grid.Rows[choice2i][0];
-					// var val2     = new Text(val.ToString(), style: new Style(Color.Yellow));
-					// Debug.WriteLine($"{val} {val2}");
-
-					gr2 = rm.UpdateGrid(idx2, true);
-
-					layout[L_LEFT].Update(new Panel(rm.Grid));
-					layout[L_TOP].Update(new Panel(gr2));
-
-					AConsole.Clear();
-					AConsole.Write(layout);
-
-				} while (true);
-
-			}
-			else { }
-
-		} while (prompt.Key != ConsoleKey.OemMinus);
-
-		return EC_OK;
-	}
-
 	public void Dispose()
 	{
 		foreach (var sr in m_results) {

SmartImage.Rdx/SearchCommandSettings.cs

@@ -41,20 +41,6 @@ internal sealed class SearchCommandSettings : CommandSettings
 
 	#region
 
-	[CommandOption("--interactive")]
-	[DefaultValue(false)]
-	[Description("Show interactive UI after search")]
-	public bool? Interactive { get; internal set; }
-
-	[CommandOption("--table-format")]
-	[DefaultValue(OutputFields.None)]
-	[Description("[Table] Fields to display")]
-	public OutputFields TableFormat { get; internal set; }
-
-	#endregion
-
-	#region
-
 	[CommandOption("-f|--output-format")]
 	[DefaultValue(OutputFileFormat.None)]
 	[Description("Output file format")]