1.9.2

Author: Decimation

SmartImage/Commands.cs

@@ -181,12 +181,16 @@ public static void ShowInfo()
 			CliOutput.WriteInfo("Author: {0}", RuntimeInfo.Author);
 		}
 
+		private const char CLI_CHAR = '*';
+
 		/// <summary>
 		/// Handles user input 
 		/// </summary>
 		/// <param name="rg"><see cref="ConsoleOption"/></param>
 		public static void HandleConsoleOptions(ConsoleOption[] rg)
 		{
+			
+
 			ConsoleKeyInfo cki;
 
 			do {
@@ -207,7 +211,10 @@ public static void HandleConsoleOptions(ConsoleOption[] rg)
 						sb.AppendLine();
 					}
 
-					Console.Write(sb);
+					var s = CliOutput.Prepare(CLI_CHAR,sb.ToString());
+					Console.Write(s);
+
+					//CliOutput.WriteInfo(sb);
 				}
 
 				Console.WriteLine();

SmartImage/Program.cs

@@ -80,6 +80,7 @@ private static void Main(string[] args)
 		{
 			Console.Title = RuntimeInfo.NAME;
 			Console.SetWindowSize(Console.WindowWidth, Console.WindowHeight + 5);
+			Console.Clear();
 
 			RuntimeInfo.Setup();
 			SearchConfig.ReadSearchConfigArgs(args);

SmartImage/Searching/Search.cs

@@ -5,7 +5,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
+using System.Text;
 using SimpleCore.Utilities;
 using SmartImage.Engines;
 using SmartImage.Engines.Imgur;
@@ -54,7 +54,7 @@ private static ISearchEngine[] GetAvailableEngines()
 
 
 				new KarmaDecay(),
-				new TraceMoe(),
+				new TraceMoe()
 			};
 
 			engines.AddRange(others);
@@ -68,7 +68,7 @@ public static bool RunSearch(string img, ref SearchResult[] res)
 			 * Run 
              */
 
-			var auth = SearchConfig.Config.ImgurAuth;
+			string auth = SearchConfig.Config.ImgurAuth;
 			bool useImgur = !String.IsNullOrWhiteSpace(auth);
 
 			var engines = SearchConfig.Config.Engines;
@@ -137,23 +137,38 @@ private static bool StartSearches(string imgUrl, SearchEngines engines, ref Sear
 					Console.Write(wait);
 				});
 
+				var sw = Stopwatch.StartNew();
 
 				// Run search
 				var result = currentEngine.GetResult(imgUrl);
 
+				sw.Stop();
+
 				if (result != null) {
 					string url = result.Url;
 
+					var sb = new StringBuilder();
+					double t = sw.Elapsed.TotalSeconds;
+					double t2 = Math.Round(t, 3);
+					sb.AppendFormat("{0}: Done ({1:F3} sec)\n", result.Name, t2);
+
+
+					//todo
+
+					bool ok = url != null;
+
+					string sz = sb.ToString();
+
 
-					if (url != null) {
-						CliOutput.OnCurrentLine(ConsoleColor.Green, "{0}: Done\n", result.Name);
+					if (ok) {
+						CliOutput.OnCurrentLine(ConsoleColor.Green, sz);
 
 						if (SearchConfig.Config.PriorityEngines.HasFlag(currentEngine.Engine)) {
 							WebAgent.OpenUrl(result.Url);
 						}
 					}
 					else {
-						CliOutput.OnCurrentLine(ConsoleColor.Yellow, "{0}: Done (url is null!)\n", result.Name);
+						CliOutput.OnCurrentLine(ConsoleColor.Yellow, sz);
 					}
 
 					res[i] = result;

SmartImage/SmartImage.csproj

@@ -31,7 +31,7 @@
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="RestSharp" Version="106.11.4" />
-    <PackageReference Include="SimpleCore" Version="1.0.9" />
+    <PackageReference Include="SimpleCore" Version="1.1.2" />
     <PackageReference Include="System.Json" Version="4.7.1" />
 
 
@@ -43,7 +43,7 @@
 
   <PropertyGroup>
     <PackageId>SmartImage</PackageId>
-    <Version>1.9.1</Version>
+    <Version>1.9.2</Version>
     <Authors>Read Stanton (Decimation)</Authors>
     <PackageTags>Image reverse search identification source sauce</PackageTags>
     <RepositoryUrl>https://github.com/Decimation/SmartImage</RepositoryUrl>

SmartImage/Utilities.cs

@@ -9,18 +9,54 @@ namespace SmartImage
 {
 	public static class Utilities
 	{
+		public static string Prettify(string s)
+		{
+			char c = '*';
+			var ELLIPSES = "...";
+			int lim = Console.BufferWidth - (10 + ELLIPSES.Length);
+
+			var srg = s.Split('\n');
+
+			for (int i = 0; i < srg.Length; i++) {
+				var y = " " + srg[i];
+
+				string x;
+
+
+				if (string.IsNullOrWhiteSpace(y)) {
+					x = string.Empty;
+				}
+				else {
+					x = c + y;
+				}
+
+				var x2 = x.Truncate(lim);
+
+				if (x2.Length < x.Length) {
+					x2 += ELLIPSES;
+				}
+
+
+				srg[i] = x2;
+
+
+			}
+
+			var s2 = string.Join('\n', srg);
+
+			return s2;
+		}
+
 		public static T Read<T>(string rawValue)
 		{
-			if (typeof(T).IsEnum)
-			{
-				Enum.TryParse(typeof(T), (string)rawValue, out var e);
-				return (T)e;
+			if (typeof(T).IsEnum) {
+				Enum.TryParse(typeof(T), (string) rawValue, out var e);
+				return (T) e;
 			}
 
-			if (typeof(T) == typeof(bool))
-			{
+			if (typeof(T) == typeof(bool)) {
 				Boolean.TryParse(rawValue, out var b);
-				return (T)(object)b;
+				return (T) (object) b;
 			}
 
 			return (T) (object) rawValue;
@@ -33,4 +69,4 @@ internal static string CleanString(String s)
 			return s;
 		}
 	}
-}
+}