ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-22 00:19:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Clear errors/warnings before starting IO

Browse source
This commit is contained in:
ackwell 2024-01-27 13:53:56 +11:00
parent b543d9fc1d
commit 6693a1e0ba
1 changed files with 37 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

58
Penumbra/UI/AdvancedWindow/ModEditWindow.Models.MdlTab.cs
View file

@ -2,6 +2,7 @@ using Lumina.Data.Parsing;
using OtterGui; using OtterGui;
using Penumbra.GameData; using Penumbra.GameData;
using Penumbra.GameData.Files; using Penumbra.GameData.Files;
using Penumbra.Import.Models;
using Penumbra.Import.Models.Export; using Penumbra.Import.Models.Export;
using Penumbra.Meta.Manipulations; using Penumbra.Meta.Manipulations;
using Penumbra.String.Classes; using Penumbra.String.Classes;
@ -79,7 +80,7 @@ public partial class ModEditWindow
return; return;
} }
PendingIo = true; BeginIo();
var task = Task.Run(() => var task = Task.Run(() =>
{ {
// TODO: Is it worth trying to order results based on option priorities for cases where more than one match is found? // TODO: Is it worth trying to order results based on option priorities for cases where more than one match is found?
@ -93,9 +94,7 @@ public partial class ModEditWindow
task.ContinueWith(t => task.ContinueWith(t =>
{ {
RecordIoExceptions(t.Exception); GamePaths = FinalizeIo(task);
GamePaths = t.Result;
PendingIo = false;
}); });
} }
@ -132,33 +131,22 @@ public partial class ModEditWindow
return; return;
} }
PendingIo = true; BeginIo();
_edit._models.ExportToGltf(ExportConfig, Mdl, sklbPaths, ReadFile, outputPath) _edit._models.ExportToGltf(ExportConfig, Mdl, sklbPaths, ReadFile, outputPath)
.ContinueWith(task => .ContinueWith(FinalizeIo);
{
RecordIoExceptions(task.Exception);
if (task is { IsCompletedSuccessfully: true, Result: not null })
IoWarnings = task.Result.GetWarnings().ToList();
PendingIo = false;
});
} }
/// <summary> Import a model from an interchange format. </summary> /// <summary> Import a model from an interchange format. </summary>
/// <param name="inputPath"> Disk path to load model data from. </param> /// <param name="inputPath"> Disk path to load model data from. </param>
public void Import(string inputPath) public void Import(string inputPath)
{ {
PendingIo = true; BeginIo();
_edit._models.ImportGltf(inputPath) _edit._models.ImportGltf(inputPath)
.ContinueWith(task => .ContinueWith(task =>
{ {
RecordIoExceptions(task.Exception); var mdlFile = FinalizeIo(task, result => result.Item1, result => result.Item2);
if (task is { IsCompletedSuccessfully: true, Result: (not null, _) }) if (mdlFile != null)
{ FinalizeImport(mdlFile);
IoWarnings = task.Result.Item2.GetWarnings().ToList();
FinalizeImport(task.Result.Item1);
}
PendingIo = false;
}); });
} }
@ -255,6 +243,34 @@ public partial class ModEditWindow
target.ElementIds = [.. elementIds]; target.ElementIds = [.. elementIds];
} }
private void BeginIo()
{
PendingIo = true;
IoWarnings = [];
IoExceptions = [];
}
private void FinalizeIo(Task<IoNotifier> task)
=> FinalizeIo<IoNotifier, object?>(task, notifier => null, notifier => notifier);
private TResult? FinalizeIo<TResult>(Task<TResult> task)
=> FinalizeIo(task, result => result, null);
private TResult? FinalizeIo<TTask, TResult>(Task<TTask> task, Func<TTask, TResult> getResult, Func<TTask, IoNotifier>? getNotifier)
{
TResult? result = default;
RecordIoExceptions(task.Exception);
if (task is { IsCompletedSuccessfully: true, Result: not null })
{
result = getResult(task.Result);
if (getNotifier != null)
IoWarnings = getNotifier(task.Result).GetWarnings().ToList();
}
PendingIo = false;
return result;
}
private void RecordIoExceptions(Exception? exception) private void RecordIoExceptions(Exception? exception)
{ {
IoExceptions = exception switch IoExceptions = exception switch