Update Kantan usage for refactor

Author: Decimation

SmartImage.Lib/Engines/Impl/IqdbEngine.cs

@@ -65,7 +65,7 @@ private static ImageResult ParseResult(IHtmlCollection<IElement> tr)
 			if (tr.Length >= 4) {
 				var res = tr[3];
 
-				string[] wh = res.TextContent.Split(StringConstants.MUL_SIGN);
+				string[] wh = res.TextContent.Split(Strings.Constants.MUL_SIGN);
 
 				string wStr = wh[0].SelectOnlyDigits();
 				w = Int32.Parse(wStr);

SmartImage.Lib/Engines/Impl/SauceNaoEngine.cs

@@ -318,11 +318,11 @@ private static ImageResult ConvertToImageResult(SauceNaoDataResult sn)
 			{
 				Url         = String.IsNullOrWhiteSpace(url) ? default : new Uri(url),
 				Similarity  = MathF.Round(sn.Similarity, 2),
-				Description = Strings.NullIfNullOrWhiteSpace(sn.WebsiteTitle),
-				Artist      = Strings.NullIfNullOrWhiteSpace(sn.Creator),
-				Source      = Strings.NullIfNullOrWhiteSpace(sn.Material),
-				Characters  = Strings.NullIfNullOrWhiteSpace(sn.Character),
-				Site        = Strings.NullIfNullOrWhiteSpace(siteName)
+				Description = Strings.NormalizeNull(sn.WebsiteTitle),
+				Artist      = Strings.NormalizeNull(sn.Creator),
+				Source      = Strings.NormalizeNull(sn.Material),
+				Characters  = Strings.NormalizeNull(sn.Character),
+				Site        = Strings.NormalizeNull(siteName)
 			};
 
 			return imageResult;

SmartImage.Lib/Engines/Impl/YandexEngine.cs

@@ -92,7 +92,7 @@ static ImageResult Parse(INode siz)
 
 		private static (int? w, int? h) ParseResolution(string resText)
 		{
-			string[] resFull = resText.Split(StringConstants.MUL_SIGN);
+			string[] resFull = resText.Split(Strings.Constants.MUL_SIGN);
 
 			int? w = null, h = null;
 

SmartImage/Core/AppInfo.cs

@@ -126,7 +126,7 @@ public static void Setup()
 				/*Console.WriteLine("Non-Romance language detected!");
 				Console.WriteLine("If English is not the main IME, things may not work properly!");
 
-				NConsole.WaitForInput();*/
+				ConsoleManager.WaitForInput();*/
 
 				Trace.WriteLine($"Languages: {languages.QuickJoin()}");
 			}

SmartImage/Core/AppIntegration.cs

@@ -58,7 +58,7 @@ public static bool HandleContextMenu(bool option)
 					}
 					catch (Exception ex) {
 						Trace.WriteLine($"{ex.Message}");
-						NConsole.WaitForInput();
+						ConsoleManager.WaitForInput();
 						return false;
 					}
 					finally {

SmartImage/Program.cs

@@ -31,8 +31,10 @@
 using Windows.Networking.Connectivity;
 using Windows.UI.Notifications;
 using Kantan.Cli;
+using Kantan.Cli.Controls;
 using Kantan.Diagnostics;
 using Kantan.Net;
+using Kantan.Text;
 using Kantan.Utilities;
 using Microsoft.Toolkit.Uwp.Notifications;
 using Novus.Win32;
@@ -78,9 +80,9 @@ public static class Program
 		/// <summary>
 		/// Console UI for search results
 		/// </summary>
-		private static readonly NConsoleDialog ResultDialog = new()
+		private static readonly ConsoleDialog ResultDialog = new()
 		{
-			Options = new List<NConsoleOption>(),
+			Options = new List<ConsoleOption>(),
 
 			Description = "Press the result number to open in browser\n" +
 			              "Ctrl: Load direct | Alt: Show other | Shift: Open raw | Alt+Ctrl: Download\n" +
@@ -103,13 +105,13 @@ public static class Program
 
 					ResultDialog.Options.Add(_orig);
 
-					foreach (NConsoleOption option in buffer.Select(NConsoleFactory.CreateResultOption)) {
+					foreach (ConsoleOption option in buffer.Select(NConsoleFactory.CreateResultOption)) {
 						ResultDialog.Options.Add(option);
 					}
 
 					_isFilteredShown = !_isFilteredShown;
 
-					NConsole.Refresh();
+					ConsoleManager.Refresh();
 				},
 				[ConsoleKey.F2] = async () =>
 				{
@@ -123,11 +125,11 @@ public static class Program
 						await Client.RefineSearchAsync();
 					}
 					catch (Exception e) {
-						Console.WriteLine("Error: {0}",e.Message);
-						NConsole.WaitForSecond();
+						Console.WriteLine("Error: {0}", e.Message);
+						ConsoleManager.WaitForSecond();
 					}
 
-					NConsole.Refresh();
+					ConsoleManager.Refresh();
 				},
 			}
 		};
