mirrors/kenji-nx
1
0
Fork 0
mirror of https://git.ryujinx.app/kenji-nx/ryujinx.git synced 2025-12-12 19:37:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

UI: Only show DLC RomFS button under Extract Data when DLCs are available.

Browse source 
Also convert the constructor of DlcSelectViewModel to expect a normal title id and not one already converted to the base ID.
This commit is contained in:
Evan Husted 2025-02-04 17:21:54 -06:00 • committed by KeatonTheBot
parent 2471bb8ede
commit d3bce3f361
5 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -126,6 +126,24 @@ namespace Ryujinx.UI.App.Common
return data;
}
public bool FindUpdate(ulong id, out TitleUpdateModel foundData)
{
Gommon.Optional<TitleUpdateModel> appData =
TitleUpdates.Keys.FindFirst(x => x.TitleId == id);
foundData = appData.HasValue ? appData.Value : null;
return appData.HasValue;
}
public TitleUpdateModel[] FindUpdatesFor(ulong id)
=> TitleUpdates.Keys.Where(x => x.TitleIdBase == (id & ~0x1FFFUL)).ToArray();
public DownloadableContentModel[] FindDlcsFor(ulong id)
=> DownloadableContents.Keys.Where(x => x.TitleIdBase == (id & ~0x1FFFUL)).ToArray();
public bool HasDlcs(ulong id)
=> DownloadableContents.Keys.Any(x => x.TitleIdBase == (id & ~0x1FFFUL));
/// <exception cref="LibHac.Common.Keys.MissingKeyException">The configured key set is missing a key.</exception>
/// <exception cref="InvalidDataException">The NCA header could not be decrypted.</exception>

1
src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
View file

@ -98,6 +98,7 @@
Header="{locale:Locale GameListContextMenuExtractDataRomFS}"
ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataRomFSToolTip}" />
<MenuItem
IsVisible="{Binding HasDlc}"
Click="ExtractAocRomFs_Click"
Header="{locale:Locale GameListContextMenuExtractDataAocRomFS}"
ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataAocRomFSToolTip}" />

2
src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
View file

@ -378,7 +378,7 @@ namespace Ryujinx.Ava.UI.Controls
if (sender is not MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
return;
DownloadableContentModel selectedDlc = await DlcSelectView.Show(viewModel.SelectedApplication.IdBase, viewModel.ApplicationLibrary);
DownloadableContentModel selectedDlc = await DlcSelectView.Show(viewModel.SelectedApplication.Id, viewModel.ApplicationLibrary);
if (selectedDlc is not null)
{

4
src/Ryujinx/UI/ViewModels/DlcSelectViewModel.cs
View file

@ -34,9 +34,7 @@ namespace Ryujinx.Ava.UI.ViewModels
public DlcSelectViewModel(ulong titleId, ApplicationLibrary appLibrary)
{
_dlcs = appLibrary.DownloadableContents.Items
.Where(x => x.Dlc.TitleIdBase == titleId)
.Select(x => x.Dlc)
_dlcs = appLibrary.FindDlcsFor(titleId)
.OrderBy(it => it.IsBundled ? 0 : 1)
.ThenBy(it => it.TitleId)
.ToArray();

2
src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
View file

@ -481,6 +481,8 @@ namespace Ryujinx.Ava.UI.ViewModels
}
}
public bool HasDlc => ApplicationLibrary.HasDlcs(SelectedApplication.Id);
public string CacheLoadStatus
{
get => _cacheLoadStatus;