N-archive/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libhac: use ApplicationControlProperty instead of Nacp (#1073)

Browse source 
* libhac: use ApplicationControlProperty instead of Nacp

Nacp was marked as deprecated in 0.10.0, this PR remove all usage of it
from Ryujinx and use the new struct ApplicationControlProperty.

* Address Moose's comment
This commit is contained in:
Thog 2020-04-03 12:01:26 +02:00 committed by GitHub
parent 4d93f97408
commit f70cc96464
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
Ryujinx/Ui/ApplicationLibrary.cs
View file

@ -217,12 +217,10 @@ namespace Ryujinx.Ui
// Creates NACP class from the NACP file // Creates NACP class from the NACP file
controlFs.OpenFile(out IFile controlNacpFile, "/control.nacp".ToU8Span(), OpenMode.Read).ThrowIfFailure(); controlFs.OpenFile(out IFile controlNacpFile, "/control.nacp".ToU8Span(), OpenMode.Read).ThrowIfFailure();
Nacp controlData = new Nacp(controlNacpFile.AsStream());
// Get the title name, title ID, developer name and version number from the NACP // Get the title name, title ID, developer name and version number from the NACP
version = controlData.DisplayVersion; version = controlHolder.Value.DisplayVersion.ToString();
GetNameIdDeveloper(controlData, out titleName, out _, out developer); GetNameIdDeveloper(ref controlHolder.Value, out titleName, out _, out developer);
// Read the icon from the ControlFS and store it as a byte array // Read the icon from the ControlFS and store it as a byte array
try try
@ -318,17 +316,13 @@ namespace Ryujinx.Ui
// Reads and stores game icon as byte array // Reads and stores game icon as byte array
applicationIcon = Read(assetOffset + iconOffset, (int) iconSize); applicationIcon = Read(assetOffset + iconOffset, (int) iconSize);
// Creates memory stream out of byte array which is the NACP // Read the NACP data
using (MemoryStream stream = new MemoryStream(Read(assetOffset + (int) nacpOffset, (int) nacpSize))) Read(assetOffset + (int)nacpOffset, (int)nacpSize).AsSpan().CopyTo(controlHolder.ByteSpan);
{
// Creates NACP class from the memory stream
Nacp controlData = new Nacp(stream);
// Get the title name, title ID, developer name and version number from the NACP // Get the title name, title ID, developer name and version number from the NACP
version = controlData.DisplayVersion; version = controlHolder.Value.DisplayVersion.ToString();
GetNameIdDeveloper(controlData, out titleName, out titleId, out developer); GetNameIdDeveloper(ref controlHolder.Value, out titleName, out titleId, out developer);
}
} }
else else
{ {
@ -579,40 +573,52 @@ namespace Ryujinx.Ui
return readableString; return readableString;
} }
private static void GetNameIdDeveloper(Nacp controlData, out string titleName, out string titleId, out string developer) private static void GetNameIdDeveloper(ref ApplicationControlProperty controlData, out string titleName, out string titleId, out string publisher)
{ {
Enum.TryParse(_desiredTitleLanguage.ToString(), out TitleLanguage desiredTitleLanguage); Enum.TryParse(_desiredTitleLanguage.ToString(), out TitleLanguage desiredTitleLanguage);
NacpDescription nacpDescription = controlData.Descriptions.ToList().Find(x => x.Language == desiredTitleLanguage); if (controlData.Titles.Length > (int)desiredTitleLanguage)
if (nacpDescription != null)
{ {
titleName = nacpDescription.Title; titleName = controlData.Titles[(int)desiredTitleLanguage].Name.ToString();
developer = nacpDescription.Developer; publisher = controlData.Titles[(int)desiredTitleLanguage].Publisher.ToString();
} }
else else
{ {
titleName = null; titleName = null;
developer = null; publisher = null;
} }
if (string.IsNullOrWhiteSpace(titleName)) if (string.IsNullOrWhiteSpace(titleName))
{ {
titleName = controlData.Descriptions.ToList().Find(x => !string.IsNullOrWhiteSpace(x.Title)).Title; foreach (ApplicationControlTitle controlTitle in controlData.Titles)
{
if (!((U8Span)controlTitle.Name).IsEmpty())
{
titleName = controlTitle.Name.ToString();
break;
}
}
} }
if (string.IsNullOrWhiteSpace(developer)) if (string.IsNullOrWhiteSpace(publisher))
{ {
developer = controlData.Descriptions.ToList().Find(x => !string.IsNullOrWhiteSpace(x.Developer)).Developer; foreach (ApplicationControlTitle controlTitle in controlData.Titles)
{
if (!((U8Span)controlTitle.Publisher).IsEmpty())
{
publisher = controlTitle.Publisher.ToString();
break;
}
}
} }
if (controlData.PresenceGroupId != 0) if (controlData.PresenceGroupId != 0)
{ {
titleId = controlData.PresenceGroupId.ToString("x16"); titleId = controlData.PresenceGroupId.ToString("x16");
} }
else if (controlData.SaveDataOwnerId != 0) else if (controlData.SaveDataOwnerId.Value != 0)
{ {
titleId = controlData.SaveDataOwnerId.ToString("x16"); titleId = controlData.SaveDataOwnerId.ToString();
} }
else if (controlData.AddOnContentBaseId != 0) else if (controlData.AddOnContentBaseId != 0)
{ {