Organization; cleanup; improvements

Decimation · Decimation · commit ec23b6075e58 · 2021-02-13T15:43:55.000-06:00
diff --git a/SmartImage/Configuration/ConfigComponentAttribute.cs b/SmartImage/Configuration/ConfigComponentAttribute.cs
@@ -1,12 +1,7 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
-using SmartImage.Core;
 
-namespace SmartImage.Utilities
+namespace SmartImage.Configuration
 {
 	/// <summary>
 	/// <seealso cref="SearchConfig"/>
diff --git a/SmartImage/Configuration/ConfigComponents.cs b/SmartImage/Configuration/ConfigComponents.cs
@@ -1,15 +1,12 @@
 ﻿using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using Novus.Utilities;
 using SimpleCore.Utilities;
-using SmartImage.Engines;
-using SmartImage.Utilities;
+
 #pragma warning disable CS8632
-namespace SmartImage.Core
+namespace SmartImage.Configuration
 {
 	/// <summary>
 	///     Utilities for <see cref="SearchConfig" />, <see cref="ConfigComponentAttribute" />
diff --git a/SmartImage/Configuration/SearchConfig.cs b/SmartImage/Configuration/SearchConfig.cs
@@ -1,17 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Text;
 using SimpleCore.Cli;
 using SimpleCore.Utilities;
+using SmartImage.Core;
 using SmartImage.Engines;
 using SmartImage.Engines.Imgur;
 using SmartImage.Engines.SauceNao;
 using SmartImage.Searching;
-using SmartImage.Utilities;
 using static SmartImage.Core.Interface;
 
 #pragma warning disable HAA0502, HAA0302, HAA0505, HAA0601, HAA0301, HAA0501, HAA0101, HAA0102, RCS1036
@@ -20,7 +19,7 @@
 
 // ReSharper disable IdentifierTypo
 
-namespace SmartImage.Core
+namespace SmartImage.Configuration
 {
 	/// <summary>
 	///     Search configuration and options
@@ -211,7 +210,7 @@ public override string ToString()
 			sb.AppendLabelWithColor(ColorConfig, "Image upload service", ColorMisc2,
 				imgurNull ? "ImgOps" : "Imgur").AppendLine();
 
-			var cfgDirectoryName = new FileInfo(ConfigLocation).Directory.Name;
+			string cfgDirectoryName = new FileInfo(ConfigLocation).Directory.Name;
 
 
 			sb.AppendLabelWithColor(ColorConfig, "Config location", ColorMisc2, cfgDirectoryName)
diff --git a/SmartImage/Core/Info.cs b/SmartImage/Core/Info.cs
@@ -11,6 +11,7 @@
 using Novus.Win32;
 using SimpleCore.Cli;
 using SimpleCore.Utilities;
+using SmartImage.Configuration;
 using SmartImage.Utilities;
 using static SmartImage.Core.Interface;
 
diff --git a/SmartImage/Core/Integration.cs b/SmartImage/Core/Integration.cs
@@ -5,6 +5,7 @@
 using Microsoft.Win32;
 using Novus.Win32;
 using SimpleCore.Cli;
+using SmartImage.Configuration;
 
 namespace SmartImage.Core
 {
diff --git a/SmartImage/Core/Interface.cs b/SmartImage/Core/Interface.cs
@@ -11,6 +11,7 @@
 using Novus.Win32;
 using SimpleCore.Cli;
 using SimpleCore.Net;
+using SmartImage.Configuration;
 using SmartImage.Searching;
 
 // ReSharper disable ArrangeAccessorOwnerBody
@@ -123,7 +124,7 @@ private static NConsoleOption[] AllOptions
 
 				img = img?.CleanString();
 
-				if (!Images.IsInputImageValid(img)) {
+				if (!ImageInputInfo.TryCreate(img, out _)) {
 
 					NConsole.WriteError($"Invalid image!");
 					NConsole.WaitForSecond();
@@ -367,7 +368,8 @@ private static string GetContextMenuString(bool added) =>
 			@"..\..\..\..\Test1.jpg",
 			@"..\..\..\..\Test2.jpg",
 			@"..\..\..\..\Test3.png",
-			"https://kemono.party/files/224580/46935364/beidou_800.jpg"
+			"https://kemono.party/files/224580/46935364/beidou_800.jpg",
+			"https://i.imgur.com/QtCausw.jpg"
 		};
 
 		private static readonly NConsoleOption DebugTestOption = new()
diff --git a/SmartImage/Engines/Imgur/ImgurClient.cs b/SmartImage/Engines/Imgur/ImgurClient.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using RestSharp;
 using RestSharp.Serialization.Json;
+using SmartImage.Configuration;
 using SmartImage.Core;
 
 // ReSharper disable UnusedMember.Local
diff --git a/SmartImage/Engines/SauceNao/SauceNaoEngine.cs b/SmartImage/Engines/SauceNao/SauceNaoEngine.cs
@@ -9,6 +9,7 @@
 using RestSharp;
 using SimpleCore.Net;
 using SimpleCore.Utilities;
+using SmartImage.Configuration;
 using SmartImage.Core;
 using SmartImage.Searching;
 using JsonArray = System.Json.JsonArray;
diff --git a/SmartImage/Engines/TraceMoe/TraceMoeEngine.cs b/SmartImage/Engines/TraceMoe/TraceMoeEngine.cs
@@ -99,7 +99,7 @@ public override FullSearchResult GetResult(string url)
 			else {
 				r = base.GetResult(url);
 
-				r.Metadata.Add("API", $"Returned null (possible timeout) [{code} {res} {msg}]");
+				r.Metadata.Add("API", $"Error ({code})");
 			}
 
 
diff --git a/SmartImage/Program.cs b/SmartImage/Program.cs
@@ -9,6 +9,7 @@
 using System.Threading;
 using SimpleCore.Cli;
 using SimpleCore.Net;
+using SmartImage.Configuration;
 using SmartImage.Core;
 using SmartImage.Utilities;
 
diff --git a/SmartImage/Searching/FullSearchResult.cs b/SmartImage/Searching/FullSearchResult.cs
@@ -13,6 +13,7 @@
 using SimpleCore.Net;
 using SimpleCore.Numeric;
 using SimpleCore.Utilities;
+using SmartImage.Configuration;
 using SmartImage.Core;
 using SmartImage.Engines;
 using SmartImage.Utilities;
@@ -69,8 +70,6 @@ private FullSearchResult(Color color, string name, string url, float? similarity
 		                          SearchEngine.Engine != SearchEngineOptions.None;
 
 
-		public bool IsAnalyzed { get; set; }
-
 		/// <summary>
 		///     Displays <see cref="ExtendedResults" />, if any, in a new menu
 		/// </summary>
@@ -412,12 +411,12 @@ private void AddImageInfo(ImageInputInfo info)
 			if (info.IsUrl) {
 				name = info.Value.ToString();
 
-				using var netStream = Network.GetStreamFromUrl(info.ImageUrl);
-				bmp = (Bitmap) Image.FromStream(netStream);
+				//using var netStream = Network.GetStreamFromUrl(info.ImageUrl);
+				bmp = (Bitmap) Image.FromStream(info.Stream);
 
-				netStream.Position = 0;
+				info.Stream.Position = 0;
 				using var ms = new MemoryStream();
-				netStream.CopyTo(ms);
+				info.Stream.CopyTo(ms);
 				var rg = ms.ToArray();
 				fileFormat = FileSystem.ResolveFileType(rg);
 				bytes      = rg.Length;
@@ -435,9 +434,9 @@ private void AddImageInfo(ImageInputInfo info)
 				throw new SmartImageException();
 			}
 
-			string fileSize = MathHelper.ConvertToUnit(bytes);
+			string imgSize = MathHelper.ConvertToUnit(bytes);
 
-			(int width, int height) = Images.GetDimensions(bmp);
+			(int width, int height) = (bmp.Width, bmp.Height);
 
 			Width  = width;
 			Height = height;
@@ -454,12 +453,12 @@ private void AddImageInfo(ImageInputInfo info)
 
 			string? aspectRatio = fractionStr.Replace('/', ':');
 
-			string fileInfoStr = $"{name} ({fileSize}) ({fileFormat.Name})";
+			string imageInfoStr = $"{name} ({imgSize})";
 
-			string infoStr = $"({aspectRatio}) ({mpx:F} MP)";
+			string infoStr = $"({aspectRatio}) ({mpx:F} MP) ({fileFormat.Name})";
 
-			Metadata.Add("File", fileInfoStr);
-			Metadata.Add("Info", infoStr);
+			Metadata.Add("Info", imageInfoStr);
+			Metadata.Add("Image", infoStr);
 		}
 
 		/// <summary>
@@ -471,7 +470,6 @@ public static FullSearchResult GetOriginalImageResult(ImageInputInfo info)
 			{
 				IsOriginal = true,
 				Similarity = MAX_SIMILARITY,
-				IsAnalyzed = true
 
 			};
 
diff --git a/SmartImage/Searching/ISearchResult.cs b/SmartImage/Searching/ISearchResult.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using SmartImage.Configuration;
 using SmartImage.Core;
 
 #nullable enable
diff --git a/SmartImage/Searching/ImageInputInfo.cs b/SmartImage/Searching/ImageInputInfo.cs
@@ -0,0 +1,71 @@
+﻿using System;
+using System.IO;
+using JetBrains.Annotations;
+using SimpleCore.Net;
+
+namespace SmartImage.Searching
+{
+	/// <summary>
+	/// Contains image input info
+	/// </summary>
+	public class ImageInputInfo
+	{
+		public bool IsFile { get; internal set; }
+
+		public bool IsUrl { get; internal set; }
+
+		public object Value { get; internal set; }
+
+		public string ImageUrl { get; internal set; }
+
+		public bool IsValid => IsFile || IsUrl;
+
+		public Stream Stream { get; internal set; }
+
+		public ImageInputInfo()
+		{
+			Value    = null;
+			ImageUrl = null; //todo
+		}
+
+		public override string ToString()
+		{
+			return Value switch
+			{
+				FileInfo fi => fi.Name,
+				string s    => s,
+				_           => throw new ArgumentOutOfRangeException()
+			};
+		}
+
+
+		/// <summary>
+		/// Attempts to create an <see cref="ImageInputInfo"/>
+		/// </summary>
+		/// <returns><c>true</c> if creation was successful and <paramref name="imageInput"/> is valid input; <c>false</c> otherwise</returns>
+		public static bool TryCreate([CanBeNull] string imageInput, out ImageInputInfo info)
+		{
+			info = new ImageInputInfo();
+
+			if (String.IsNullOrWhiteSpace(imageInput)) {
+				return false;
+			}
+
+			info.IsFile = File.Exists(imageInput);
+			info.IsUrl  = Network.IsUri(imageInput, out _) && !info.IsFile;
+
+			if (info.IsUrl) {
+				var isUriFile = MediaTypes.IsDirect(imageInput, MimeType.Image);
+
+				if (!isUriFile) {
+					return false;
+				}
+			}
+
+			info.Value  = info.IsFile ? new FileInfo(imageInput) : MediaTypes.Identify(imageInput)!;
+			info.Stream = info.IsFile ? File.OpenRead(imageInput) : Network.GetStreamFromUrl(imageInput);
+
+			return info.IsValid;
+		}
+	}
+}
diff --git a/SmartImage/Searching/SearchClient.cs b/SmartImage/Searching/SearchClient.cs
diff --git a/SmartImage/Utilities/CrashReport.cs b/SmartImage/Utilities/CrashReport.cs
diff --git a/SmartImage/Utilities/Images.cs b/SmartImage/Utilities/Images.cs

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using Microsoft.Win32;`
`6`	`6`	`using Novus.Win32;`
`7`	`7`	`using SimpleCore.Cli;`
	`8`	`+using SmartImage.Configuration;`
`8`	`9`
`9`	`10`	`namespace SmartImage.Core`
`10`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public override FullSearchResult GetResult(string url)`
`99`	`99`	`else {`
`100`	`100`	`r = base.GetResult(url);`
`101`	`101`
`102`		`- r.Metadata.Add("API", $"Returned null (possible timeout) [{code} {res} {msg}]");`
	`102`	`+ r.Metadata.Add("API", $"Error ({code})");`
`103`	`103`	`}`
`104`	`104`
`105`	`105`