diff --git a/FModel/ViewModels/ApiEndpoints/Models/FModelResponse.cs b/FModel/ViewModels/ApiEndpoints/Models/FModelResponse.cs index bae4f4b2..5719714e 100644 --- a/FModel/ViewModels/ApiEndpoints/Models/FModelResponse.cs +++ b/FModel/ViewModels/ApiEndpoints/Models/FModelResponse.cs @@ -5,6 +5,7 @@ using CUE4Parse.UE4.Versions; using FModel.Creator; using FModel.Extensions; using FModel.Framework; +using FModel.Settings; using SkiaSharp; using J = Newtonsoft.Json.JsonPropertyAttribute; @@ -15,12 +16,20 @@ public class GitHubRelease [J("assets")] public GitHubAsset[] Assets { get; private set; } } -public class GitHubAsset +public class GitHubAsset : ViewModel { [J("name")] public string Name { get; private set; } [J("size")] public int Size { get; private set; } [J("download_count")] public int DownloadCount { get; private set; } [J("browser_download_url")] public string BrowserDownloadUrl { get; private set; } + [J("created_at")] public DateTime CreatedAt { get; private set; } + + private bool _isLatest; + public bool IsLatest + { + get => _isLatest; + set => SetProperty(ref _isLatest, value); + } } public class GitHubCommit : ViewModel @@ -40,6 +49,8 @@ public class GitHubCommit : ViewModel } } + public bool IsCurrent => Sha == UserSettings.Default.CommitHash; + public string ShortSha => Sha[..7]; public bool IsDownloadable => Asset != null; } diff --git a/FModel/ViewModels/UpdateViewModel.cs b/FModel/ViewModels/UpdateViewModel.cs index 876a4558..af2b1319 100644 --- a/FModel/ViewModels/UpdateViewModel.cs +++ b/FModel/ViewModels/UpdateViewModel.cs @@ -45,6 +45,8 @@ public class UpdateViewModel : ViewModel #else var qa = await _apiEndpointView.FModelApi.GetGitHubReleaseAsync("qa"); #endif + + qa.Assets.OrderByDescending(x => x.CreatedAt).First().IsLatest = true; foreach (var asset in qa.Assets) { var commitSha = asset.Name.SubstringBeforeLast(".zip"); diff --git a/FModel/Views/Resources/Controls/CommitControl.xaml b/FModel/Views/Resources/Controls/CommitControl.xaml index 33d288bd..e55327fe 100644 --- a/FModel/Views/Resources/Controls/CommitControl.xaml +++ b/FModel/Views/Resources/Controls/CommitControl.xaml @@ -65,7 +65,7 @@ - + + + + + + + + + + @@ -36,9 +76,10 @@ -