Merge branch 'logging-update-for-temp-clear-on-close' into pre-release

wabbajack-tools · Jan 8, 2024 · 6a2189d · 6a2189d
2 parents 1e245e4 + a8aad32
commit 6a2189d
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/Wabbajack.App.Wpf/Views/MainWindow.xaml.cs b/Wabbajack.App.Wpf/Views/MainWindow.xaml.cs
@@ -52,27 +52,26 @@ public MainWindow(ILogger<MainWindow> logger, SystemParametersConstructor system
                     // Cleaning the temp folder when the app closes since it can take up multiple Gigabytes of Storage
                     var tempDirectory = Environment.CurrentDirectory + "\\temp";
                     _logger.LogInformation("Clearing {TempDir}",tempDirectory);
+                    var directoryInfo = new DirectoryInfo(tempDirectory);
                     try
                     {
-                        var directoryInfo = new DirectoryInfo(tempDirectory);
-
                         foreach (var file in directoryInfo.EnumerateFiles())
                         {
-                            file.Delete(); 
+                            file.Delete();
                         }
+
                         foreach (var dir in directoryInfo.EnumerateDirectories())
                         {
-                            dir.Delete(true); 
+                            dir.Delete(true);
                         }
-                        
-                        _logger.LogInformation("Finished clearing {TempDir}",tempDirectory);
+
+                        _logger.LogInformation("Finished clearing {TempDir}", tempDirectory);
                     }
-                    catch (Exception ex)
+                    catch (DirectoryNotFoundException)
                     {
-                        _logger.LogError(ex,"Failed clearing {TempDir}",tempDirectory);
+                        _logger.LogInformation("Unable to find {TempDir}", tempDirectory);
                     }
 
-
                     Application.Current.Shutdown();
                 };