Remove Spectre: corrupts console buffer and causes other issues

Author: Decimation

SmartImage 3/App/Integration.cs

@@ -148,8 +148,8 @@ public static void HandlePath(bool option)
 				}
 
 				bool appFolderInPath = oldValue
-				                       .Split(FileSystem.PATH_DELIM)
-				                       .Any(p => p == appFolder);
+					.Split(FileSystem.PATH_DELIM)
+					.Any(p => p == appFolder);
 
 				string cd  = Environment.CurrentDirectory;
 				string exe = Path.Combine(cd, ExeLocation);

SmartImage 3/Mode/CliMode.cs

@@ -15,7 +15,7 @@
 
 namespace SmartImage.Mode;
 
-public sealed class CliMode : IDisposable, IMode
+public sealed class CliMode : IDisposable, IMode, IProgress<int>
 {
 	#region
 
@@ -31,19 +31,18 @@ static CliMode()
 
 	private SearchResult[] m_results2;
 
-	private readonly SearchConfig m_cfg;
-
 	private SearchQuery m_query;
 
 	private readonly SearchClient m_client;
 
 	private readonly CancellationTokenSource m_cts;
 
-	public SearchConfig Config => m_cfg;
+	public SearchConfig Config { get; }
+
 	public CliMode()
 	{
-		m_cfg    = new SearchConfig();
-		m_client = new SearchClient(m_cfg);
+		Config   = new SearchConfig();
+		m_client = new SearchClient(Config);
 		m_query  = SearchQuery.Null;
 		m_cts    = new CancellationTokenSource();
 	}
@@ -52,7 +51,7 @@ public CliMode()
 	{
 
 		// await Prg_1.StartAsync(ctx => ValidateInputAsync(ctx, c as string));
-		await ValidateInputAsync((c as string)!);
+		await ValidateInputAsync((string) c!);
 		AConsole.WriteLine($"{m_query}");
 
 		// var url = await Prg_1.StartAsync(UploadInputAsync);
@@ -61,7 +60,7 @@ public CliMode()
 
 		AConsole.MarkupLine($"[green]{m_query.Upload}[/]");
 
-		AConsole.WriteLine($"{m_cfg}");
+		AConsole.WriteLine($"{Config}");
 
 		SConsole.CancelKeyPress += (sender, args) =>
 		{
@@ -117,14 +116,17 @@ void OnComplete(object sender, SearchResult[] searchResults)
 			// pt1.Increment(COMPLETE);
 		}
 
-		var ptMap = new Dictionary<BaseSearchEngine, (object, Table)>();
+		m_client.OnComplete += OnComplete;
 
-		foreach (var e in m_client.Engines) {
-			var tt = get_table(e);
-			ptMap.Add(e, (this, tt));
-		}
+		var mt = new Table()
+		{
+			Border      = TableBorder.Heavy,
+			Title       = new($"Results"),
+			ShowFooters = true,
+			ShowHeaders = true,
+		};
 
-		m_client.OnComplete += OnComplete;
+		mt.AddColumns(new TableColumn("#"), new TableColumn("Link"));
 
 		// pt1.MaxValue = m_client.Engines.Length;
 
@@ -135,10 +137,10 @@ void OnResult(object sender, SearchResult sr)
 			// pt1.Increment(1.0);
 			int i = 0;
 
-			var t = ptMap[sr.Engine].Item2;
+			// var t = ptMap[sr.Engine].Item2;
 
 			foreach (SearchResultItem sri in sr.Results) {
-				t.Rows.Add(new IRenderable[]
+				mt.Rows.Add(new IRenderable[]
 				{
 					new Text($"{i + 1}"),
 					Markup.FromInterpolated($"[link={sri.Url}]{sr.Engine.Name} #{i + 1}[/]")
@@ -158,20 +160,17 @@ void OnResult(object sender, SearchResult sr)
 		while (!pt1.IsFinished) { }*/
 		var sw = Stopwatch.StartNew();
 
-		var sp = AConsole.Status()
-			.Spinner(Spinner.Known.Aesthetic)
-			.StartAsync("Wait...", async ctx =>
+		var sp = AConsole.Live(mt)
+			.AutoClear(false)
+			.Overflow(VerticalOverflow.Ellipsis)
+			.StartAsync(async (ctx) =>
 			{
-				// await ttt;
-
 				while (!ttt.IsCompleted) {
 					ctx.Refresh();
-					await Task.Delay(TimeSpan.FromMilliseconds(300));
-
-					ctx.Status =
-						$"{m_results.Count} | {m_results.Sum(c => c.Results.Count)} | {sw.Elapsed.TotalSeconds:3F}";
+					mt.Caption = new TableTitle($"{sw.Elapsed.TotalSeconds:F3}");
+					// await Task.Delay(1000);
 				}
-				// m_results2 = await ttt;
+
 			});
 
 		await ttt;
@@ -192,11 +191,6 @@ void OnResult(object sender, SearchResult sr)
 
 		await sp;
 
-		foreach (var vt in ptMap.Values) {
-			// vt.Item1.StopTask();
-			AConsole.Write(vt.Item2);
-		}
-
 	}
 
 	private static Table get_table(BaseSearchEngine bse)
@@ -222,4 +216,9 @@ public void Dispose()
 		m_query.Dispose();
 		m_client.Dispose();
 	}
+
+	public void Report(int value)
+	{
+		Debug.WriteLine($"{value}");
+	}
 }

SmartImage 3/Program.cs

@@ -1,8 +1,6 @@
 #nullable disable
-global using AConsole = Spectre.Console.AnsiConsole;
 global using SConsole = System.Console;
 global using static Kantan.Diagnostics.LogCategories;
-using Console = Spectre.Console.AnsiConsole;
 using System.CommandLine;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
@@ -19,7 +17,6 @@
 using SmartImage.Mode;
 using SmartImage.Mode.Shell;
 using SmartImage.Utilities;
-using Spectre.Console;
 using Command = System.CommandLine.Command;
 
 #pragma warning disable CS0168

SmartImage 3/SmartImage.csproj

@@ -73,11 +73,6 @@
     <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
     <PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.0" />
-    <PackageReference Include="Spectre.Console" Version="0.46.0" />
-    <PackageReference Include="Spectre.Console.Analyzer" Version="0.46.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
     <PackageReference Include="System.Json" Version="4.7.1" />

SmartImage.Lib 3/SearchClient.cs

@@ -1,6 +1,9 @@
 global using ICBN = JetBrains.Annotations.ItemCanBeNullAttribute;
 using System.Collections;
+using System.Collections.Concurrent;
 using System.Diagnostics;
+using System.Net;
+using System.Net.NetworkInformation;
 using System.Text.Json;
 using Flurl.Http;
 using Flurl.Http.Configuration;
@@ -85,7 +88,7 @@ static SearchClient()
 	/// </summary>
 	/// <param name="query">Search query</param>
 	/// <param name="token">Cancellation token passed to <see cref="BaseSearchEngine.GetResultAsync"/></param>
-	public async Task<SearchResult[]> RunSearchAsync(SearchQuery query, CancellationToken? token = null)
+	public async Task<SearchResult[]> RunSearchAsync(SearchQuery query, CancellationToken? token = null, [CBN] IProgress<int> p=null)
 	{
 		if (!ConfigApplied) {
 			await ApplyConfigAsync();
@@ -112,13 +115,15 @@ public async Task<SearchResult[]> RunSearchAsync(SearchQuery query, Cancellation
 			var result = await task;
 
 			OnResult?.Invoke(this, result);
+			p?.Report(i);
 
 			if (Config.PriorityEngines.HasFlag(result.Engine.EngineOption)) {
 
 				OpenResult(result);
 			}
 
-			results[i++] = result;
+			results[i] = result;
+			i++;
 			// results.Add(result);
 			tasks.Remove(task);
 		}
@@ -194,48 +199,19 @@ public async ValueTask ApplyConfigAsync()
 	[CBN]
 	public BaseSearchEngine TryGetEngine(SearchEngineOptions o) => Engines.FirstOrDefault(e => e.EngineOption == o);
 
-	public class SearchResultItemCollection : ICollection<SearchResultItem>
+	public static ValueTask<IReadOnlyList<SearchResultItem>> Filter(IEnumerable<SearchResultItem> sri)
 	{
-		private readonly ICollection<SearchResultItem> m_value;
 
-		public IEnumerator<SearchResultItem> GetEnumerator()
-		{
-			return m_value.GetEnumerator();
-		}
-
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return ((IEnumerable) m_value).GetEnumerator();
-		}
-
-		public void Add(SearchResultItem item)
-		{
-			m_value.Add(item);
-		}
-
-		public void Clear()
-		{
-			m_value.Clear();
-		}
-
-		public bool Contains(SearchResultItem item)
-		{
-			return m_value.Contains(item);
-		}
+		var sri2 = sri.AsParallel().DistinctBy(e => e.Url).ToList();
 
-		public void CopyTo(SearchResultItem[] array, int arrayIndex)
+		/*Parallel.ForEachAsync(sri2, async (item, token) =>
 		{
-			m_value.CopyTo(array, arrayIndex);
-		}
-
-		public bool Remove(SearchResultItem item)
-		{
-			return m_value.Remove(item);
-		}
+			var r = await item.Url.AllowAnyHttpStatus().GetAsync();
 
-		public int Count => m_value.Count;
+			if (r.ResponseMessage.IsSuccessStatusCode) { }
+		});*/
 
-		public bool IsReadOnly => m_value.IsReadOnly;
+		return ValueTask.FromResult<IReadOnlyList<SearchResultItem>>(sri2);
 	}
 
 	public static IReadOnlyList<SearchResultItem> Optimize(IEnumerable<SearchResultItem> sri)
@@ -295,4 +271,5 @@ public void Dispose()
 		ConfigApplied = false;
 		IsComplete    = false;
 	}
+	
 }