...

Author: Decimation

SmartImage 3/App/Integration.cs

@@ -84,13 +84,13 @@ public static bool HandleContextMenu(bool option)
 
 					try {
 						regMenu = Registry.CurrentUser.CreateSubKey(R1.Reg_Shell);
-						regMenu?.SetValue(String.Empty, Resources.Name);
+						regMenu?.SetValue(String.Empty, R2.Name);
 						regMenu?.SetValue("Icon", $"\"{fullPath}\"");
 
 						regCmd = Registry.CurrentUser.CreateSubKey(R1.Reg_Shell_Cmd);
 
 						regCmd?.SetValue(String.Empty,
-						                 $"\"{fullPath}\" {Resources.Arg_Input} \"%1\" {R2.Arg_AutoSearch}");
+						                 $"\"{fullPath}\" {R2.Arg_Input} \"%1\" {R2.Arg_AutoSearch}");
 					}
 					catch (Exception ex) {
 						Trace.WriteLine($"{ex.Message}");

SmartImage 3/Mode/CliMode.cs

@@ -19,26 +19,11 @@ public sealed class CliMode : IDisposable, IMode
 {
 	#region
 
-	private const double COMPLETE = 100.0D;
-
-	private static readonly ProgressColumn[] PrgCol_1 =
+	static CliMode()
 	{
-		new TaskDescriptionColumn()
-		{
-			Alignment = Justify.Left
-		},
-		new SpinnerColumn(),
-		new ElapsedTimeColumn(),
-		new ProgressBarColumn()
-	};
+		Debug.WriteLine($"{AConsole.Profile.Capabilities.Unicode} {AConsole.Profile.Capabilities.Links}");
 
-	private static readonly Progress Prg_1 = AnsiConsole.Progress()
-		.AutoClear(true)
-		.AutoRefresh(true)
-		.HideCompleted(true)
-		.Columns(PrgCol_1);
-
-	static CliMode() { }
+	}
 
 	#endregion
 
@@ -54,6 +39,7 @@ static CliMode() { }
 
 	private readonly CancellationTokenSource m_cts;
 
+	public SearchConfig Config => m_cfg;
 	public CliMode()
 	{
 		m_cfg    = new SearchConfig();
@@ -66,31 +52,33 @@ public CliMode()
 	{
 
 		// await Prg_1.StartAsync(ctx => ValidateInputAsync(ctx, c as string));
-		await ValidateInputAsync(null, c as string);
-		AnsiConsole.WriteLine($"{m_query}");
+		await ValidateInputAsync((c as string)!);
+		AConsole.WriteLine($"{m_query}");
 
 		// var url = await Prg_1.StartAsync(UploadInputAsync);
 
-		var url = await UploadInputAsync(null);
-		AnsiConsole.MarkupLine($"[green]{m_query.Upload}[/]");
+		var url = await UploadInputAsync();
 
-		AnsiConsole.WriteLine($"{m_cfg}");
+		AConsole.MarkupLine($"[green]{m_query.Upload}[/]");
 
-		Console.CancelKeyPress += (sender, args) =>
+		AConsole.WriteLine($"{m_cfg}");
+
+		SConsole.CancelKeyPress += (sender, args) =>
 		{
 			args.Cancel = false;
 			m_cts.Cancel();
-			AnsiConsole.MarkupLine($"[red]Cancellation requested {args}[/]");
+			AConsole.MarkupLine($"[red]Cancellation requested {args}[/]");
 		};
 
 		// await Prg_1.StartAsync(RunSearchAsync);
 
-		await RunSearchAsync(null);
+		await RunSearchAsync();
+
 		return null;
 
 	}
 
-	private async Task ValidateInputAsync(ProgressContext ctx, string c)
+	private async Task ValidateInputAsync(string c)
 	{
 		// var t = ctx.AddTask("Validating input");
 		// t.IsIndeterminate = true;
@@ -100,7 +88,7 @@ private async Task ValidateInputAsync(ProgressContext ctx, string c)
 		// t.Increment(COMPLETE);
 	}
 
-	private async Task<Url> UploadInputAsync(ProgressContext p)
+	private async Task<Url> UploadInputAsync()
 	{
 		// var pt = p.AddTask($"Upload");
 		// pt.IsIndeterminate = true;
@@ -110,7 +98,7 @@ private async Task<Url> UploadInputAsync(ProgressContext p)
 
 	}
 
-	private async Task RunSearchAsync(ProgressContext ctx)
+	private async Task RunSearchAsync()
 	{
 		/*var ptMap = new Dictionary<BaseSearchEngine, (ProgressTask, Table)>();
 
@@ -170,19 +158,21 @@ void OnResult(object sender, SearchResult sr)
 		while (!pt1.IsFinished) { }*/
 		var sw = Stopwatch.StartNew();
 
-		var sp = AnsiConsole.Status().Spinner(Spinner.Known.Aesthetic).StartAsync("Wait...", async ctx =>
-		{
-			// await ttt;
+		var sp = AConsole.Status()
+			.Spinner(Spinner.Known.Aesthetic)
+			.StartAsync("Wait...", async ctx =>
+			{
+				// await ttt;
 
-			while (!ttt.IsCompleted) {
-				ctx.Refresh();
-				await Task.Delay(TimeSpan.FromMilliseconds(300));
+				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}";
-			}
-			// m_results2 = await ttt;
-		});
+					ctx.Status =
+						$"{m_results.Count} | {m_results.Sum(c => c.Results.Count)} | {sw.Elapsed.TotalSeconds:3F}";
+				}
+				// m_results2 = await ttt;
+			});
 
 		await ttt;
 
@@ -204,7 +194,7 @@ void OnResult(object sender, SearchResult sr)
 
 		foreach (var vt in ptMap.Values) {
 			// vt.Item1.StopTask();
-			AnsiConsole.Write(vt.Item2);
+			AConsole.Write(vt.Item2);
 		}
 
 	}

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

