From 7dfeb1730d9f9914b9c1629533c1d84a3563e1c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=B4=85=E1=B4=8A=CA=9F=E1=B4=8F=CA=803x=E1=B4=A2?= =?UTF-8?q?=E1=B4=8F?= <89230676+djlorenzouasset@users.noreply.github.com> Date: Sat, 14 Dec 2024 18:45:22 +0100 Subject: [PATCH 1/5] IOS token has been deprecated, use PC token instead --- FModel/ViewModels/ApiEndpoints/EpicApiEndpoint.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FModel/ViewModels/ApiEndpoints/EpicApiEndpoint.cs b/FModel/ViewModels/ApiEndpoints/EpicApiEndpoint.cs index 6b1eeea2..57a8c57a 100644 --- a/FModel/ViewModels/ApiEndpoints/EpicApiEndpoint.cs +++ b/FModel/ViewModels/ApiEndpoints/EpicApiEndpoint.cs @@ -16,7 +16,7 @@ namespace FModel.ViewModels.ApiEndpoints; public class EpicApiEndpoint : AbstractApiProvider { private const string _OAUTH_URL = "https://account-public-service-prod03.ol.epicgames.com/account/api/oauth/token"; - private const string _BASIC_TOKEN = "basic MzQ0NmNkNzI2OTRjNGE0NDg1ZDgxYjc3YWRiYjIxNDE6OTIwOWQ0YTVlMjVhNDU3ZmI5YjA3NDg5ZDMxM2I0MWE="; + private const string _BASIC_TOKEN = "basic ZWM2ODRiOGM2ODdmNDc5ZmFkZWEzY2IyYWQ4M2Y1YzY6ZTFmMzFjMjExZjI4NDEzMTg2MjYyZDM3YTEzZmM4NGQ="; private const string _APP_URL = "https://launcher-public-service-prod06.ol.epicgames.com/launcher/api/public/assets/v2/platform/Windows/namespace/fn/catalogItem/4fe75bbc5a674f4f9b356b5c90567da5/app/Fortnite/label/Live"; public EpicApiEndpoint(RestClient client) : base(client) { } From d48aea47448fb3a765077d20d9626cb17bbf83dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=B4=85=E1=B4=8A=CA=9F=E1=B4=8F=CA=803x=E1=B4=A2?= =?UTF-8?q?=E1=B4=8F?= <89230676+djlorenzouasset@users.noreply.github.com> Date: Sat, 14 Dec 2024 18:46:15 +0100 Subject: [PATCH 2/5] check if latest is downloadable --- FModel/ViewModels/UpdateViewModel.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/FModel/ViewModels/UpdateViewModel.cs b/FModel/ViewModels/UpdateViewModel.cs index f1ee7567..932d347a 100644 --- a/FModel/ViewModels/UpdateViewModel.cs +++ b/FModel/ViewModels/UpdateViewModel.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.ComponentModel; using System.Linq; using System.Threading.Tasks; @@ -10,6 +10,7 @@ using FModel.Settings; using FModel.ViewModels.ApiEndpoints.Models; using FModel.ViewModels.Commands; using FModel.Views.Resources.Converters; +using SharpGLTF.Schema2; namespace FModel.ViewModels; @@ -40,10 +41,13 @@ public class UpdateViewModel : ViewModel Commits.AddRange(await _apiEndpointView.GitHubApi.GetCommitHistoryAsync()); var qa = await _apiEndpointView.GitHubApi.GetReleaseAsync("qa"); - qa.Assets.OrderByDescending(x => x.CreatedAt).First().IsLatest = true; + var assets = qa.Assets.OrderByDescending(x => x.CreatedAt).ToList(); - foreach (var asset in qa.Assets) + for (var i = 0; i < assets.Count; i++) { + var asset = assets[i]; + asset.IsLatest = i == 0; + var commitSha = asset.Name.SubstringBeforeLast(".zip"); var commit = Commits.FirstOrDefault(x => x.Sha == commitSha); if (commit != null) @@ -69,6 +73,6 @@ public class UpdateViewModel : ViewModel public void DownloadLatest() { - Commits.FirstOrDefault(x => x.Asset.IsLatest)?.Download(); + Commits.FirstOrDefault(x => x.IsDownloadable && x.Asset.IsLatest)?.Download(); } } From 4385255426d18eb936064b8530b7404746655776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=B4=85=E1=B4=8A=CA=9F=E1=B4=8F=CA=803x=E1=B4=A2?= =?UTF-8?q?=E1=B4=8F?= <89230676+djlorenzouasset@users.noreply.github.com> Date: Sat, 14 Dec 2024 18:46:35 +0100 Subject: [PATCH 3/5] commits limit increased --- FModel/ViewModels/ApiEndpoints/GitHubApiEndpoint.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FModel/ViewModels/ApiEndpoints/GitHubApiEndpoint.cs b/FModel/ViewModels/ApiEndpoints/GitHubApiEndpoint.cs index 94fbb075..baf07bbf 100644 --- a/FModel/ViewModels/ApiEndpoints/GitHubApiEndpoint.cs +++ b/FModel/ViewModels/ApiEndpoints/GitHubApiEndpoint.cs @@ -1,4 +1,4 @@ -using System.Threading.Tasks; +using System.Threading.Tasks; using FModel.Framework; using FModel.ViewModels.ApiEndpoints.Models; using RestSharp; @@ -9,7 +9,7 @@ public class GitHubApiEndpoint : AbstractApiProvider { public GitHubApiEndpoint(RestClient client) : base(client) { } - public async Task GetCommitHistoryAsync(string branch = "dev", int page = 1, int limit = 20) + public async Task GetCommitHistoryAsync(string branch = "dev", int page = 1, int limit = 30) { var request = new FRestRequest(Constants.GH_COMMITS_HISTORY); request.AddParameter("sha", branch); From db988f68c993b53cbb5c4b22f1e321b93525b0e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=B4=85=E1=B4=8A=CA=9F=E1=B4=8F=CA=803x=E1=B4=A2?= =?UTF-8?q?=E1=B4=8F?= <89230676+djlorenzouasset@users.noreply.github.com> Date: Sat, 14 Dec 2024 18:46:53 +0100 Subject: [PATCH 4/5] changes --- FModel/Views/Snooper/Shading/Texture.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FModel/Views/Snooper/Shading/Texture.cs b/FModel/Views/Snooper/Shading/Texture.cs index d2d5f157..650e3138 100644 --- a/FModel/Views/Snooper/Shading/Texture.cs +++ b/FModel/Views/Snooper/Shading/Texture.cs @@ -235,8 +235,8 @@ public class Texture : IDisposable SnimGui.Layout("Type");ImGui.Text($" : ({Format}) {Name}"); SnimGui.TooltipCopy("(?) Click to Copy Path", Path); SnimGui.Layout("Guid");ImGui.Text($" : {Guid.ToString(EGuidFormats.UniqueObjectGuid)}"); - SnimGui.Layout("Import");ImGui.Text($" : {ImportedWidth}x{ImportedHeight}"); - SnimGui.Layout("Export");ImGui.Text($" : {Width}x{Height}"); + SnimGui.Layout("Size"); + ImGui.Text($" : {Width}x{Height}"); SnimGui.Layout("Swizzle"); for (int c = 0; c < SwizzleMask.Length; c++) From 9a7d7effa5e812dc427855e474413e279cc9799e Mon Sep 17 00:00:00 2001 From: Valentin Date: Sat, 14 Dec 2024 18:51:51 +0100 Subject: [PATCH 5/5] Update UpdateViewModel.cs --- FModel/ViewModels/UpdateViewModel.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/FModel/ViewModels/UpdateViewModel.cs b/FModel/ViewModels/UpdateViewModel.cs index 932d347a..b0727a3b 100644 --- a/FModel/ViewModels/UpdateViewModel.cs +++ b/FModel/ViewModels/UpdateViewModel.cs @@ -10,7 +10,6 @@ using FModel.Settings; using FModel.ViewModels.ApiEndpoints.Models; using FModel.ViewModels.Commands; using FModel.Views.Resources.Converters; -using SharpGLTF.Schema2; namespace FModel.ViewModels;