Fixed file associations for .vjpreset and .vjqueue

Author: RandomEngy

VidCoder/Model/Database.cs

@@ -76,6 +76,11 @@ public static void Initialize()
 				UpgradeDatabaseTo47();
 			}
 
+			if (databaseVersion < 49)
+			{
+				UpgradeDatabaseTo49();
+			}
+
 			// Update encoding profiles if we need to. Everything is at least 28 now from the JSON upgrade.
 			int oldDatabaseVersion = Math.Max(databaseVersion, 28);
 			if (oldDatabaseVersion < Utilities.LastUpdatedEncodingProfileDatabaseVersion)
@@ -333,6 +338,14 @@ private static void UpgradeDatabaseTo47()
 			"reason TEXT)", Connection);
 	}
 
+	private static void UpgradeDatabaseTo49()
+	{
+		if (Utilities.InstallType == VidCoderInstallType.VelopackInstaller)
+		{
+			RegistryUtilities.RefreshFileAssociations(new StubLogger());
+		}
+	}
+
 #pragma warning restore CS0618 // Type or member is obsolete
 
 	private static void UpgradeEncodingProfiles(int databaseVersion)

VidCoder/Utilities/RegistryUtilities.cs

@@ -15,7 +15,7 @@ public static class RegistryUtilities
 {
 	private static readonly bool IsBeta = CommonUtilities.Beta;
 	private static readonly string LocalAppFolder = CommonUtilities.LocalAppFolder;
-	private static readonly string WindowlessCliExePath = Path.Combine(LocalAppFolder, "VidCoderWindowlessCLI.exe");
+	private static readonly string WindowlessCliExePath = Path.Combine(LocalAppFolder, "current", "VidCoderWindowlessCLI.exe");
 
 	private const string EventHandlersKeyPath = @"Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlers";
 
@@ -63,6 +63,15 @@ public static void Uninstall(IBasicLogger logger)
 		logger.Log("Finished uninstalling registry keys.");
 	}
 
+	// Only needed to fix file associations when upgrading to v49
+	public static void RefreshFileAssociations(IBasicLogger logger)
+	{
+		logger.Log("Refreshing file associations...");
+		RemoveFileAssociations(logger);
+		AddFileAssociations(logger);
+		logger.Log("Finished refreshing file associations.");
+	}
+
 	public static bool AreRegKeysInstalled()
 	{
 		RegistryKey presetKey = Registry.CurrentUser.OpenSubKey(VJPresetExtensionKeyPath);
@@ -162,7 +171,7 @@ private static void AddFileAssociations(IBasicLogger logger)
 			presetKey.SetValue(null, PresetProgId);
 			presetKey.Close();
 
-			string presetIconPath = Path.Combine(CommonUtilities.LocalAppFolder, "VidCoderPreset.ico");
+			string presetIconPath = Path.Combine(CommonUtilities.LocalAppFolder, "current", "VidCoderPreset.ico");
 
 			RegistryKey presetIconKey = Registry.CurrentUser.CreateSubKey($@"{PresetClassesKeyPath}\DefaultIcon");
 			presetIconKey.SetValue(null, $"\"{presetIconPath}\"");
@@ -177,7 +186,7 @@ private static void AddFileAssociations(IBasicLogger logger)
 			queueKey.SetValue(null, QueueProgId);
 			queueKey.Close();
 
-			string queueIconPath = Path.Combine(CommonUtilities.LocalAppFolder, "VidCoderQueue.ico");
+			string queueIconPath = Path.Combine(CommonUtilities.LocalAppFolder, "current", "VidCoderQueue.ico");
 
 			RegistryKey queueIconKey = Registry.CurrentUser.CreateSubKey($@"{QueueClassesKeyPath}\DefaultIcon");
 			queueIconKey.SetValue(null, $"\"{queueIconPath}\"");

VidCoder/Utilities/Utilities.cs

@@ -28,7 +28,7 @@ namespace VidCoder;
 
 public static class Utilities
 {
-	public const int CurrentDatabaseVersion = 48;
+	public const int CurrentDatabaseVersion = 49;
 	public const int LastUpdatedEncodingProfileDatabaseVersion = 48;
 	public const int LastUpdatedPickerDatabaseVersion = 47;
 

VidCoder/VidCoderInstall.cs

@@ -26,8 +26,6 @@ public static void OnInitialInstall(SemanticVersion version)
 
 		try
 		{
-			CopyIconFilesToRoot(logger);
-
 			RegistryUtilities.Install(logger);
 			logger.Log("Initial install actions complete.");
 		}
@@ -84,30 +82,4 @@ public static void OnAppUninstall(SemanticVersion version)
 			logger.Close();
 		}
 	}
-
-	/// <summary>
-	/// Copies some icon files to the root local app data folder so they can be in a stable location for file associations.
-	/// </summary>
-	/// <param name="logger">The logger to use.</param>
-	private static void CopyIconFilesToRoot(SupportLogger logger)
-	{
-		try
-		{
-			const string presetIconFileName = "VidCoderPreset.ico";
-			const string queueIconFileName = "VidCoderQueue.ico";
-
-			string presetIconSourcePath = Path.Combine(CommonUtilities.ProgramFolder, presetIconFileName);
-			string queueIconSourcePath = Path.Combine(CommonUtilities.ProgramFolder, queueIconFileName);
-
-			string presetIconDestinationPath = Path.Combine(CommonUtilities.LocalAppFolder, presetIconFileName);
-			string queueIconDestinationPath = Path.Combine(CommonUtilities.LocalAppFolder, queueIconFileName);
-
-			File.Copy(presetIconSourcePath, presetIconDestinationPath, overwrite: true);
-			File.Copy(queueIconSourcePath, queueIconDestinationPath, overwrite: true);
-		}
-		catch (Exception exception)
-		{
-			logger.Log(exception.ToString());
-		}
-	}
 }