aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Ui.Common/Models
diff options
context:
space:
mode:
authorAndrey Sukharev <SukharevAndrey@users.noreply.github.com>2023-03-22 01:41:19 +0300
committerGitHub <noreply@github.com>2023-03-21 19:41:19 -0300
commit4ce4299ca2a6b11332f2341c69f40efd7205282f (patch)
tree595805d7b0288157c9e4e6598ce89de39e16b76c /Ryujinx.Ui.Common/Models
parent17620d18db8d4a67e4b917596c760107d26fadc5 (diff)
Use source generated json serializers in order to improve code trimming (#4094)
* Use source generated json serializers in order to improve code trimming * Use strongly typed github releases model to fetch updates instead of raw Newtonsoft.Json parsing * Use separate model for LogEventArgs serialization * Make dynamic object formatter static. Fix string builder pooling. * Do not inherit json version of LogEventArgs from EventArgs * Fix extra space in object formatting * Write log json directly to stream instead of using buffer writer * Rebase fixes * Rebase fixes * Rebase fixes * Enforce block-scoped namespaces in the solution. Convert style for existing code * Apply suggestions from code review Co-authored-by: TSRBerry <20988865+TSRBerry@users.noreply.github.com> * Rebase indent fix * Fix indent * Delete unnecessary json properties * Rebase fix * Remove overridden json property names as they are handled in the options * Apply suggestions from code review Co-authored-by: TSRBerry <20988865+TSRBerry@users.noreply.github.com> * Use default json options in github api calls * Indentation and spacing fixes --------- Co-authored-by: TSRBerry <20988865+TSRBerry@users.noreply.github.com>
Diffstat (limited to 'Ryujinx.Ui.Common/Models')
-rw-r--r--Ryujinx.Ui.Common/Models/Amiibo/AmiiboApi.cs57
-rw-r--r--Ryujinx.Ui.Common/Models/Amiibo/AmiiboApiGamesSwitch.cs15
-rw-r--r--Ryujinx.Ui.Common/Models/Amiibo/AmiiboApiUsage.cs12
-rw-r--r--Ryujinx.Ui.Common/Models/Amiibo/AmiiboJson.cs14
-rw-r--r--Ryujinx.Ui.Common/Models/Amiibo/AmiiboJsonSerializerContext.cs9
-rw-r--r--Ryujinx.Ui.Common/Models/Github/GithubReleaseAssetJsonResponse.cs9
-rw-r--r--Ryujinx.Ui.Common/Models/Github/GithubReleasesJsonResponse.cs10
-rw-r--r--Ryujinx.Ui.Common/Models/Github/GithubReleasesJsonSerializerContext.cs9
8 files changed, 135 insertions, 0 deletions
diff --git a/Ryujinx.Ui.Common/Models/Amiibo/AmiiboApi.cs b/Ryujinx.Ui.Common/Models/Amiibo/AmiiboApi.cs
new file mode 100644
index 00000000..f412b950
--- /dev/null
+++ b/Ryujinx.Ui.Common/Models/Amiibo/AmiiboApi.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace Ryujinx.Ui.Common.Models.Amiibo
+{
+ public struct AmiiboApi : IEquatable<AmiiboApi>
+ {
+ [JsonPropertyName("name")]
+ public string Name { get; set; }
+ [JsonPropertyName("head")]
+ public string Head { get; set; }
+ [JsonPropertyName("tail")]
+ public string Tail { get; set; }
+ [JsonPropertyName("image")]
+ public string Image { get; set; }
+ [JsonPropertyName("amiiboSeries")]
+ public string AmiiboSeries { get; set; }
+ [JsonPropertyName("character")]
+ public string Character { get; set; }
+ [JsonPropertyName("gameSeries")]
+ public string GameSeries { get; set; }
+ [JsonPropertyName("type")]
+ public string Type { get; set; }
+
+ [JsonPropertyName("release")]
+ public Dictionary<string, string> Release { get; set; }
+
+ [JsonPropertyName("gamesSwitch")]
+ public List<AmiiboApiGamesSwitch> GamesSwitch { get; set; }
+
+ public override string ToString()
+ {
+ return Name;
+ }
+
+ public string GetId()
+ {
+ return Head + Tail;
+ }
+
+ public bool Equals(AmiiboApi other)
+ {
+ return Head + Tail == other.Head + other.Tail;
+ }
+
+ public override bool Equals(object obj)
+ {
+ return obj is AmiiboApi other && Equals(other);
+ }
+
+ public override int GetHashCode()
+ {
+ return HashCode.Combine(Head, Tail);
+ }
+ }
+} \ No newline at end of file
diff --git a/Ryujinx.Ui.Common/Models/Amiibo/AmiiboApiGamesSwitch.cs b/Ryujinx.Ui.Common/Models/Amiibo/AmiiboApiGamesSwitch.cs
new file mode 100644
index 00000000..def7d1bc
--- /dev/null
+++ b/Ryujinx.Ui.Common/Models/Amiibo/AmiiboApiGamesSwitch.cs
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace Ryujinx.Ui.Common.Models.Amiibo
+{
+ public class AmiiboApiGamesSwitch
+ {
+ [JsonPropertyName("amiiboUsage")]
+ public List<AmiiboApiUsage> AmiiboUsage { get; set; }
+ [JsonPropertyName("gameID")]
+ public List<string> GameId { get; set; }
+ [JsonPropertyName("gameName")]
+ public string GameName { get; set; }
+ }
+} \ No newline at end of file
diff --git a/Ryujinx.Ui.Common/Models/Amiibo/AmiiboApiUsage.cs b/Ryujinx.Ui.Common/Models/Amiibo/AmiiboApiUsage.cs
new file mode 100644
index 00000000..814573c2
--- /dev/null
+++ b/Ryujinx.Ui.Common/Models/Amiibo/AmiiboApiUsage.cs
@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace Ryujinx.Ui.Common.Models.Amiibo
+{
+ public class AmiiboApiUsage
+ {
+ [JsonPropertyName("Usage")]
+ public string Usage { get; set; }
+ [JsonPropertyName("write")]
+ public bool Write { get; set; }
+ }
+} \ No newline at end of file
diff --git a/Ryujinx.Ui.Common/Models/Amiibo/AmiiboJson.cs b/Ryujinx.Ui.Common/Models/Amiibo/AmiiboJson.cs
new file mode 100644
index 00000000..feb7993c
--- /dev/null
+++ b/Ryujinx.Ui.Common/Models/Amiibo/AmiiboJson.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace Ryujinx.Ui.Common.Models.Amiibo
+{
+ public struct AmiiboJson
+ {
+ [JsonPropertyName("amiibo")]
+ public List<AmiiboApi> Amiibo { get; set; }
+ [JsonPropertyName("lastUpdated")]
+ public DateTime LastUpdated { get; set; }
+ }
+} \ No newline at end of file
diff --git a/Ryujinx.Ui.Common/Models/Amiibo/AmiiboJsonSerializerContext.cs b/Ryujinx.Ui.Common/Models/Amiibo/AmiiboJsonSerializerContext.cs
new file mode 100644
index 00000000..4cbb5a7b
--- /dev/null
+++ b/Ryujinx.Ui.Common/Models/Amiibo/AmiiboJsonSerializerContext.cs
@@ -0,0 +1,9 @@
+using System.Text.Json.Serialization;
+
+namespace Ryujinx.Ui.Common.Models.Amiibo
+{
+ [JsonSerializable(typeof(AmiiboJson))]
+ public partial class AmiiboJsonSerializerContext : JsonSerializerContext
+ {
+ }
+} \ No newline at end of file
diff --git a/Ryujinx.Ui.Common/Models/Github/GithubReleaseAssetJsonResponse.cs b/Ryujinx.Ui.Common/Models/Github/GithubReleaseAssetJsonResponse.cs
new file mode 100644
index 00000000..10d01478
--- /dev/null
+++ b/Ryujinx.Ui.Common/Models/Github/GithubReleaseAssetJsonResponse.cs
@@ -0,0 +1,9 @@
+namespace Ryujinx.Ui.Common.Models.Github
+{
+ public class GithubReleaseAssetJsonResponse
+ {
+ public string Name { get; set; }
+ public string State { get; set; }
+ public string BrowserDownloadUrl { get; set; }
+ }
+} \ No newline at end of file
diff --git a/Ryujinx.Ui.Common/Models/Github/GithubReleasesJsonResponse.cs b/Ryujinx.Ui.Common/Models/Github/GithubReleasesJsonResponse.cs
new file mode 100644
index 00000000..954d03e3
--- /dev/null
+++ b/Ryujinx.Ui.Common/Models/Github/GithubReleasesJsonResponse.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace Ryujinx.Ui.Common.Models.Github
+{
+ public class GithubReleasesJsonResponse
+ {
+ public string Name { get; set; }
+ public List<GithubReleaseAssetJsonResponse> Assets { get; set; }
+ }
+} \ No newline at end of file
diff --git a/Ryujinx.Ui.Common/Models/Github/GithubReleasesJsonSerializerContext.cs b/Ryujinx.Ui.Common/Models/Github/GithubReleasesJsonSerializerContext.cs
new file mode 100644
index 00000000..e5fd9d09
--- /dev/null
+++ b/Ryujinx.Ui.Common/Models/Github/GithubReleasesJsonSerializerContext.cs
@@ -0,0 +1,9 @@
+using System.Text.Json.Serialization;
+
+namespace Ryujinx.Ui.Common.Models.Github
+{
+ [JsonSerializable(typeof(GithubReleasesJsonResponse), GenerationMode = JsonSourceGenerationMode.Metadata)]
+ public partial class GithubReleasesJsonSerializerContext : JsonSerializerContext
+ {
+ }
+} \ No newline at end of file