Update functionality improvements

Author: Decimation

SmartImage/Core/Info.cs

@@ -159,7 +159,7 @@ internal static void ShowInfo()
 
 			NConsole.OverrideForegroundColor = Interface.ColorVersion;
 
-			var versionsInfo = UpdateInfo.CheckForUpdates();
+			var versionsInfo = UpdateInfo.GetUpdateInfo();
 
 			NConsole.WriteInfo("Current version: {0}", versionsInfo.Current);
 			NConsole.WriteInfo("Latest version: {0}", versionsInfo.Latest.Version);

SmartImage/Core/Interface.cs

@@ -262,13 +262,13 @@ private static string GetContextMenuString(bool added)
 			Color = ColorUtility,
 			Function = () =>
 			{
-				var v = UpdateInfo.CheckForUpdates();
+				var v = UpdateInfo.GetUpdateInfo();
 
 				if (v.Status == VersionStatus.Available) {
 					Console.WriteLine($"Updating to {v.Latest}...");
 
 					try {
-						UpdateInfo.Update();
+						UpdateInfo.AutoUpdate();
 					}
 					catch (Exception e) {
 						Console.WriteLine(e);

SmartImage/Program.cs

@@ -35,28 +35,33 @@ public static class Program
 
 		private static void Main(string[] args)
 		{
-			
+
 			/*
 			 * Setup
 			 * Check compatibility
 			 */
 			Info.Setup();
 
-			
+
 			/*
 			 * Set up console
 			 */
 
 			Console.Title = Info.NAME;
 
-			
-			if (Console.LargestWindowWidth >= Interface.ConsoleWindowWidth && Console.LargestWindowHeight >= Interface.ConsoleWindowHeight) {
+
+			if (Console.LargestWindowWidth  >= Interface.ConsoleWindowWidth &&
+			    Console.LargestWindowHeight >= Interface.ConsoleWindowHeight) {
 				Console.SetWindowSize(Interface.ConsoleWindowWidth, Interface.ConsoleWindowHeight);
 			}
 
 			Console.OutputEncoding = Encoding.Unicode;
 			Console.Clear();
 
+			Console.WriteLine(Info.NAME_BANNER);
+			NConsole.WriteInfo("Setting up...");
+
+
 			/*
 			 * Set up NConsole
 			 */
@@ -68,13 +73,19 @@ private static void Main(string[] args)
 			/*
 			 * Check for any legacy integrations that need to be migrated
 			 */
-			bool ok = LegacyIntegration.LegacyCleanup();
+			bool cleanupOk = LegacyIntegration.LegacyCleanup();
 
-			if (!ok)
-			{
+			if (!cleanupOk) {
 				NConsole.WriteError("Could not migrate legacy features");
 			}
 
+			/*
+			 * Check for updates
+			 */
+
+
+			UpdateInfo.AutoUpdate();
+			
 			/*
 			 * Run search
 			 */

SmartImage/Utilities/CrashReport.cs

@@ -43,7 +43,7 @@ public override string ToString()
 			}
 
 			sb.AppendLine(Strings.CreateSeparator("Program Info"));
-			var versionsInfo = UpdateInfo.CheckForUpdates();
+			var versionsInfo = UpdateInfo.GetUpdateInfo();
 			sb.AppendFormat("Version: {0}", versionsInfo.Current);
 
 			return sb.ToString();

SmartImage/Utilities/ReleaseInfo.cs

@@ -80,7 +80,7 @@ public static ReleaseInfo GetLatestRelease()
 
 		public override string ToString()
 		{
-			return String.Format("{0} {1} {2}", TagName, Version, PublishedAt);
+			return $"{TagName} ({Version}) @ {PublishedAt}";
 		}
 	}
 }

SmartImage/Utilities/UpdateInfo.cs

@@ -1,7 +1,9 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Net;
 using Novus.Win32;
+using SimpleCore.Console.CommandLine;
 using SmartImage.Core;
 
 namespace SmartImage.Utilities
@@ -17,54 +19,79 @@ public readonly struct UpdateInfo
 		private UpdateInfo(Version current, ReleaseInfo info, VersionStatus status)
 		{
 			Current = current;
-			Latest = info;
-			Status = status;
+			Latest  = info;
+			Status  = status;
 		}
 
-		
-		public static void Update()
+		public static void Update(UpdateInfo ui)
 		{
-			var ui = CheckForUpdates();
+			const string NEW_EXE    = "SmartImage-new.exe";
+			const string UPDATE_BAT = "SmartImage_Updater.bat";
 
 
-			if (ui.Status == VersionStatus.Available) {
-				var dest = Path.Combine(Info.AppFolder, "SmartImage-new.exe");
+			var destNew = Path.Combine(Info.AppFolder, NEW_EXE);
+			var wc      = new WebClient();
 
-				var wc = new WebClient();
-				wc.DownloadFile(ui.Latest.AssetUrl, dest);
+			NConsole.WriteInfo("Downloading...");
+			
+			wc.DownloadFile(ui.Latest.AssetUrl, destNew);
+			
+			
 
-				string exeFileName = Info.ExeLocation;
-				const string UPDATE_BAT = "SmartImage_Updater.bat";
+			string exeFileName = Info.ExeLocation;
 
-				string[] commands =
-				{
-					"@echo off",
+			//const string WAIT_4_SEC = "ping 127.0.0.1 > nul";
 
-					/* Wait approximately 4 seconds (so that the process is already terminated) */
-					"ping 127.0.0.1 > nul",
+			const string WAIT_4_SEC = "timeout /t 4 /nobreak >nul";
 
-					/* Delete executable */
-					"echo y | del /F " + exeFileName,
+			string[] commands =
+			{
+				"@echo off",
 
-					/* Rename */
-					$"move /Y \"{dest}\" \"{exeFileName}\" > NUL",
+				/* Wait approximately 4 seconds (so that the process is already terminated) */
+				WAIT_4_SEC,
 
-					/* Delete this bat file */
-					"echo y | del " + UPDATE_BAT
-				};
-				
+				/* Delete executable */
+				"echo y | del /F " + exeFileName,
 
-				// Runs in background
-				
-				Command.RunBatch(commands,false, UPDATE_BAT);
-			}
+				/* Rename */
+				$"move /Y \"{destNew}\" \"{exeFileName}\" > NUL",
+
+				/* Wait */
+				WAIT_4_SEC,
+				WAIT_4_SEC,
+
+				/* Open the new SmartImage version */
+				$"start /d \"{Info.AppFolder}\" {Info.NAME_EXE}",
 
+				/* Delete this batch file */
+				"echo y | del " + UPDATE_BAT,
+			};
+
+
+			// Runs in background
+			Command.RunBatch(commands, false, UPDATE_BAT);
+		}
 
+
+		// NOTE: Does not return if a new update is found and the user updates
+		public static void AutoUpdate()
+		{
+			var ui = GetUpdateInfo();
+
+			if (ui.Status == VersionStatus.Available) {
+				NConsole.WriteSuccess($"Update found: {ui.Latest} ");
+
+				if (NConsoleIO.ReadConfirmation("Update?")) {
+					Update(ui);
+					Environment.Exit(0);
+				}
+			}
 		}
 
-		public static UpdateInfo CheckForUpdates()
+		public static UpdateInfo GetUpdateInfo()
 		{
-			var asm = typeof(Info).Assembly.GetName();
+			var asm            = typeof(Info).Assembly.GetName();
 			var currentVersion = asm.Version;