ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2026-02-19 06:17:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Improve deduplicator and normalizer.

Browse source
This commit is contained in:
Ottermandias 2023-05-27 13:57:01 +02:00
parent f938531e21
commit 0243e7a633
3 changed files with 45 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Penumbra/UI/AdvancedWindow/ModEditWindow.cs
View file

@ -126,7 +126,7 @@ public partial class ModEditWindow : Window, IDisposable
if (swaps > 0)
sb.Append($" | {swaps} Swaps");
_allowReduplicate = redirections != _editor.Files.Available.Count || _editor.Files.Available.Count > 0;
_allowReduplicate = redirections != _editor.Files.Available.Count || _editor.Files.Missing.Count > 0 || unused > 0;
sb.Append(WindowBaseLabel);
WindowName = sb.ToString();
}
@ -275,10 +275,17 @@ public partial class ModEditWindow : Window, IDisposable
if (!tab)
return;
var buttonText = _editor.Duplicates.Finished ? "Scan for Duplicates###ScanButton" : "Scanning for Duplicates...###ScanButton";
if (ImGuiUtil.DrawDisabledButton(buttonText, Vector2.Zero, "Search for identical files in this mod. This may take a while.",
!_editor.Duplicates.Finished))
_editor.Duplicates.StartDuplicateCheck(_editor.Files.Available);
if (_editor.Duplicates.Worker.IsCompleted)
{
if (ImGuiUtil.DrawDisabledButton("Scan for Duplicates", Vector2.Zero,
"Search for identical files in this mod. This may take a while.", false))
_editor.Duplicates.StartDuplicateCheck(_editor.Files.Available);
}
else
{
if (ImGuiUtil.DrawDisabledButton("Cancel Scanning for Duplicates", Vector2.Zero, "Cancel the current scanning operation...", false))
_editor.Duplicates.Clear();
}
const string desc =
"Tries to create a unique copy of a file for every game path manipulated and put them in [Groupname]/[Optionname]/[GamePath] order.\n"
@ -290,28 +297,21 @@ public partial class ModEditWindow : Window, IDisposable
var tt = _allowReduplicate ? desc :
modifier ? desc : desc + $"\n\nNo duplicates detected! Hold {_config.DeleteModModifier} to force normalization anyway.";
if (ImGuiUtil.DrawDisabledButton("Re-Duplicate and Normalize Mod", Vector2.Zero, tt, !_allowReduplicate && !modifier))
{
_editor.ModNormalizer.Normalize(_mod!);
_editor.LoadMod(_mod!, _editor.GroupIdx, _editor.OptionIdx);
}
if (_editor.ModNormalizer.Running)
{
using var popup = ImRaii.Popup("Normalization", ImGuiWindowFlags.Modal);
ImGui.ProgressBar((float)_editor.ModNormalizer.Step / _editor.ModNormalizer.TotalSteps,
new Vector2(300 * UiHelpers.Scale, ImGui.GetFrameHeight()),
$"{_editor.ModNormalizer.Step} / {_editor.ModNormalizer.TotalSteps}");
}
if (!_editor.Duplicates.Finished)
else if(ImGuiUtil.DrawDisabledButton("Re-Duplicate and Normalize Mod", Vector2.Zero, tt, !_allowReduplicate && !modifier))
{
ImGui.SameLine();
if (ImGui.Button("Cancel"))
_editor.Duplicates.Clear();
return;
_editor.ModNormalizer.Normalize(_mod!);
_editor.ModNormalizer.Worker.ContinueWith(_ => _editor.LoadMod(_mod!, _editor.GroupIdx, _editor.OptionIdx));
}
if (!_editor.Duplicates.Worker.IsCompleted)
return;
if (_editor.Duplicates.Duplicates.Count == 0)
{
ImGui.NewLine();