*

Author: Decimation

SmartImage.Lib 3/SearchConfig.cs

@@ -4,6 +4,7 @@
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using Kantan.Model;
+using Kantan.Model.MemberIndex;
 using Kantan.Utilities;
 using SmartImage.Lib.Engines;
 using SmartImage.Lib.Engines.Impl.Search;
@@ -13,6 +14,7 @@ namespace SmartImage.Lib;
 
 public sealed class SearchConfig : INotifyPropertyChanged
 {
+
 	#region Defaults
 
 	/// <summary>
@@ -242,6 +244,7 @@ private void OnPropertyChanged([CallerMemberName] string propertyName = null)
 	private bool SetField<T>(ref T field, T value, [CallerMemberName] string propertyName = null)
 	{
 		if (EqualityComparer<T>.Default.Equals(field, value)) return false;
+
 		field = value;
 		OnPropertyChanged(propertyName);
 		return true;
@@ -251,4 +254,5 @@ public override string ToString()
 	{
 		return $"{SearchEngines}\n{PriorityEngines}";
 	}
+
 }

SmartImage.Rdx/Cli/CliFormat.Elements.cs

@@ -17,6 +17,8 @@ internal static partial class CliFormat
 
 	internal static readonly Style Sty_Url = new(Color.Cyan1, decoration: Decoration.None);
 
+	public static readonly Style Sty_Grid1 = new Style(foreground: Color.DodgerBlue1, decoration: Decoration.Bold);
+
 	public static readonly Color Clr_Misc1 = new(0x80, 0xFF, 0x80);
 
 	internal static readonly Text Txt_Empty = new(string.Empty);
@@ -44,20 +46,26 @@ static CliFormat() { }
 
 	internal static readonly bool IsLinux   = OperatingSystem.IsLinux();
 	internal static readonly bool IsWindows = OperatingSystem.IsWindows();
-	internal static readonly bool IsMacOs = OperatingSystem.IsMacOS();
+	internal static readonly bool IsMacOs   = OperatingSystem.IsMacOS();
 
 	public static Grid CreateInfoGrid()
 	{
 		var grd = new Grid();
 		grd.AddColumns(2);
 
-		grd.AddRow("OS", $"{GetOS()} / {Environment.OSVersion}");
-		grd.AddRow("Runtime", $"{Environment.Version}");
+		var dict = new Dictionary<string, object>()
+		{
+			["OS"]               = $"{GetOS()} / {Environment.OSVersion}",
+			["Runtime"]          = Environment.Version,
+			["Terminal ANSI"]    = ProfileCapabilities.Ansi,
+			["Terminal colors"]  = ProfileCapabilities.ColorSystem,
+			["Terminal links"]   = ProfileCapabilities.Links,
+			["Terminal Unicode"] = ProfileCapabilities.Unicode
+		};
 
-		grd.AddRow("Terminal ANSI", $"{ProfileCapabilities.Ansi}");
-		grd.AddRow("Terminal colors", $"{ProfileCapabilities.ColorSystem}");
-		grd.AddRow("Terminal links", $"{ProfileCapabilities.Links}");
-		grd.AddRow("Terminal Unicode", $"{ProfileCapabilities.Unicode}");
+		foreach ((string? key, var value) in dict) {
+			grd.AddRow(new Text(key, Sty_Grid1), new Text(value.ToString()));
+		}
 
 		return grd;
 	}

SmartImage.Rdx/SearchCommand.cs

@@ -23,6 +23,7 @@
 using Flurl;
 using JetBrains.Annotations;
 using Kantan.Diagnostics;
+using Kantan.Model.MemberIndex;
 using Kantan.Utilities;
 using Novus.Streams;
 using SixLabors.ImageSharp.Processing;
@@ -116,12 +117,23 @@ public override async Task<int> ExecuteAsync(CommandContext context, SearchComma
 
 		var dt = new Grid();
 		dt.AddColumns(2);
-		
-		object[] val = [Config.SearchEngines, Config.PriorityEngines, Config.EhUsername, Config.EhPassword];
-		
-		// var t = CliFormat.DTableToSTable(dt);
 
-		// AConsole.Write(t);
+		var kv = new Dictionary<string, object>()
+		{
+			[R1.S_SearchEngines]   = Config.SearchEngines,
+			[R1.S_PriorityEngines] = Config.PriorityEngines,
+			[R1.S_EhUsername]      = Config.EhUsername,
+			[R1.S_EhPassword]      = Config.EhPassword,
+			[R1.S_AutoSearch]      = Config.AutoSearch,
+
+		};
+
+		foreach (var o in kv) {
+			dt.AddRow(new Text(o.Key, CliFormat.Sty_Grid1),
+			          new Text(o.Value.ToString()));
+		}
+
+		AConsole.Write(dt);
 
 		AConsole.WriteLine($"Input: {Query}");