*

Author: Decimation

SmartImage.Lib 3/Engines/Impl/Search/SauceNaoEngine.cs

@@ -130,12 +130,12 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 			goto ret;
 
 		}
-		else {
-			result.Status = SearchResultStatus.Success;
 
-			// TODO: HACK
+		result.Status = SearchResultStatus.Success;
 
-			/*var allSisters = imageResults
+		// TODO: HACK
+
+		/*var allSisters = imageResults
 				.SelectMany(ir => ir.Children)
 				.DistinctBy(s => s.Url)
 				.ToList(); // note: need ToList()
@@ -146,8 +146,6 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 				ir.Children.AddRange(allSisters.Where(irs => irs.Parent == ir));
 			}*/
 
-		}
-
 		result.Results.AddRange(imageResults);
 
 		// result.Results[0] = (imageResults.First());
@@ -370,7 +368,6 @@ private static SauceNaoDataResult Parse(INode result)
 				sndr.Creator = nodes[++i].TextContent.Trim(' ');
 
 				// var idx = Array.IndexOf(sndr.Urls, nodes[i].TryGetAttribute(Serialization.Atr_href));
-				continue;
 			}
 
 		}
@@ -514,8 +511,8 @@ public SearchResultItem Convert(SearchResult r, out SearchResultItem[] children)
 			var    idxStr   = Index.ToString();
 			string siteName = Index != 0 ? idxStr : null;
 
-			var site  = Kantan.Text.Strings.NormalizeNull(siteName);
-			var title = Kantan.Text.Strings.NormalizeNull(WebsiteTitle);
+			var site  = Strings.NormalizeNull(siteName);
+			var title = Strings.NormalizeNull(WebsiteTitle);
 
 			var sb = new StringBuilder();
 
@@ -552,11 +549,11 @@ public SearchResultItem Convert(SearchResult r, out SearchResultItem[] children)
 
 				// Similarity = Similarity,
 				Description    = siteName,
-				Artist         = Kantan.Text.Strings.NormalizeNull(Creator),
-				Source         = Kantan.Text.Strings.NormalizeNull(Material),
-				Character      = Kantan.Text.Strings.NormalizeNull(Character),
+				Artist         = Strings.NormalizeNull(Creator),
+				Source         = Strings.NormalizeNull(Material),
+				Character      = Strings.NormalizeNull(Character),
 				Site           = site,
-				Title          = Kantan.Text.Strings.NormalizeNull(Title),
+				Title          = Strings.NormalizeNull(Title),
 				Metadata       = meta,
 				Thumbnail      = Thumbnail,
 				ThumbnailTitle = ThumbnailTitle

SmartImage.Lib 3/SearchConfig.cs

@@ -11,7 +11,7 @@
 
 namespace SmartImage.Lib;
 
-public sealed class SearchConfig : IDataTable, INotifyPropertyChanged
+public sealed class SearchConfig : INotifyPropertyChanged
 {
 	#region Defaults
 
@@ -205,7 +205,7 @@ public void Save()
 		Debug.WriteLine($"Saved to {Configuration.FilePath}", nameof(Save));
 	}
 
-	public DataTable ToTable()
+	/*public DataTable ToTable()
 	{
 		var table = new DataTable("Configuration");
 
@@ -225,12 +225,12 @@ public DataTable ToTable()
 		table.Rows.Add(Resources.S_AutoSearch, AutoSearch);
 		table.Rows.Add(Resources.S_SauceNaoKey, SauceNaoKey);
 		/*table.Rows.Add(Resources.S_HydrusEndpoint, HydrusEndpoint);
-		table.Rows.Add(Resources.S_HydrusKey, HydrusKey);*/
+		table.Rows.Add(Resources.S_HydrusKey, HydrusKey);#1#
 
 		// table.Rows.Add("Path", new FileInfo(Configuration.FilePath).Name);
 
 		return table;
-	}
+	}*/
 
 	public event PropertyChangedEventHandler PropertyChanged;
 

SmartImage.Lib 3/SearchQuery.cs

@@ -59,7 +59,7 @@ public long Size
 	[MNNW(true, nameof(Uni))]
 	public bool HasUni => Uni != null;
 
