[Windows] Improve embedded resource extraction behaviour (#478)

qmk · May 30, 2024 · 452dbd2 · 452dbd2
1 parent e629d08
commit 452dbd2
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 12 deletions.
diff --git a/windows/QMK Toolbox/Helpers/DriverInstaller.cs b/windows/QMK Toolbox/Helpers/DriverInstaller.cs
@@ -26,8 +26,9 @@ public static bool DisplayPrompt()
 
         private static bool InstallDrivers()
         {
-            var driversPath = Path.Combine(Application.LocalUserAppDataPath, DriversListFilename);
-            var installerPath = Path.Combine(Application.LocalUserAppDataPath, InstallerFilename);
+            string toolboxData = EmbeddedResourceHelper.GetResourceFolder();
+            string driversPath = Path.Combine(toolboxData, DriversListFilename);
+            string installerPath = Path.Combine(toolboxData, InstallerFilename);
 
             if (!File.Exists(driversPath))
             {

diff --git a/windows/QMK Toolbox/Helpers/EmbeddedResourceHelper.cs b/windows/QMK Toolbox/Helpers/EmbeddedResourceHelper.cs
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
-using System.Windows.Forms;
 
 namespace QMK_Toolbox.Helpers
 {
@@ -28,9 +28,26 @@ public static class EmbeddedResourceHelper
             "libwinpthread-1.dll"
         };
 
+        public static string GetResourceFolder()
+        {
+            string appData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+            return Path.Combine(appData, "QMK", "Toolbox");
+        }
+
+        public static void InitResourceFolder()
+        {
+            string toolboxData = GetResourceFolder();
+            if (Directory.Exists(toolboxData))
+            {
+                Directory.Delete(toolboxData, true);
+            }
+            Directory.CreateDirectory(toolboxData);
+            ExtractResources(Resources);
+        }
+
         public static void ExtractResource(string file)
         {
-            var destPath = Path.Combine(Application.LocalUserAppDataPath, file);
+            string destPath = Path.Combine(GetResourceFolder(), file);
 
             if (!File.Exists(destPath))
             {

diff --git a/windows/QMK Toolbox/MainWindow.Designer.cs b/windows/QMK Toolbox/MainWindow.Designer.cs
diff --git a/windows/QMK Toolbox/MainWindow.cs b/windows/QMK Toolbox/MainWindow.cs
@@ -59,8 +59,6 @@ private void MainWindow_Load(object sender, EventArgs e)
 
             mcuBox.SelectedValue = Settings.Default.targetSetting;
 
-            EmbeddedResourceHelper.ExtractResources(EmbeddedResourceHelper.Resources);
-
             logTextBox.LogInfo($"QMK Toolbox {Application.ProductVersion} (https://qmk.fm/toolbox)");
             logTextBox.LogInfo("Supported bootloaders:");
             logTextBox.LogInfo(" - ARM DFU (APM32, Kiibohd, STM32, STM32duino) and RISC-V DFU (GD32V) via dfu-util (http://dfu-util.sourceforge.net/)");
@@ -105,6 +103,7 @@ private void MainWindow_Shown(object sender, EventArgs e)
         {
             if (Settings.Default.firstStart)
             {
+                EmbeddedResourceHelper.InitResourceFolder();
                 Settings.Default.Upgrade();
             }
 
@@ -507,6 +506,11 @@ private void InstallDriversMenuItem_Click(object sender, EventArgs e)
             DriverInstaller.DisplayPrompt();
         }
 
+        private void ClearResourcesMenuItem_Click(object sender, EventArgs e)
+        {
+            EmbeddedResourceHelper.InitResourceFolder();
+        }
+
         private void KeyTesterToolStripMenuItem_Click(object sender, EventArgs e)
         {
             KeyTesterWindow.GetInstance().Show(this);

diff --git a/windows/QMK Toolbox/Usb/Bootloader/BootloaderDevice.cs b/windows/QMK Toolbox/Usb/Bootloader/BootloaderDevice.cs
@@ -1,9 +1,9 @@
-using System;
+using QMK_Toolbox.Helpers;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Management;
 using System.Threading.Tasks;
-using System.Windows.Forms;
 
 namespace QMK_Toolbox.Usb.Bootloader
 {
@@ -61,14 +61,15 @@ public virtual Task Reset(string mcu)
         protected async Task<int> RunProcessAsync(string command, string args)
         {
             PrintMessage($"{command} {args}", MessageType.Command);
+            string toolboxData = EmbeddedResourceHelper.GetResourceFolder();
 
             using var process = new Process
             {
                 StartInfo =
                 {
-                    FileName = Path.Combine(Application.LocalUserAppDataPath, command),
+                    FileName = Path.Combine(toolboxData, command),
                     Arguments = args,
-                    WorkingDirectory = Application.LocalUserAppDataPath,
+                    WorkingDirectory = toolboxData,
                     UseShellExecute = false,
                     CreateNoWindow = true,
                     RedirectStandardOutput = true,