fix: Auto Updater failing, due to being unable to delete WebView2 files

Pyrageis · Nov 10, 2023 · 34d0587 · 34d0587
1 parent 4f8a34c
commit 34d0587
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/src/GIMI-ModManager.WinUI/ViewModels/ModUpdateVM.cs b/src/GIMI-ModManager.WinUI/ViewModels/ModUpdateVM.cs
@@ -30,6 +30,8 @@ public partial class ModUpdateVM : ObservableRecipient
 
     [ObservableProperty] private DateTime _lastUpdateCheck = DateTime.Now;
 
+    [ObservableProperty] private bool _isOpenDownloadButtonEnabled = false;
+
 
     public ObservableCollection<UpdateCheckResult> Results = new();
     private readonly ILogger _logger = App.GetService<ILogger>().ForContext<ModUpdateVM>();

diff --git a/src/GIMI-ModManager.WinUI/Views/ModUpdateAvailableWindow.xaml b/src/GIMI-ModManager.WinUI/Views/ModUpdateAvailableWindow.xaml
@@ -170,7 +170,8 @@
                         Grid.Column="1"
                         Margin="8,0"
                         Click="ButtonBase_OnClick"
-                        Content="Downloads" />
+                        Content="Downloads"
+                        IsEnabled="{x:Bind ViewModel.IsOpenDownloadButtonEnabled, Mode=OneWay}" />
                     <ProgressRing
                         x:Name="ModPageLoadingRing"
                         Grid.Column="2"

diff --git a/src/GIMI-ModManager.WinUI/Views/ModUpdateAvailableWindow.xaml.cs b/src/GIMI-ModManager.WinUI/Views/ModUpdateAvailableWindow.xaml.cs
@@ -31,6 +31,7 @@ public ModUpdateAvailableWindow(Guid notificationId)
             ModPageBrowser.CoreWebView2.NavigationCompleted += async (_, _) =>
             {
                 ModPageLoadingRing.IsActive = false;
+                ViewModel.IsOpenDownloadButtonEnabled = true;
 
                 // This automatically opens the author side pane
                 // However, it covered the update date and was annoying so I disabled it

diff --git a/src/JASM.AutoUpdater/MainPageVM.cs b/src/JASM.AutoUpdater/MainPageVM.cs
@@ -340,6 +340,18 @@ private async Task InstallLatestVersion()
                 continue;
             }
 
+            if (fileSystemInfo.Name.Equals("JASM - Just Another Skin Manager.exe.WebView2",
+                    StringComparison.OrdinalIgnoreCase))
+            {
+                continue;
+            }
+
+            if (fileSystemInfo.Name.Equals("logs",
+                    StringComparison.OrdinalIgnoreCase))
+            {
+                continue;
+            }
+
             if (fileSystemInfo is DirectoryInfo directoryInfo)
                 directoryInfo.Delete(true);
             else