Cleanup Zip and Extracted folder in AppData after installation.

Soapwood · Jul 9, 2024 · ea577ab · ea577ab
1 parent d716333
commit ea577ab
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 8 deletions.
diff --git a/VXAutoUpdater/Core/VXMusicAutoUpdater.cs b/VXAutoUpdater/Core/VXMusicAutoUpdater.cs
@@ -85,10 +85,7 @@ public static async Task UpdateApplicationBasedOnRequestedVersion(string branch,
             string targetPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "VXMusic");
 
             _autoUpdater.ExtractAndReplace(_autoUpdater.UpdateZipPath, extractPath, targetPath);
-
-            // TODO Cleanup zips after installation
-            // Handle extraction and installation of the update as per your application's needs
-
+
             UpdateMessageInMainWindow($"Installation of [{branch}] ({release.Name}) was Successful!");
         }
         else
@@ -217,6 +214,25 @@ public void ExtractAndReplace(string zipPath, string extractPath, string targetP
         {
             Console.WriteLine($"An error occured: {e}");
         }
+
+        try
+        {
+            UpdateMessageInMainWindow("Deleting downloaded zip...");
+            if(File.Exists(zipPath))
+                File.Delete(zipPath);
+
+            UpdateMessageInMainWindow("Deleting extracted zip folder...");
+            if (Directory.Exists(extractPath))
+                Directory.Delete(extractPath, true);
+        }
+        catch (UnauthorizedAccessException uae)
+        {
+            Console.WriteLine("User does not have the required privileges, please run as Administrator");
+        }
+        catch (Exception e)
+        {
+            Console.WriteLine($"An error occured: {e}");
+        }
     }
 
     private void ReplaceDirectoryContents(string sourceDir, string targetDir)

diff --git a/VXAutoUpdater/MainWindow.xaml.cs b/VXAutoUpdater/MainWindow.xaml.cs
@@ -107,7 +107,7 @@ private void MinimizeButton_Click(object sender, RoutedEventArgs e)
 
         private void CloseButton_Click(object sender, RoutedEventArgs e)
         {
-            this.Close(); // TODO Close down services gracfully
+            this.Close();
         }
 
         private void LaunchUpdatedVXMusicDesktop()

diff --git a/VXMusicDesktop/MainWindow.xaml.cs b/VXMusicDesktop/MainWindow.xaml.cs
@@ -105,7 +105,7 @@ private void MinimizeButton_Click(object sender, RoutedEventArgs e)
 
         private void CloseButton_Click(object sender, RoutedEventArgs e)
         {
-            this.Close(); // TODO Close down services gracfully
+            this.Close();
         }
 
         private void ThemeDropdownSelection(object sender, SelectionChangedEventArgs e)

diff --git a/VXMusicDesktop/Overlay/VXMusicOverlayInterface.cs b/VXMusicDesktop/Overlay/VXMusicOverlayInterface.cs
@@ -59,7 +59,7 @@ public static Process LaunchVXMOverlayRuntime(string runtimePath)
             Arguments = "",
             UseShellExecute = false, // Set this to false to redirect output if needed
             CreateNoWindow = true, // Set this to true to hide the Unity window
-            Verb = "runas", // TODO does this need to be here?
+            Verb = "runas",
             WindowStyle = ProcessWindowStyle.Minimized
         };
 

diff --git a/VXMusicDesktop/VXMusicDesktop.csproj b/VXMusicDesktop/VXMusicDesktop.csproj
@@ -9,7 +9,7 @@
     <PackageIcon>VXLogo.png</PackageIcon>
     <ApplicationIcon>Images\VXLogoIcon.ico</ApplicationIcon>
     <RunPostBuildEvent>Always</RunPostBuildEvent>
-    <Version>0.6.3.1</Version>
+    <Version>0.6.3.2</Version>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
   </PropertyGroup>