Work on .NET 6 fixes

Author: Decimation

SmartImage.Lib/Engines/Impl/Ascii2DEngine.cs

@@ -13,6 +13,7 @@
 using RestSharp;
 using SmartImage.Lib.Engines.Model;
 
+#nullable disable
 // ReSharper disable CognitiveComplexity
 
 // ReSharper disable IdentifierTypo
@@ -37,9 +38,16 @@ protected override Uri GetRawUri(ImageQuery query)
 		{
 			var uri = base.GetRawUri(query);
 
-			var request = WebRequest.Create(uri);
+			// var       request  = WebRequest.Create(uri);
+			// using var response = request.GetResponse();
+
+			var request = new HttpRequestMessage()
+			{
+				RequestUri = uri
+			};
+
+			var response = new HttpClient().Send(request);
 
-			using var response = request.GetResponse();
 
 			/*
 			 * URL parameters
@@ -55,7 +63,13 @@ protected override Uri GetRawUri(ImageQuery query)
 			 *
 			 */
 
-			string detailUrl = response.ResponseUri.ToString().Replace("/color/", "/bovw/");
+			// var    responseUri = response.ResponseUri;
+
+			Debug.Assert(response.RequestMessage?.RequestUri != null);
+
+			var responseUri = response.RequestMessage.RequestUri;
+			
+			string detailUrl = responseUri.ToString().Replace("/color/", "/bovw/");
 
 			return new Uri(detailUrl);
 
@@ -68,17 +82,17 @@ protected override SearchResultOrigin GetResultOrigin(ImageQuery query)
 			var rawUri = GetRawUri(query);
 
 			var content = WebUtilities.GetString(rawUri.ToString());
-			var diff       = TimeSpan.FromTicks(Stopwatch.GetTimestamp() - now);
+			var diff    = TimeSpan.FromTicks(Stopwatch.GetTimestamp() - now);
 
 			var stub = new SearchResultOrigin()
 			{
 				InitialResponse = new RestResponse
 				{
 					Content = content
 				},
-				Retrieval = diff, 
-				InitialSuccess = true, 
-				RawUri = rawUri
+				Retrieval      = diff,
+				InitialSuccess = true,
+				RawUri         = rawUri
 			};
 
 

SmartImage.Lib/Engines/Model/BaseSearchEngine.cs

@@ -81,13 +81,12 @@ protected virtual Uri GetRawUri(ImageQuery query)
 
 		protected virtual SearchResultOrigin GetResultOrigin(ImageQuery query)
 		{
-			// TODO: Refactor to use HttpClient
 
 			Uri rawUri = GetRawUri(query);
 
 
-			var res = Network.GetResponse(rawUri.ToString(), (int) Timeout.TotalMilliseconds,
-			                              Method.GET, FollowRedirects);
+			var res = HttpUtilities.GetResponse(rawUri.ToString(), 
+			                                    (int) Timeout.TotalMilliseconds, Method.GET, FollowRedirects);
 
 
 			bool success;

SmartImage.Lib/Searching/ImageQuery.cs

@@ -11,7 +11,7 @@
 using SmartImage.Lib.Upload;
 using SmartImage.Lib.Utilities;
 using static Kantan.Diagnostics.LogCategories;
-
+#pragma warning disable CA1416
 namespace SmartImage.Lib.Searching
 {
 	/// <summary>

SmartImage.Lib/Searching/ImageResult.cs

@@ -10,7 +10,7 @@
 using SmartImage.Lib.Utilities;
 
 // ReSharper disable CognitiveComplexity
-#pragma warning disable 8629
+#pragma warning disable 8629,CA1416
 #nullable enable
 
 namespace SmartImage.Lib.Searching

SmartImage.Lib/Utilities/ImageHelper.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
+using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
@@ -22,6 +23,7 @@
 using RestSharp;
 using static Kantan.Diagnostics.LogCategories;
 
+#pragma warning disable	CA1416
 // ReSharper disable ConvertIfStatementToReturnStatement
 // ReSharper disable CognitiveComplexity
 // ReSharper disable PossibleNullReferenceException
@@ -95,6 +97,11 @@ public static string Download(Uri src, string path)
 
 			try {
 				wc.DownloadFile(src.ToString(), combine);
+				// WebUtilities.GetFile(src.ToString(), combine);
+				// using var h = new HttpClient();
+				// h.DownloadFile(src.ToString(), combine);
+
+
 				return combine;
 			}
 			catch (Exception e) {
@@ -205,8 +212,8 @@ public static async Task<List<string>> FindDirectImages(string url, int count =
 			return images;
 		}
 
-		public static bool IsImage(string url, DirectImageCriterion directCriterion = DirectImageCriterion.Binary) =>
-			IsImage(url, TimeoutMS, directCriterion);
+		public static bool IsImage(string url, DirectImageCriterion directCriterion = DirectImageCriterion.Binary)
+			=> IsImage(url, TimeoutMS, directCriterion);
 
 		public static bool IsImage(string url, long timeout, DirectImageCriterion directCriterion)
 		{
@@ -221,7 +228,7 @@ public static bool IsImage(string url, long timeout, DirectImageCriterion direct
 						return false;
 					}
 
-					var response = Network.GetResponse(u.ToString(), (int) timeout, Method.HEAD);
+					var response = HttpUtilities.GetResponse(u.ToString(), (int) timeout, Method.HEAD);
 
 					if (!response.IsSuccessful) {
 						return false;
@@ -285,6 +292,44 @@ public static DisplayResolutionType GetDisplayResolution(int w, int h)
 			};
 
 		}
+
+		public static Bitmap ResizeImage(Bitmap mg, Size newSize)
+		{
+			// todo
+			double ratio         = 0d;
+			double myThumbWidth  = 0d;
+			double myThumbHeight = 0d;
+			int    x             = 0;
+			int    y             = 0;
+
+			Bitmap bp;
+
+			if ((mg.Width / Convert.ToDouble(newSize.Width)) > (mg.Height / Convert.ToDouble(newSize.Height))) {
+				ratio = Convert.ToDouble(mg.Width) / Convert.ToDouble(newSize.Width);
+			}
+			else {
+				ratio = Convert.ToDouble(mg.Height) / Convert.ToDouble(newSize.Height);
+			}
+
+			myThumbHeight = Math.Ceiling(mg.Height / ratio);
+			myThumbWidth  = Math.Ceiling(mg.Width / ratio);
+
+			//Size thumbSize = new Size((int)myThumbWidth, (int)myThumbHeight);
+			Size thumbSize = new Size((int) newSize.Width, (int) newSize.Height);
+			bp = new Bitmap(newSize.Width, newSize.Height);
+			x  = (newSize.Width - thumbSize.Width) / 2;
+			y  = (newSize.Height - thumbSize.Height);
+			// Had to add System.Drawing class in front of Graphics ---
+			System.Drawing.Graphics g = Graphics.FromImage(bp);
+			g.SmoothingMode     = SmoothingMode.HighQuality;
+			g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+			g.PixelOffsetMode   = PixelOffsetMode.HighQuality;
+			Rectangle rect = new Rectangle(x, y, thumbSize.Width, thumbSize.Height);
+			g.DrawImage(mg, rect, 0, 0, mg.Width, mg.Height, GraphicsUnit.Pixel);
+
+			return bp;
+
+		}
 	}
 
 	public enum DirectImageCriterion

SmartImage/Core/AppInfo.cs

@@ -40,18 +40,6 @@ namespace SmartImage.Core
 	/// </summary>
 	public static class AppInfo
 	{
-		/// <summary>
-		/// Name in ASCII art
-		/// </summary>
-		public const string NAME_BANNER =
-			"  ____                       _   ___\n" +
-			" / ___| _ __ ___   __ _ _ __| |_|_ _|_ __ ___   __ _  __ _  ___\n" +
-			@" \___ \| '_ ` _ \ / _` | '__| __|| || '_ ` _ \ / _` |/ _` |/ _ \" + "\n" +
-			"  ___) | | | | | | (_| | |  | |_ | || | | | | | (_| | (_| |  __/\n" +
-			@" |____/|_| |_| |_|\__,_|_|   \__|___|_| |_| |_|\__,_|\__, |\___|" + "\n" +
-			"                                                     |___/\n";
-
-
 		/// <summary>
 		/// Name
 		/// </summary>
@@ -66,17 +54,7 @@ public static class AppInfo
 		/// Config file name
 		/// </summary>
 		public const string NAME_CFG = "SmartImage.cfg";
-
-		public const string AUTHOR = "Read Stanton";
-
-		public const string URL_REPO = "https://github.com/Decimation/SmartImage";
-
-		public const string URL_README = "https://github.com/Decimation/SmartImage/blob/master/README.md";
-
-		public const string URL_ISSUE = "https://github.com/Decimation/SmartImage/issues/new";
-
-		public const string URL_WIKI = "https://github.com/Decimation/SmartImage/wiki";
-
+		
 		public static string AppFolder => Path.GetDirectoryName(ExeLocation);
 
 		public static Version Version => typeof(AppInfo).Assembly.GetName().Version!;
@@ -91,22 +69,15 @@ public static string ExeLocation
 			get
 			{
 				var module = Process.GetCurrentProcess().MainModule;
+
 				Guard.AssertNotNull(module);
 
 				return module.FileName;
 			}
 		}
 
 
-		public static bool IsAppFolderInPath
-		{
-			get
-			{
-				
-
-				return FileSystem.IsFolderInPath(AppFolder);
-			}
-		}
+		public static bool IsAppFolderInPath => FileSystem.IsFolderInPath(AppFolder);
 
 		/// <summary>
 		/// Setup
@@ -118,32 +89,13 @@ public static void Setup()
 				throw new NotSupportedException();
 			}*/
 
-
 			if (!IsAppFolderInPath) {
 				AppIntegration.HandlePath(true);
 			}
 
 			Debug.WriteLine($"Cli utilities: {ImageHelper.Utilities.QuickJoin()}", C_INFO);
 
-			/*var languages = Windows.System.UserProfile.GlobalizationPreferences.Languages;
-
-			bool zh = languages.Any(l => l.Contains("zh"));
-
-			bool ja = languages.Contains("ja");
-
-			if (ja || zh) {
-
-				/*Console.WriteLine("Non-Romance language detected!");
-				Console.WriteLine("If English is not the main IME, things may not work properly!");
-
-				ConsoleManager.WaitForInput();#1#
-
-				Trace.WriteLine($"Languages: {languages.QuickJoin()}");
-			}*/
-
-			//Windows.System.UserProfile.GlobalizationPreferences.Languages
-			//Thread.CurrentThread.CurrentUICulture
-			//CultureInfo.CurrentCulture
+			
 		}
 	}
 }

SmartImage/Program.cs

@@ -148,7 +148,6 @@ public static class Program
 		/// </summary>
 		private static async Task Main(string[] args)
 		{
-			Debug.WriteLine($"{Process.GetCurrentProcess().MainModule}");
 			/*
 			 * Setup
 			 * Check compatibility