Mirror/Ryujinx
3
5
Fork 13
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2024-11-24 06:34:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Include content data foreach-loop in try-catch (#7036)

Browse source
This commit is contained in:
TSRBerry 2024-07-18 00:02:20 +02:00 committed by GitHub
parent 6fbf279fac
commit f77bebac80
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
View file

@ -175,22 +175,22 @@ namespace Ryujinx.UI.App.Common
var applications = new List<ApplicationData>(); var applications = new List<ApplicationData>();
string extension = Path.GetExtension(filePath).ToLower(); string extension = Path.GetExtension(filePath).ToLower();
foreach ((ulong titleId, ContentMetaData content) in pfs.GetContentData(ContentMetaType.Application, _virtualFileSystem, _checkLevel)) try
{ {
ApplicationData applicationData = new() foreach ((ulong titleId, ContentMetaData content) in pfs.GetContentData(ContentMetaType.Application, _virtualFileSystem, _checkLevel))
{ {
Id = titleId, ApplicationData applicationData = new()
Path = filePath, {
}; Id = titleId,
Path = filePath,
};
try
{
Nca mainNca = content.GetNcaByType(_virtualFileSystem.KeySet, ContentType.Program); Nca mainNca = content.GetNcaByType(_virtualFileSystem.KeySet, ContentType.Program);
Nca controlNca = content.GetNcaByType(_virtualFileSystem.KeySet, ContentType.Control); Nca controlNca = content.GetNcaByType(_virtualFileSystem.KeySet, ContentType.Control);
BlitStruct<ApplicationControlProperty> controlHolder = new(1); BlitStruct<ApplicationControlProperty> controlHolder = new(1);
IFileSystem controlFs = controlNca?.OpenFileSystem(NcaSectionType.Data, IntegrityCheckLevel.None); IFileSystem controlFs = controlNca?.OpenFileSystem(NcaSectionType.Data, _checkLevel);
// Check if there is an update available. // Check if there is an update available.
if (IsUpdateApplied(mainNca, out IFileSystem updatedControlFs)) if (IsUpdateApplied(mainNca, out IFileSystem updatedControlFs))
@ -199,6 +199,11 @@ namespace Ryujinx.UI.App.Common
controlFs = updatedControlFs; controlFs = updatedControlFs;
} }
if (controlFs == null)
{
continue;
}
ReadControlData(controlFs, controlHolder.ByteSpan); ReadControlData(controlFs, controlHolder.ByteSpan);
GetApplicationInformation(ref controlHolder.Value, ref applicationData); GetApplicationInformation(ref controlHolder.Value, ref applicationData);
@ -246,22 +251,18 @@ namespace Ryujinx.UI.App.Common
applications.Add(applicationData); applications.Add(applicationData);
} }
catch (MissingKeyException exception) }
{ catch (MissingKeyException exception)
applicationData.Icon = extension == ".xci" ? _xciIcon : _nspIcon; {
Logger.Warning?.Print(LogClass.Application, $"Your key set is missing a key with the name: {exception.Name}");
Logger.Warning?.Print(LogClass.Application, $"Your key set is missing a key with the name: {exception.Name}"); }
} catch (InvalidDataException)
catch (InvalidDataException) {
{ Logger.Warning?.Print(LogClass.Application, $"The header key is incorrect or missing and therefore the NCA header content type check has failed. Errored File: {filePath}");
applicationData.Icon = extension == ".xci" ? _xciIcon : _nspIcon; }
catch (Exception exception)
Logger.Warning?.Print(LogClass.Application, $"The header key is incorrect or missing and therefore the NCA header content type check has failed. Errored File: {filePath}"); {
} Logger.Warning?.Print(LogClass.Application, $"The file encountered was not of a valid type. File: '{filePath}' Error: {exception}");
catch (Exception exception)
{
Logger.Warning?.Print(LogClass.Application, $"The file encountered was not of a valid type. File: '{filePath}' Error: {exception}");
}
} }
return applications; return applications;