Compare commits
3 Commits
Canary-1.2
...
Canary-1.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
222ceb818b | ||
|
|
b0fcc5bee1 | ||
|
|
820e8f7375 |
@@ -69,8 +69,7 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
|
|
||||||
private void LoadDownloadableContents()
|
private void LoadDownloadableContents()
|
||||||
{
|
{
|
||||||
IEnumerable<(DownloadableContentModel Dlc, bool IsEnabled)> dlcs = _applicationLibrary.DownloadableContents.Items
|
(DownloadableContentModel Dlc, bool IsEnabled)[] dlcs = _applicationLibrary.FindDlcConfigurationFor(_applicationData.Id);
|
||||||
.Where(it => it.Dlc.TitleIdBase == _applicationData.IdBase);
|
|
||||||
|
|
||||||
bool hasBundledContent = false;
|
bool hasBundledContent = false;
|
||||||
foreach ((DownloadableContentModel dlc, bool isEnabled) in dlcs)
|
foreach ((DownloadableContentModel dlc, bool isEnabled) in dlcs)
|
||||||
|
|||||||
@@ -349,16 +349,7 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool HasCompatibilityEntry
|
public bool HasCompatibilityEntry => SelectedApplication.HasPlayabilityInfo;
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
DynamicData.Kernel.Optional<ApplicationData> appData =
|
|
||||||
ApplicationLibrary.Applications.Lookup(SelectedApplication.Id);
|
|
||||||
|
|
||||||
return appData.HasValue && appData.Value.HasPlayabilityInfo;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool HasDlc => ApplicationLibrary.HasDlcs(SelectedApplication.Id);
|
public bool HasDlc => ApplicationLibrary.HasDlcs(SelectedApplication.Id);
|
||||||
|
|
||||||
|
|||||||
@@ -41,8 +41,7 @@ namespace Ryujinx.Ava.UI.ViewModels
|
|||||||
|
|
||||||
private void LoadUpdates()
|
private void LoadUpdates()
|
||||||
{
|
{
|
||||||
IEnumerable<(TitleUpdateModel TitleUpdate, bool IsSelected)> updates = ApplicationLibrary.TitleUpdates.Items
|
(TitleUpdateModel TitleUpdate, bool IsSelected)[] updates = ApplicationLibrary.FindUpdateConfigurationFor(ApplicationData.Id);
|
||||||
.Where(it => it.TitleUpdate.TitleIdBase == ApplicationData.IdBase);
|
|
||||||
|
|
||||||
bool hasBundledContent = false;
|
bool hasBundledContent = false;
|
||||||
SelectedUpdate = new TitleUpdateViewModelNoUpdate();
|
SelectedUpdate = new TitleUpdateViewModelNoUpdate();
|
||||||
|
|||||||
@@ -128,11 +128,16 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
|
|||||||
DynamicData.Kernel.Optional<ApplicationData> appData = Applications.Lookup(id);
|
DynamicData.Kernel.Optional<ApplicationData> appData = Applications.Lookup(id);
|
||||||
if (appData.HasValue)
|
if (appData.HasValue)
|
||||||
return appData.Value.Name;
|
return appData.Value.Name;
|
||||||
|
|
||||||
if (DownloadableContents.Keys.FindFirst(x => x.TitleId == id).TryGet(out DownloadableContentModel dlcData))
|
|
||||||
return Path.GetFileNameWithoutExtension(dlcData.FileName);
|
|
||||||
|
|
||||||
return id.ToString("X16");
|
if (!DownloadableContents.Keys.FindFirst(x => x.TitleId == id).TryGet(out DownloadableContentModel dlcData))
|
||||||
|
return id.ToString("X16");
|
||||||
|
|
||||||
|
string name = Path.GetFileNameWithoutExtension(dlcData.FileName)!;
|
||||||
|
int idx = name.IndexOf('[');
|
||||||
|
if (idx != -1)
|
||||||
|
name = name[..idx];
|
||||||
|
|
||||||
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool FindApplication(ulong id, out ApplicationData foundData)
|
public bool FindApplication(ulong id, out ApplicationData foundData)
|
||||||
@@ -155,9 +160,15 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
|
|||||||
public TitleUpdateModel[] FindUpdatesFor(ulong id)
|
public TitleUpdateModel[] FindUpdatesFor(ulong id)
|
||||||
=> TitleUpdates.Keys.Where(x => x.TitleIdBase == (id & ~0x1FFFUL)).ToArray();
|
=> TitleUpdates.Keys.Where(x => x.TitleIdBase == (id & ~0x1FFFUL)).ToArray();
|
||||||
|
|
||||||
|
public (TitleUpdateModel TitleUpdate, bool IsSelected)[] FindUpdateConfigurationFor(ulong id)
|
||||||
|
=> TitleUpdates.Items.Where(x => x.TitleUpdate.TitleIdBase == (id & ~0x1FFFUL)).ToArray();
|
||||||
|
|
||||||
public DownloadableContentModel[] FindDlcsFor(ulong id)
|
public DownloadableContentModel[] FindDlcsFor(ulong id)
|
||||||
=> DownloadableContents.Keys.Where(x => x.TitleIdBase == (id & ~0x1FFFUL)).ToArray();
|
=> DownloadableContents.Keys.Where(x => x.TitleIdBase == (id & ~0x1FFFUL)).ToArray();
|
||||||
|
|
||||||
|
public (DownloadableContentModel Dlc, bool IsEnabled)[] FindDlcConfigurationFor(ulong id)
|
||||||
|
=> DownloadableContents.Items.Where(x => x.Dlc.TitleIdBase == (id & ~0x1FFFUL)).ToArray();
|
||||||
|
|
||||||
public bool HasDlcs(ulong id)
|
public bool HasDlcs(ulong id)
|
||||||
=> DownloadableContents.Keys.Any(x => x.TitleIdBase == (id & ~0x1FFFUL));
|
=> DownloadableContents.Keys.Any(x => x.TitleIdBase == (id & ~0x1FFFUL));
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user