feat: prompt user when removing managed packages

WolvenKit · Nov 15, 2022 · 24feede · 24feede
1 parent 623caeb
commit 24feede
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 9 deletions.
diff --git a/Wolvenkit.Installer/Services/LibraryService.cs b/Wolvenkit.Installer/Services/LibraryService.cs
@@ -402,7 +402,7 @@ public async Task<bool> InstallAsync(RemotePackageModel package, string installP
         InstalledPackages.Add(new(installedPackage, EPackageStatus.Installed, package.ImagePath));
 
         // add start menu shortcut
-        AddShortcut(installedPackage, package);
+        // AddShortcut(installedPackage, package);
 
         // save
         await SaveAsync();

diff --git a/Wolvenkit.Installer/ViewModel/PackageViewModel.cs b/Wolvenkit.Installer/ViewModel/PackageViewModel.cs
@@ -1,9 +1,11 @@
-using System.Diagnostics;
+using System;
+using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml.Controls;
 using Wolvenkit.Installer.Models;
 using Wolvenkit.Installer.Services;
 
@@ -112,14 +114,43 @@ private async Task Uninstall()
 
         if (Directory.Exists(_model.Path))
         {
-            try
+            // managed packages need confirmation
+            if (_model.Files is null || _model.Files.Length == 0)
             {
-                Directory.Delete(_model.Path, true);
-                await _libraryService.RemoveAsync(_model);
+                var noWifiDialog = new ContentDialog()
+                {
+                    XamlRoot = App.MainRoot.XamlRoot,
+                    Title = "Remove",
+                    Content = $"Are you sure you want to delete this folder? Path: {_model.Path}",
+                    PrimaryButtonText = "Yes",
+                    CloseButtonText = "Cancel"
+                };
+
+                var r = await noWifiDialog.ShowAsync();
+                if (r == ContentDialogResult.Primary)
+                {
+                    try
+                    {
+                        Directory.Delete(_model.Path, true);
+                        await _libraryService.RemoveAsync(_model);
+                    }
+                    catch (System.Exception)
+                    {
+                        // todo logging
+                    }
+                }
             }
-            catch (System.Exception)
+            else
             {
-                // todo logging
+                try
+                {
+                    Directory.Delete(_model.Path, true);
+                    await _libraryService.RemoveAsync(_model);
+                }
+                catch (System.Exception)
+                {
+                    // todo logging
+                }
             }
         }
 
@@ -141,6 +172,12 @@ private async Task Update()
             try
             {
                 Directory.Delete(_model.Path, true);
+                //foreach (var f in _model.Files)
+                //{
+                //    File.Delete(f);
+                //}
+
+
                 isuninstalled = await _libraryService.RemoveAsync(_model);
             }
             catch (System.Exception)

diff --git a/Wolvenkit.Installer/ViewModel/RemotePackageViewModel.cs b/Wolvenkit.Installer/ViewModel/RemotePackageViewModel.cs
@@ -6,7 +6,6 @@
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.DependencyInjection;
 using Wolvenkit.Installer.Models;
-using Wolvenkit.Installer.Pages;
 using Wolvenkit.Installer.Services;
 
 namespace Wolvenkit.Installer.ViewModel;
@@ -85,7 +84,8 @@ private async Task PickFolder()
         }
     }
 
-    private bool CanInstall() => !Directory.Exists(InstallPath) || (Directory.Exists(InstallPath) && !Directory.GetFiles(InstallPath).Any());
+    // Can only install into an empty folder
+    private bool CanInstall() => !Directory.Exists(InstallPath) || (Directory.Exists(InstallPath) && !Directory.GetFiles(InstallPath).Any() && !Directory.GetDirectories(InstallPath).Any());
 
     public RemotePackageModel GetModel() => _model;
 }