Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the empty log bug and UI hanging on VFS cleanup

Browse Source
This commit is contained in:
Timothy Baldridge 2020-04-15 21:02:39 -06:00
parent 5eabe4449c
commit a0cfeb51bd
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Wabbajack.Common/Utils.cs
View File

@ -123,7 +123,7 @@ namespace Wabbajack.Common
public static T Log<T>(T msg) where T : IStatusMessage
{
LogStraightToFile(msg.ExtendedDescription);
LogStraightToFile(string.IsNullOrWhiteSpace(msg.ExtendedDescription) ? msg.ShortDescription : msg.ExtendedDescription);
LoggerSubj.OnNext(msg);
return msg;
}

8
Wabbajack.VirtualFileSystem/Context.cs
View File

@ -19,11 +19,13 @@ namespace Wabbajack.VirtualFileSystem
{
public class Context
{
private static Task _cleanupTask;
static Context()
{
Utils.Log("Cleaning VFS, this may take a bit of time");
Utils.DeleteDirectory(StagingFolder).Wait();
_cleanupTask = Utils.DeleteDirectory(StagingFolder);
}
public const ulong FileVersion = 0x03;
public const string Magic = "WABBAJACK VFS FILE";
@ -54,6 +56,7 @@ namespace Wabbajack.VirtualFileSystem
public async Task<IndexRoot> AddRoot(AbsolutePath root)
{
await _cleanupTask;
var filtered = Index.AllFiles.Where(file => file.IsNative && ((AbsolutePath) file.Name).Exists).ToList();
var byPath = filtered.ToImmutableDictionary(f => f.Name);
@ -86,6 +89,7 @@ namespace Wabbajack.VirtualFileSystem
public async Task<IndexRoot> AddRoots(List<AbsolutePath> roots)
{
await _cleanupTask;
var native = Index.AllFiles.Where(file => file.IsNative).ToDictionary(file => file.StagedPath);
var filtered = Index.AllFiles.Where(file => ((AbsolutePath)file.Name).Exists).ToList();
@ -197,6 +201,8 @@ namespace Wabbajack.VirtualFileSystem
public async Task<Func<Task>> Stage(IEnumerable<VirtualFile> files)
{
await _cleanupTask;
var grouped = files.SelectMany(f => f.FilesInFullPath)
.Distinct()
.Where(f => f.Parent != null)