ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2026-02-22 15:57:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some off-by-one errors with the import progress reports, add test implementation for pbd editing.

Browse source
This commit is contained in:
Ottermandias 2024-10-09 18:47:30 +02:00
parent 2e424a693d
commit 4a0c996ff6
7 changed files with 368 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Penumbra/Import/TexToolsImporter.Gui.cs
View file

@ -46,21 +46,28 @@ public partial class TexToolsImporter
{
ImGui.NewLine();
ImGui.NewLine();
percentage = _currentNumOptions == 0 ? 1f : _currentOptionIdx / (float)_currentNumOptions;
ImGui.ProgressBar(percentage, size, $"Option {_currentOptionIdx + 1} / {_currentNumOptions}");
if (_currentOptionIdx >= _currentNumOptions)
ImGui.ProgressBar(1f, size, $"Extracted {_currentNumOptions} Options");
else
ImGui.ProgressBar(_currentOptionIdx / (float)_currentNumOptions, size,
$"Extracting Option {_currentOptionIdx + 1} / {_currentNumOptions}...");
ImGui.NewLine();
if (State != ImporterState.DeduplicatingFiles)
ImGui.TextUnformatted(
$"Extracting option {(_currentGroupName.Length == 0 ? string.Empty : $"{_currentGroupName} - ")}{_currentOptionName}...");
$"Extracting Option {(_currentGroupName.Length == 0 ? string.Empty : $"{_currentGroupName} - ")}{_currentOptionName}...");
}
ImGui.NewLine();
ImGui.NewLine();
percentage = _currentNumFiles == 0 ? 1f : _currentFileIdx / (float)_currentNumFiles;
ImGui.ProgressBar(percentage, size, $"File {_currentFileIdx + 1} / {_currentNumFiles}");
if (_currentFileIdx >= _currentNumFiles)
ImGui.ProgressBar(1f, size, $"Extracted {_currentNumFiles} Files");
else
ImGui.ProgressBar(_currentFileIdx / (float)_currentNumFiles, size, $"Extracting File {_currentFileIdx + 1} / {_currentNumFiles}...");
ImGui.NewLine();
if (State != ImporterState.DeduplicatingFiles)
ImGui.TextUnformatted($"Extracting file {_currentFileName}...");
ImGui.TextUnformatted($"Extracting File {_currentFileName}...");
return false;
}

2
Penumbra/Import/TexToolsImporter.ModPack.cs
View file

@ -151,6 +151,7 @@ public partial class TexToolsImporter
_currentGroupName = string.Empty;
_currentOptionName = "Default";
ExtractSimpleModList(_currentModDirectory, modList.SimpleModsList);
++_currentOptionIdx;
}
// Iterate through all pages
@ -208,6 +209,7 @@ public partial class TexToolsImporter
options.Insert(idx, MultiSubMod.WithoutGroup(option.Name, option.Description, ModPriority.Default));
if (option.IsChecked)
defaultSettings = Setting.Single(idx);
++_currentOptionIdx;
}
}