@@ -157,7 +157,7 @@ private static void Clear_Clicked()
 	private void Cancel_Clicked()
 	{
 		m_token.Cancel();
-		Lbl_Status2.Text = Resources.Inf_Cancel;
+		Lbl_Status2.Text = R2.Inf_Cancel;
 		Lbl_Status2.SetNeedsDisplay();
 		Btn_Restart.Enabled = true;
 		Application.MainLoop.RemoveIdle(m_runIdleTok);

SmartImage 3/Mode/Shell/ShellMode.cs

@@ -36,7 +36,7 @@ public sealed partial class ShellMode : IDisposable, IMode
 
 	private static readonly Toplevel Top = Application.Top;
 
-	private static readonly Window Win = new(Resources.Name)
+	private static readonly Window Win = new(R2.Name)
 	{
 		X           = 0,
 		Y           = 1,
@@ -307,7 +307,7 @@ public ShellMode(string[] args)
 		{
 			new("Engine", typeof(string)),
 
-			new(nameof(SearchResultItem.Url), typeof(Flurl.Url)),
+			new(nameof(SearchResultItem.Url), typeof(Url)),
 			new(nameof(SearchResultItem.Score), typeof(int)),
 			new(nameof(SearchResultItem.Similarity), typeof(double)),
 			new(nameof(SearchResultItem.Artist), typeof(string)),

SmartImage 3/Program.cs

@@ -1,10 +1,12 @@
 #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;
+using System.Text;
 using Kantan.Threading;
 // using Windows.UI.Notifications;
 // using CommunityToolkit.WinUI.Notifications;
@@ -37,18 +39,20 @@ public static class Program
 	public static void Init()
 	{
 		Global.Setup();
-		Trace.WriteLine("Init", Resources.Name);
+		Trace.WriteLine("Init", R2.Name);
 		// Gui.Init();
 		System.Console.Title = R2.Name;
 
 		if (Compat.IsWin) {
 			ConsoleUtil.SetConsoleMode();
+			System.Console.OutputEncoding = Encoding.Unicode;
 		}
 
 		AppDomain.CurrentDomain.ProcessExit += (sender, args) =>
 		{
 			Trace.WriteLine($"Exiting", R2.Name);
 		};
+
 	}
 
 	public static async Task<int> Main(string[] args)
@@ -64,7 +68,7 @@ public static async Task<int> Main(string[] args)
 		// ReSharper disable once ConditionIsAlwaysTrueOrFalse
 
 		Debug.WriteLine($"TEST");
-		
+
 		/*
 		 * & .\bin\Test\net7.0\win10-x64\SmartImage.exe --noui --i C:\Users\Deci\Pictures\lilith___the_maid_i_hired_recently_is_mysterious_by_sciamano240_dfnpdmn.png
 		 *
@@ -74,7 +78,7 @@ public static async Task<int> Main(string[] args)
 
 		bool cli = args is { } && args.Any();
 
-		if (cli && args.Contains(Resources.Arg_NoUI)) {
+		if (cli && args.Contains(R2.Arg_NoUI)) {
 
 			var main = new CliMode();
 
@@ -83,14 +87,15 @@ public static async Task<int> Main(string[] args)
 
 			var options = new Option[]
 			{
-				new Option<string>(Resources.Arg_Input)
+				new Option<string>(R2.Arg_Input)
 					{ },
 
-				new Option<bool>(Resources.Arg_NoUI)
+				new Option<bool>(R2.Arg_NoUI)
 				{
 					Arity = ArgumentArity.Zero,
 
-				}
+				},
+				
 			};
 
 			foreach (Option option in options) {

SmartImage 3/SmartImage.csproj

@@ -64,6 +64,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />

SmartImage.Lib 3/Engines/ILoginEngine.cs

@@ -11,6 +11,6 @@ public interface ILoginEngine
 
     public Task<bool> LoginAsync();
 
-    public bool IsLoggedIn { get; }
+    public bool     IsLoggedIn { get; }
 
 }

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

@@ -55,7 +55,7 @@ public sealed class EHentaiEngine : WebSearchEngine, ILoginEngine, IConfig,
 
 	public override SearchEngineOptions EngineOption => SearchEngineOptions.EHentai;
 
-	protected override string NodesSelector => "//table/tbody/tr";
+	protected override string NodesSelector => Serialization.S_EHentai;
 
 	static EHentaiEngine() { }
 
@@ -188,15 +188,15 @@ protected override async Task<IDocument> GetDocumentAsync(object origin, SearchQ
 		return await parser.ParseDocumentAsync(content);
 	}
 
-	private async Task<IFlurlResponse> GetSessionAsync()
+	private Task<IFlurlResponse> GetSessionAsync()
 	{
-		return await ExHentaiBase.WithCookies(Cookies)
-			       .WithHeaders(new
-			       {
-				       User_Agent = HttpUtilities.UserAgent
-			       })
-			       .WithAutoRedirect(true)
-			       .GetAsync();
+		return ExHentaiBase.WithCookies(Cookies)
+			.WithHeaders(new
+			{
+				User_Agent = HttpUtilities.UserAgent
+			})
+			.WithAutoRedirect(true)
+			.GetAsync();
 	}
 
 	protected override ValueTask<INode[]> GetNodes(IDocument d)

SmartImage.Lib 3/SearchClient.cs

@@ -1,4 +1,5 @@
 global using ICBN = JetBrains.Annotations.ItemCanBeNullAttribute;
+using System.Collections;
 using System.Diagnostics;
 using System.Text.Json;
 using Flurl.Http;
@@ -56,7 +57,7 @@ static SearchClient()
 
 		var handler = new LoggingHttpMessageHandler(Logger)
 		{
-			InnerHandler = new HttpClientLoggingHandler(Logger)
+			InnerHandler = new HttpLoggingHandler(Logger)
 			{
 				InnerHandler = new HttpClientHandler()
 			}
@@ -193,6 +194,50 @@ public async ValueTask ApplyConfigAsync()
 	[CBN]
 	public BaseSearchEngine TryGetEngine(SearchEngineOptions o) => Engines.FirstOrDefault(e => e.EngineOption == o);
 
+	public class SearchResultItemCollection : ICollection<SearchResultItem>
+	{
+		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);
+		}
+
+		public void CopyTo(SearchResultItem[] array, int arrayIndex)
+		{
+			m_value.CopyTo(array, arrayIndex);
+		}
+
+		public bool Remove(SearchResultItem item)
+		{
+			return m_value.Remove(item);
+		}
+
+		public int Count => m_value.Count;
+
+		public bool IsReadOnly => m_value.IsReadOnly;
+	}
+
 	public static IReadOnlyList<SearchResultItem> Optimize(IEnumerable<SearchResultItem> sri)
 	{
 		var items = sri.Where(r => SearchQuery.IsValidSourceType(r.Url))