mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Thanks gdk

Browse source
This commit is contained in:
Isaac Marovitz 2024-07-20 12:23:26 +01:00
commit ffe2e0d35a
No known key found for this signature in database
GPG key ID: 97250B2B09A132E1
2 changed files with 13 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Ryujinx/UI/Models/TitleUpdateModel.cs
View file

@ -5,17 +5,17 @@ namespace Ryujinx.Ava.UI.Models
{ {
public class TitleUpdateModel public class TitleUpdateModel
{ {
public ApplicationControlProperty Control { get; } public uint Version { get; }
public string Path { get; } public string Path { get; }
public string Label { get; }
public string Label => LocaleManager.Instance.UpdateAndGetDynamicValue( public TitleUpdateModel(uint version, string displayVersion, string path)
System.IO.Path.GetExtension(Path)?.ToLower() == ".xci" ? LocaleKeys.TitleBundledUpdateVersionLabel : LocaleKeys.TitleUpdateVersionLabel,
Control.DisplayVersionString.ToString()
);
public TitleUpdateModel(ApplicationControlProperty control, string path)
{ {
Control = control; Version = version;
Label = LocaleManager.Instance.UpdateAndGetDynamicValue(
System.IO.Path.GetExtension(path)?.ToLower() == ".xci" ? LocaleKeys.TitleBundledUpdateVersionLabel : LocaleKeys.TitleUpdateVersionLabel,
displayVersion
);
Path = path; Path = path;
} }
} }

26
src/Ryujinx/UI/ViewModels/TitleUpdateViewModel.cs
View file

@ -131,29 +131,11 @@ namespace Ryujinx.Ava.UI.ViewModels
public void SortUpdates() public void SortUpdates()
{ {
var list = TitleUpdates.ToList(); var sortedUpdates = TitleUpdates.OrderByDescending(update => update.Version);
list.Sort((first, second) =>
{
var firstVersion = first.Control.DisplayVersionString.ToString();
var secondVersion = second.Control.DisplayVersionString.ToString();
if (string.IsNullOrEmpty(firstVersion))
{
return -1;
}
if (string.IsNullOrEmpty(secondVersion))
{
return 1;
}
return String.Compare(firstVersion, secondVersion, StringComparison.InvariantCulture) * -1;
});
Views.Clear(); Views.Clear();
Views.Add(new BaseModel()); Views.Add(new BaseModel());
Views.AddRange(list); Views.AddRange(sortedUpdates);
if (SelectedUpdate == null) if (SelectedUpdate == null)
{ {
@ -207,7 +189,9 @@ namespace Ryujinx.Ava.UI.ViewModels
controlNca.OpenFileSystem(NcaSectionType.Data, IntegrityCheckLevel.None).OpenFile(ref nacpFile.Ref, "/control.nacp".ToU8Span(), OpenMode.Read).ThrowIfFailure(); controlNca.OpenFileSystem(NcaSectionType.Data, IntegrityCheckLevel.None).OpenFile(ref nacpFile.Ref, "/control.nacp".ToU8Span(), OpenMode.Read).ThrowIfFailure();
nacpFile.Get.Read(out _, 0, SpanHelpers.AsByteSpan(ref controlData), ReadOption.None).ThrowIfFailure(); nacpFile.Get.Read(out _, 0, SpanHelpers.AsByteSpan(ref controlData), ReadOption.None).ThrowIfFailure();
TitleUpdates.Add(new TitleUpdateModel(controlData, path)); var displayVersion = controlData.DisplayVersionString.ToString();
TitleUpdates.Add(new TitleUpdateModel(content.Version.Version, displayVersion, path));
} }
else else
{ {