@@ -147,15 +149,14 @@ private static async Task Main(string[] args)
 
 			ToastNotificationManagerCompat.OnActivated += AppInterface.OnToastActivated;
 
-			//...
-			Native.SetConsoleOutputCP(Native.CP_IBM437);
-
+			Console.OutputEncoding = Encoding.Unicode;
+			
 			Console.Title = $"{AppInfo.NAME}";
 
 			//120,30
 			//Console.WindowHeight = 60;
 
-			NConsole.Init();
+			ConsoleManager.Init();
 			Console.Clear();
 
 			Console.CancelKeyPress += (sender, eventArgs) => { };
@@ -200,7 +201,7 @@ private static async Task Main(string[] args)
 				}
 			};
 
-			NConsoleProgress.Queue(_cancellationToken);
+			ConsoleProgressIndicator.Queue(_cancellationToken);
 
 			// Show results
 			var searchTask = Client.RunSearchAsync();
@@ -211,7 +212,6 @@ private static async Task Main(string[] args)
 			// Add original image
 			ResultDialog.Options.Add(_orig);
 
-
 			await ResultDialog.ReadAsync();
 
 			await searchTask;
@@ -227,14 +227,17 @@ private static async Task<bool> HandleArguments()
 			if (!args.Any()) {
 				var options = await AppInterface.MainMenuDialog.ReadAsync();
 
-				if (!options.Any()) {
-					return false;
-				}
+				var file = options.DragAndDrop;
 
-				if (options.First() is string file) {
+				if (file != null) {
 					Debug.WriteLine($"Drag and drop: {file}");
 					Console.WriteLine($">> {file}".AddColor(AppInterface.Elements.ColorMain));
 					Config.Query = file;
+					return true;
+				}
+
+				if (!options.Output.Any()) {
+					return false;
 				}
 			}
 			else {
@@ -264,7 +267,7 @@ private static async Task<bool> HandleArguments()
 
 		private static bool _isFilteredShown;
 
-		private static NConsoleOption _orig;
+		private static ConsoleOption _orig;
 
 		#region Event handlers
 
@@ -278,7 +281,7 @@ private static void OnSearchCompleted(object sender, SearchCompletedEventArgs ev
 			cts.Dispose();
 
 			SystemSounds.Exclamation.Play();
-			NConsole.Refresh();
+			ConsoleManager.Refresh();
 
 			if (Config.PriorityEngines == SearchEngineOptions.Auto) {
 				var m = Client.Results.OrderByDescending(x => x.PrimaryResult.Similarity);

SmartImage/UI/AppInterface.Elements.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Text;
 using JetBrains.Annotations;
 using Kantan.Text;
 using Kantan.Utilities;
+using Novus.Win32;
 using SmartImage.Lib.Engines;
 
 namespace SmartImage.UI
@@ -33,16 +35,26 @@ internal static class Elements
 				{ SearchEngineOptions.TinEye, Color.CornflowerBlue },
 			};
 
-			private static readonly string Enabled = StringConstants.CHECK_MARK.ToString().AddColor(ColorYes);
+			/*
+			 * Note: Weird encoding nuance
+			 */
 
-			private static readonly string Disabled = StringConstants.MUL_SIGN.ToString().AddColor(ColorNo);
+
+			private static readonly Encoding CodePage437 = CodePagesEncodingProvider.Instance.GetEncoding(Native.CP_IBM437);
+
+			internal static readonly string CheckMark =
+				Strings.EncodingConvert(Encoding.Unicode, CodePage437, Strings.Constants.CHECK_MARK.ToString());
+
+			private static readonly string Enabled = CheckMark.AddColor(ColorYes);
+
+			private static readonly string Disabled = Strings.Constants.MUL_SIGN.ToString().AddColor(ColorNo);
 
 			[UsedImplicitly]
 			internal static string GetName(string s, bool added) => $"{s} ({(ToToggleString(added))})";
 
-			public const string ARG_KEY_ACTION = "action";
+			internal const string ARG_KEY_ACTION = "action";
 
-			public const string ARG_VALUE_DISMISS = "dismiss";
+			internal const string ARG_VALUE_DISMISS = "dismiss";
 
 			internal static string ToToggleString(bool b) => b ? Enabled : Disabled;
 

SmartImage/UI/AppInterface.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using System.Linq;
 using Kantan.Cli;
+using Kantan.Cli.Controls;
 using Kantan.Net;
 using Kantan.Text;
 using Kantan.Utilities;
@@ -35,15 +36,15 @@ namespace SmartImage.UI
 	/// </summary>
 	internal static partial class AppInterface
 	{
-		internal static readonly NConsoleOption[] MainMenuOptions =
+		internal static readonly ConsoleOption[] MainMenuOptions =
 		{
 			new()
 			{
 				Name  = ">>> Run <<<",
 				Color = Elements.ColorMain,
 				Function = () =>
 				{
-					ImageQuery query = NConsole.ReadLine("Image file or direct URL", x =>
+					ImageQuery query = ConsoleManager.ReadLine("Image file or direct URL", x =>
 					{
 						x = x.CleanString();
 
@@ -63,8 +64,7 @@ internal static partial class AppInterface
 			CreateConfigOption(nameof(Config.NotificationImage), "Notification image", 5),
 
 			CreateConfigOption(propertyof(() => AppIntegration.IsContextMenuAdded), "Context menu", 6,
-			                   added => AppIntegration.HandleContextMenu(
-				                   added ? false : true)),
+			                   added => AppIntegration.HandleContextMenu(!added)),
 
 			new()
 			{
@@ -74,7 +74,7 @@ internal static partial class AppInterface
 					//Console.Clear();
 
 					Console.WriteLine(Config);
-					NConsole.WaitForInput();
+					ConsoleManager.WaitForInput();
 
 					return null;
 				}
@@ -99,22 +99,22 @@ internal static partial class AppInterface
 					Console.WriteLine($"In path: {AppInfo.IsAppFolderInPath}");
 
 					Console.WriteLine();
-					Console.WriteLine(StringConstants.Separator);
+					Console.WriteLine(Strings.Constants.Separator);
 
 					foreach (var utility in ImageHelper.UtilitiesMap) {
 						Console.WriteLine(utility);
 					}
 
 					Console.WriteLine();
-					Console.WriteLine(StringConstants.Separator);
+					Console.WriteLine(Strings.Constants.Separator);
 
 					var dependencies = ReflectionHelper.DumpDependencies();
 
 					foreach (var name in dependencies) {
 						Console.WriteLine($"{name.Name} ({name.Version})");
 					}
 
-					NConsole.WaitForInput();
+					ConsoleManager.WaitForInput();
 
 					return null;
 				}
@@ -153,7 +153,7 @@ internal static partial class AppInterface
 
 		};
 
-		internal static readonly NConsoleDialog MainMenuDialog = new()
+		internal static readonly ConsoleDialog MainMenuDialog = new()
 		{
 			Options   = MainMenuOptions,
 			Header    = AppInfo.NAME_BANNER,