Added progress for scanning XCI files which can take a few seconds when there are lots of XCI files.

This commit is contained in:
Aaron Murgatroyd 2025-05-18 22:18:06 +10:00
parent 55adb63855
commit d587b14889
3 changed files with 53 additions and 6 deletions

View file

@ -3197,6 +3197,31 @@
"zh_TW": "正在修剪 XCI 檔案 '{0}'" "zh_TW": "正在修剪 XCI 檔案 '{0}'"
} }
}, },
{
"ID": "StatusBarXCIFileScanning",
"Translations": {
"ar_SA": "",
"de_DE": "",
"el_GR": "",
"en_US": "Scanning XCI Files...",
"es_ES": "",
"fr_FR": "",
"he_IL": "",
"it_IT": "",
"ja_JP": "",
"ko_KR": "",
"no_NO": "",
"pl_PL": "",
"pt_BR": "",
"ru_RU": "",
"sv_SE": "",
"th_TH": "",
"tr_TR": "",
"uk_UA": "",
"zh_CN": "",
"zh_TW": ""
}
},
{ {
"ID": "LinuxVmMaxMapCountDialogTitle", "ID": "LinuxVmMaxMapCountDialogTitle",
"Translations": { "Translations": {

View file

@ -1845,7 +1845,7 @@ namespace Ryujinx.Ava.UI.ViewModels
} }
} }
public async void ProcessTrimResult(String filename, XCIFileTrimmer.OperationOutcome operationOutcome) public async Task ProcessTrimResult(String filename, XCIFileTrimmer.OperationOutcome operationOutcome)
{ {
string notifyUser = operationOutcome.ToLocalisedText(); string notifyUser = operationOutcome.ToLocalisedText();

View file

@ -10,7 +10,6 @@ using Ryujinx.Ava.Systems.AppLibrary;
using Ryujinx.Common.Utilities; using Ryujinx.Common.Utilities;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using static Ryujinx.Common.Utilities.XCIFileTrimmer; using static Ryujinx.Common.Utilities.XCIFileTrimmer;
@ -57,11 +56,34 @@ namespace Ryujinx.Ava.UI.ViewModels
private void LoadXCIApplications() private void LoadXCIApplications()
{ {
IEnumerable<ApplicationData> apps = ApplicationLibrary.Applications.Items try
.Where(app => app.FileExtension == _FileExtXCI); {
_mainWindowViewModel.StatusBarProgressStatusText = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.StatusBarXCIFileScanning);
_mainWindowViewModel.StatusBarProgressStatusVisible = true;
_mainWindowViewModel.StatusBarProgressMaximum = 1;
_mainWindowViewModel.StatusBarProgressValue = 0;
_mainWindowViewModel.StatusBarVisible = true;
foreach (ApplicationData xciApp in apps) IEnumerable<ApplicationData> apps = ApplicationLibrary.Applications.Items
AddOrUpdateXCITrimmerFile(CreateXCITrimmerFile(xciApp.Path)); .Where(app => app.FileExtension == _FileExtXCI).ToArray();
_mainWindowViewModel.StatusBarProgressMaximum = apps.Count();
_mainWindowViewModel.StatusBarProgressValue = 0;
int appsProcessed = 0;
foreach (ApplicationData xciApp in apps)
{
AddOrUpdateXCITrimmerFile(CreateXCITrimmerFile(xciApp.Path));
_mainWindowViewModel.StatusBarProgressValue = ++appsProcessed;
Dispatcher.UIThread.InvokeAsync(() => { }, DispatcherPriority.Render).Wait();
}
}
finally
{
_mainWindowViewModel.StatusBarProgressStatusVisible = false;
_mainWindowViewModel.StatusBarProgressStatusText = string.Empty;
_mainWindowViewModel.StatusBarVisible = false;
}
ApplicationsChanged(); ApplicationsChanged();
} }