aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Ava/Modules
diff options
context:
space:
mode:
authorgdkchan <gab.dark.100@gmail.com>2023-03-21 20:14:46 -0300
committerGitHub <noreply@github.com>2023-03-21 20:14:46 -0300
commitba95ee54abf4905d38f3563881a1643f102993b3 (patch)
tree4a17ec5f209e64e4944b7deceec5dbdf1e0d9dc3 /Ryujinx.Ava/Modules
parent4ce4299ca2a6b11332f2341c69f40efd7205282f (diff)
Revert "Use source generated json serializers in order to improve code trimming (#4094)" (#4576)
This reverts commit 4ce4299ca2a6b11332f2341c69f40efd7205282f.
Diffstat (limited to 'Ryujinx.Ava/Modules')
-rw-r--r--Ryujinx.Ava/Modules/Updater/Updater.cs22
1 files changed, 13 insertions, 9 deletions
diff --git a/Ryujinx.Ava/Modules/Updater/Updater.cs b/Ryujinx.Ava/Modules/Updater/Updater.cs
index c5857528..e89abd1d 100644
--- a/Ryujinx.Ava/Modules/Updater/Updater.cs
+++ b/Ryujinx.Ava/Modules/Updater/Updater.cs
@@ -4,14 +4,13 @@ using FluentAvalonia.UI.Controls;
using ICSharpCode.SharpZipLib.GZip;
using ICSharpCode.SharpZipLib.Tar;
using ICSharpCode.SharpZipLib.Zip;
+using Newtonsoft.Json.Linq;
using Ryujinx.Ava;
using Ryujinx.Ava.Common.Locale;
using Ryujinx.Ava.UI.Helpers;
using Ryujinx.Common;
using Ryujinx.Common.Logging;
-using Ryujinx.Common.Utilities;
using Ryujinx.Ui.Common.Helper;
-using Ryujinx.Ui.Common.Models.Github;
using System;
using System.Collections.Generic;
using System.Diagnostics;
@@ -32,7 +31,6 @@ namespace Ryujinx.Modules
internal static class Updater
{
private const string GitHubApiURL = "https://api.github.com";
- private static readonly GithubReleasesJsonSerializerContext SerializerContext = new(JsonHelper.GetDefaultSerializerOptions());
private static readonly string HomeDir = AppDomain.CurrentDomain.BaseDirectory;
private static readonly string UpdateDir = Path.Combine(Path.GetTempPath(), "Ryujinx", "update");
@@ -101,16 +99,22 @@ namespace Ryujinx.Modules
string buildInfoURL = $"{GitHubApiURL}/repos/{ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelRepo}/releases/latest";
string fetchedJson = await jsonClient.GetStringAsync(buildInfoURL);
- var fetched = JsonHelper.Deserialize(fetchedJson, SerializerContext.GithubReleasesJsonResponse);
- _buildVer = fetched.Name;
+ JObject jsonRoot = JObject.Parse(fetchedJson);
+ JToken assets = jsonRoot["assets"];
- foreach (var asset in fetched.Assets)
+ _buildVer = (string)jsonRoot["name"];
+
+ foreach (JToken asset in assets)
{
- if (asset.Name.StartsWith("test-ava-ryujinx") && asset.Name.EndsWith(_platformExt))
+ string assetName = (string)asset["name"];
+ string assetState = (string)asset["state"];
+ string downloadURL = (string)asset["browser_download_url"];
+
+ if (assetName.StartsWith("test-ava-ryujinx") && assetName.EndsWith(_platformExt))
{
- _buildUrl = asset.BrowserDownloadUrl;
+ _buildUrl = downloadURL;
- if (asset.State != "uploaded")
+ if (assetState != "uploaded")
{
if (showVersionUpToDate)
{