-	internal SearchQuery([CBN] UniSource f)
+	internal SearchQuery([MN] UniSource f)
 	{
 		Uni = f;
 

SmartImage.Rdx/Cli/CliFormat.Elements.cs

@@ -1,7 +1,6 @@
 // Deci SmartImage.Rdx CliFormat.Elements.cs
 // $File.CreatedYear-$File.CreatedMonth-26 @ 1:25
 
-using System.Collections.ObjectModel;
 using SmartImage.Lib.Engines;
 using Spectre.Console;
 
@@ -12,22 +11,22 @@ internal static partial class CliFormat
 
 	// Ideally a dictionary would be used here...
 
-	internal static readonly Style s_styleName = new(decoration: Decoration.Italic);
+	internal static readonly Style Sty_Name = new(decoration: Decoration.Italic);
 
-	internal static readonly Style s_styleSim = new(Color.Wheat1, decoration: Decoration.None);
+	internal static readonly Style Sty_Sim = new(Color.Wheat1, decoration: Decoration.None);
 
-	internal static readonly Style s_styleUrl = new(Color.Cyan1, decoration: Decoration.None);
+	internal static readonly Style Sty_Url = new(Color.Cyan1, decoration: Decoration.None);
 
-	public static readonly Color Color1 = new(0x80, 0xFF, 0x80);
+	public static readonly Color Clr_Misc1 = new(0x80, 0xFF, 0x80);
 
-	internal static readonly Text EmptyText = new(string.Empty);
+	internal static readonly Text Txt_Empty = new(string.Empty);
 
 	internal const string STR_DEFAULT = "-";
 
 	static CliFormat() { }
 
 	internal static readonly IReadOnlyDictionary<SearchEngineOptions, Color> EngineColors =
-		new Dictionary<SearchEngineOptions, Color>()
+		new Dictionary<SearchEngineOptions, Color>
 		{
 			{ SearchEngineOptions.SauceNao, Color.Green },
 			{ SearchEngineOptions.EHentai, Color.Purple },
@@ -43,4 +42,24 @@ static CliFormat() { }
 
 	internal static readonly Capabilities ProfileCapabilities = AConsole.Profile.Capabilities;
 
+	internal static readonly bool IsLinux   = OperatingSystem.IsLinux();
+	internal static readonly bool IsWindows = OperatingSystem.IsWindows();
+	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}");
+
+		grd.AddRow("Terminal ANSI", $"{ProfileCapabilities.Ansi}");
+		grd.AddRow("Terminal colors", $"{ProfileCapabilities.ColorSystem}");
+		grd.AddRow("Terminal links", $"{ProfileCapabilities.Links}");
+		grd.AddRow("Terminal Unicode", $"{ProfileCapabilities.Unicode}");
+
+		return grd;
+	}
+
 }

SmartImage.Rdx/Cli/CliFormat.cs

@@ -4,8 +4,8 @@
 using Flurl;
 using Kantan.Utilities;
 using SmartImage.Lib.Engines;
-using SmartImage.Lib.Results;
 using Spectre.Console;
+using Spectre.Console.Cli;
 using Spectre.Console.Rendering;
 
 // $User.Name $File.ProjectName $File.FileName
@@ -14,7 +14,7 @@
 namespace SmartImage.Rdx.Cli;
 
 [Flags]
-internal enum ResultTableFormat
+internal enum ResultShellFormat
 {
 
 	None = 0,
@@ -31,14 +31,7 @@ internal enum ResultFileFormat
 {
 
 	None = 0,
-	Csv,
-
-}
-
-public abstract class Formatter
-{
-
-	public abstract IRenderable Format(SearchResult s);
+	Delimited,
 
 }
 
@@ -60,7 +53,28 @@ public static FigletFont LoadFigletFontFromResource(string name, out MemoryStrea
 		return ff;
 	}
 
-	public static Table GetTableForFormat(ResultTableFormat format)
+	public static void Dump(CommandSettings settings)
+	{
+		var table = new Table().RoundedBorder();
+		table.AddColumn("[grey]Name[/]");
+		table.AddColumn("[grey]Value[/]");
+
+		var properties = settings.GetType().GetProperties();
+
+		foreach (var property in properties) {
+			var value = property.GetValue(settings)
+				?.ToString()
+				?.Replace("[", "[[");
+
+			table.AddRow(
+				property.Name,
+				value ?? "[grey]null[/]");
+		}
+
+		AnsiConsole.Write(table);
+	}
+
+	public static Table GetTableForFormat(ResultShellFormat format)
 	{
 
 		var fmt   = format.GetSetFlags(true, true);
@@ -103,7 +117,7 @@ public static STable DTableToSTable(DTable dt)
 					}
 
 					if (x == null) {
-						return EmptyText;
+						return Txt_Empty;
 					}
 
 					return new Text(x.ToString());
@@ -115,4 +129,22 @@ public static STable DTableToSTable(DTable dt)
 		return t;
 	}
 
