Bug fixes, refactoring

Author: Decimation

SmartImage/Core/Info.cs

@@ -90,7 +90,7 @@ public static string AppFolder
 		public static bool IsExeInAppFolder => File.Exists(Path.Combine(AppFolder, NAME_EXE));
 
 		/// <summary>
-		///     Null if executable is not in path.
+		///     <c>Null</c> if executable is not in path.
 		/// </summary>
 		[CanBeNull]
 		public static string ExeLocation => FileSystem.FindExecutableLocation(NAME_EXE)!;

SmartImage/Core/Interface.cs

@@ -250,10 +250,7 @@ internal static NConsoleInterface MainMenu
 			}
 		};
 
-		private static string GetContextMenuString(bool added)
-		{
-			return (!added ? "Add" : "Remove") + " context menu integration";
-		}
+		private static string GetContextMenuString(bool added) => (!added ? "Add" : "Remove") + " context menu integration";
 
 
 		private static readonly NConsoleOption CheckForUpdateOption = new()
@@ -262,26 +259,7 @@ private static string GetContextMenuString(bool added)
 			Color = ColorUtility,
 			Function = () =>
 			{
-				var v = UpdateInfo.GetUpdateInfo();
-
-				if (v.Status == VersionStatus.Available) {
-					Console.WriteLine($"Updating to {v.Latest}...");
-
-					try {
-						UpdateInfo.AutoUpdate();
-					}
-					catch (Exception e) {
-						Console.WriteLine(e);
-
-					}
-
-					// No return
-					Environment.Exit(0);
-
-				}
-				else {
-					NConsole.WriteInfo("{0}", v.Status);
-				}
+				UpdateInfo.AutoUpdate();
 
 				NConsoleIO.WaitForSecond();
 				return null;

SmartImage/Program.cs

@@ -79,13 +79,6 @@ private static void Main(string[] args)
 				NConsole.WriteError("Could not migrate legacy features");
 			}
 
-			/*
-			 * Check for updates
-			 */
-
-
-			UpdateInfo.AutoUpdate();
-			
 			/*
 			 * Run search
 			 */

SmartImage/Searching/FullSearchResult.cs

@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Drawing;
 using System.IO;
 using System.Linq;
@@ -22,8 +23,6 @@ namespace SmartImage.Searching
 	/// </summary>
 	public sealed class FullSearchResult : NConsoleOption, ISearchResult
 	{
-		
-
 		public const char ATTR_SUCCESS = Formatting.CHECK_MARK;
 
 		public FullSearchResult(ISearchEngine engine, string url, float? similarity = null)
@@ -67,6 +66,8 @@ public override NConsoleFunction? CtrlFunction
 					// 	}
 					// }
 
+					Debug.WriteLine("Downloading");
+
 					string? path = Network.DownloadUrl(Url);
 
 					NConsole.WriteSuccess("Downloaded to {0}", path);
@@ -81,16 +82,8 @@ public override NConsoleFunction? CtrlFunction
 				};
 			}
 		}
-
-		// public bool? IsImage
-		// {
-		// 	get;
-		// 	internal set;
-		// }
-
 
 
-
 		public override string Data => ToString();
 
 		/// <summary>
@@ -125,9 +118,13 @@ public override NConsoleFunction ComboFunction
 			{
 				return () =>
 				{
-					var u = RawUrl ?? Url;
-					
-					Network.OpenUrl(u);
+					if (RawUrl != null) {
+						Network.OpenUrl(RawUrl);
+						return null;
+					}
+
+					NConsole.WriteError("Raw result unavailable");
+					NConsoleIO.WaitForSecond();
 					return null;
 				};
 			}
@@ -177,17 +174,18 @@ public override string ToString()
 
 			string attrSuccess = ATTR_SUCCESS.ToString();
 
-			
+
 			var ex = ExtendedResults.Count > 0
-				? string.Format($"({ExtendedResults.Count})") : string.Empty;
-			
+				? String.Format($"({ExtendedResults.Count})")
+				: String.Empty;
+
 			sb.Append($"{attrSuccess} {ex}\n");
 
 
 			if (RawUrl != Url) {
 				sb.Append($"\tResult: {Url}\n");
 			}
-			else if (RawUrl != null) {
+			if (RawUrl != null) {
 				sb.Append($"\tRaw: {RawUrl}\n");
 			}
 
@@ -235,7 +233,5 @@ private IList<FullSearchResult> FromExtendedResult(IReadOnlyList<ISearchResult>
 
 			return rg;
 		}
-
-		
 	}
 }

SmartImage/Utilities/UpdateInfo.cs

@@ -83,7 +83,13 @@ public static void AutoUpdate()
 				NConsole.WriteSuccess($"Update found: {ui.Latest} ");
 
 				if (NConsoleIO.ReadConfirmation("Update?")) {
-					Update(ui);
+					try {
+						Update(ui);
+					}
+					catch (Exception e) {
+						Console.WriteLine(e);
+						return;
+					}
 					Environment.Exit(0);
 				}
 			}