Merge branch 'temp-file-handling-and-logging-changes' into pre-release

This commit is contained in:
EzioTheDeadPoet
2023-11-02 16:40:31 +01:00
2 changed files with 28 additions and 0 deletions

View File

@ -1,6 +1,7 @@
using System;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.IO;
using System.Reactive.Linq;
using System.Windows;
using System.Windows.Input;
@ -47,6 +48,31 @@ namespace Wabbajack
{
_logger.LogInformation("Beginning shutdown...");
_mwvm.CancelRunningTasks(TimeSpan.FromSeconds(10));
// 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);
try
{
var directoryInfo = new DirectoryInfo(tempDirectory);
foreach (var file in directoryInfo.EnumerateFiles())
{
file.Delete();
}
foreach (var dir in directoryInfo.EnumerateDirectories())
{
dir.Delete(true);
}
_logger.LogInformation("Finished clearing {TempDir}",tempDirectory);
}
catch (Exception ex)
{
_logger.LogDebug("Directory {TempDir} doesn't exist",tempDirectory);
}
Application.Current.Shutdown();
};

View File

@ -244,6 +244,8 @@ public class VirtualFile
catch (Exception ex)
{
context.Logger.LogError(ex, "Error while examining the contents of {path}", relPath.FileName);
if (!ex.Message.Equals("End of stream before end of limit")) throw;
context.Logger.LogError("Possibly not enough free storage space in Wabbajack Folder Location");
throw;
}