+	internal static string? GetOS()
+	{
+		string? os = null;
+
+		if (IsLinux) {
+			os = "Linux";
+
+		}
+		else if (IsWindows) {
+			os = "Windows";
+		}
+		else if (IsMacOs) {
+			os = "Mac";
+		}
+
+		return os;
+	}
+
 }

SmartImage.Rdx/Program.cs

@@ -24,10 +24,6 @@ namespace SmartImage.Rdx;
 public static class Program
 {
 
-	internal static readonly bool IsLinux   = OperatingSystem.IsLinux();
-	internal static readonly bool IsWindows = OperatingSystem.IsWindows();
-	internal static readonly bool IsMacOs   = OperatingSystem.IsMacOS();
-
 	public static async Task<int> Main(string[] args)
 	{
 		Debug.WriteLine(AConsole.Profile.Height);
@@ -39,63 +35,34 @@ public static async Task<int> Main(string[] args)
 
 		var fg = new FigletText(ff, R1.Name)
 			.LeftJustified()
-			.Color(CliFormat.Color1);
+			.Color(CliFormat.Clr_Misc1);
 
 		AConsole.Write(fg);
 
 #if DEBUG
 		AConsole.WriteLine(args.QuickJoin());
 
 #endif
-		string? os = null;
-
-		if (IsLinux) {
-			os = "Linux";
-
-		}
-		else if (IsWindows) {
-			os = "Windows";
-		}
-		else if (IsMacOs) {
-			os = "Mac";
-		}
-
-		var grd = new Grid();
-		grd.AddColumns(2);
 
-		grd.AddRow("OS", $"{os} / {Environment.OSVersion}");
-		grd.AddRow("Runtime", $"{Environment.Version}");
-
-		grd.AddRow("Terminal ANSI", $"{CliFormat.ProfileCapabilities.Ansi}");
-		grd.AddRow("Terminal colors", $"{CliFormat.ProfileCapabilities.ColorSystem}");
-		grd.AddRow("Terminal links", $"{CliFormat.ProfileCapabilities.Links}");
-		grd.AddRow("Terminal Unicode", $"{CliFormat.ProfileCapabilities.Unicode}");
-
-		var env = Environment.GetEnvironmentVariables(EnvironmentVariableTarget.Process);
+		Grid grd = CliFormat.CreateInfoGrid();
 
 		AConsole.Write(grd);
 
+		// var env = Environment.GetEnvironmentVariables(EnvironmentVariableTarget.Process);
+
 		var app = new CommandApp<SearchCommand>();
 
 		app.Configure(c =>
 		{
 			c.PropagateExceptions();
 			c.SetHelpProvider(new HelpProvider(c.Settings));
-
+			
 			//...
 		});
 
 		try {
-		res:
 			var x = await app.RunAsync(args);
 
-			switch ((Act) x) {
-				case Act.Restart:
-					goto res;
-
-					break;
-			}
-
 			return x;
 		}
 		catch (Exception e) {

SmartImage.Rdx/Properties/launchSettings.json

@@ -31,7 +31,7 @@
     },
     "Profile 4b": {
       "commandName": "Project",
-      "commandLineArgs": "\"C:\\Users\\Deci\\Pictures\\Epic anime\\__re_l_mayer_ergo_proxy_drawn_by_comin__e152c5c48b0058a3374542def4f59c3a.jpg\" -f \"Csv\" -o \"output.csv\" -r \"None\""
+      "commandLineArgs": "\"C:\\Users\\Deci\\Pictures\\Epic anime\\__re_l_mayer_ergo_proxy_drawn_by_comin__e152c5c48b0058a3374542def4f59c3a.jpg\" -f \"Delimited\" -o \"output.csv\" -r \"None\""
     },
     "Profile 5": {
       "commandName": "Project",
@@ -40,6 +40,10 @@
     "Profile 6": {
       "commandName": "Project",
       "commandLineArgs": "\"C:\\Users\\Deci\\Pictures\\Epic anime\\__re_l_mayer_ergo_proxy_drawn_by_comin__e152c5c48b0058a3374542def4f59c3a.jpg\" -r \"None\" -f \"Csv\" -o \"output.csv\""
+    },
+    "Profile 4c": {
+      "commandName": "Project",
+      "commandLineArgs": "\"C:\\Users\\Deci\\Pictures\\Epic anime\\__re_l_mayer_ergo_proxy_drawn_by_comin__e152c5c48b0058a3374542def4f59c3a.jpg\" -d \"    \" -o \"output.txt\" -r \"None\""
     }
   }
 }