aboutsummaryrefslogtreecommitdiff
path: root/src/Ryujinx.Ui.Common/App/ApplicationData.cs
diff options
context:
space:
mode:
authorTSRBerry <20988865+TSRBerry@users.noreply.github.com>2023-11-11 21:56:57 +0100
committerGitHub <noreply@github.com>2023-11-11 21:56:57 +0100
commit5c3cfb84c09b0566da677425915afa0b2d76da55 (patch)
treed53c683c3ed3e685bec5b16ca661755d8815f66e /src/Ryujinx.Ui.Common/App/ApplicationData.cs
parent55557525b16f8256d91f769e026874b5c70c3b2d (diff)
Add support for multi game XCIs (#5638)
* Add default values to ApplicationData directly * Refactor application loading It should now be possible to load multi game XCIs. Included updates won't be detected for now. Opening a game from the command line currently only opens the first one. * Only include program NCAs where at least one tuple item is not null * Get application data by title id and add programIndex check back * Refactor application loading again and remove duplicate code * Actually use patch ncas for updates * Fix number of applications found with multi game xcis * Don't load bundled updates from multi game xcis * Change ApplicationData.TitleId type to ulong & Add TitleIdString property * Use cnmt files and ContentCollection to load programs * Ava: Add updates and DLCs from gamecarts * Get the cnmt file from its NCA * Ava: Identify bundled updates in updater window * Fix the (hopefully) last few bugs * Add idOffset parameter to GetNcaByType * Handle missing file for dlc.json * Ava: Shorten error message for invalid files * Gtk: Add additional string for bundled updates in TitleUpdateWindow * Hopefully fix DLC issues * Apply formatting * Finally fix DLC issues * Adjust property names and fileSize field * Read the correct update file * Fix wrong casing for application id strings * Rename TitleId to ApplicationId * Address review comments * Fix formatting issues * Apply suggestions from code review Co-authored-by: gdkchan <gab.dark.100@gmail.com> * Gracefully fail when loading pfs for update and dlc window * Fix applications with multiple programs * Fix DLCWindow crash on GTK * Fix some GUI issues * Remove IsXci again --------- Co-authored-by: gdkchan <gab.dark.100@gmail.com>
Diffstat (limited to 'src/Ryujinx.Ui.Common/App/ApplicationData.cs')
-rw-r--r--src/Ryujinx.Ui.Common/App/ApplicationData.cs18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/Ryujinx.Ui.Common/App/ApplicationData.cs b/src/Ryujinx.Ui.Common/App/ApplicationData.cs
index 65ab01ee..7495ccb5 100644
--- a/src/Ryujinx.Ui.Common/App/ApplicationData.cs
+++ b/src/Ryujinx.Ui.Common/App/ApplicationData.cs
@@ -9,9 +9,11 @@ using LibHac.Tools.FsSystem;
using LibHac.Tools.FsSystem.NcaUtils;
using Ryujinx.Common.Logging;
using Ryujinx.HLE.FileSystem;
+using Ryujinx.HLE.Loaders.Processes.Extensions;
using Ryujinx.Ui.Common.Helper;
using System;
using System.IO;
+using System.Text.Json.Serialization;
namespace Ryujinx.Ui.App.Common
{
@@ -19,10 +21,10 @@ namespace Ryujinx.Ui.App.Common
{
public bool Favorite { get; set; }
public byte[] Icon { get; set; }
- public string TitleName { get; set; }
- public string TitleId { get; set; }
- public string Developer { get; set; }
- public string Version { get; set; }
+ public string Name { get; set; } = "Unknown";
+ public ulong Id { get; set; }
+ public string Developer { get; set; } = "Unknown";
+ public string Version { get; set; } = "0";
public TimeSpan TimePlayed { get; set; }
public DateTime? LastPlayed { get; set; }
public string FileExtension { get; set; }
@@ -36,7 +38,11 @@ namespace Ryujinx.Ui.App.Common
public string FileSizeString => ValueFormatUtils.FormatFileSize(FileSize);
- public static string GetApplicationBuildId(VirtualFileSystem virtualFileSystem, string titleFilePath)
+ [JsonIgnore] public string IdString => Id.ToString("x16");
+
+ [JsonIgnore] public ulong IdBase => Id & ~0x1FFFUL;
+
+ public static string GetBuildId(VirtualFileSystem virtualFileSystem, IntegrityCheckLevel checkLevel, string titleFilePath)
{
using FileStream file = new(titleFilePath, FileMode.Open, FileAccess.Read);
@@ -105,7 +111,7 @@ namespace Ryujinx.Ui.App.Common
return string.Empty;
}
- (Nca updatePatchNca, _) = ApplicationLibrary.GetGameUpdateData(virtualFileSystem, mainNca.Header.TitleId.ToString("x16"), 0, out _);
+ (Nca updatePatchNca, _) = mainNca.GetUpdateData(virtualFileSystem, checkLevel, 0, out string _);
if (updatePatchNca != null)
{