diff options
| author | Andrey Sukharev <SukharevAndrey@users.noreply.github.com> | 2023-03-22 01:41:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-21 19:41:19 -0300 |
| commit | 4ce4299ca2a6b11332f2341c69f40efd7205282f (patch) | |
| tree | 595805d7b0288157c9e4e6598ce89de39e16b76c /Ryujinx.HLE/HOS/ApplicationLoader.cs | |
| parent | 17620d18db8d4a67e4b917596c760107d26fadc5 (diff) | |
Use source generated json serializers in order to improve code trimming (#4094)1.1.674
* 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.HLE/HOS/ApplicationLoader.cs')
| -rw-r--r-- | Ryujinx.HLE/HOS/ApplicationLoader.cs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Ryujinx.HLE/HOS/ApplicationLoader.cs b/Ryujinx.HLE/HOS/ApplicationLoader.cs index 82bd9b31..7d06e5eb 100644 --- a/Ryujinx.HLE/HOS/ApplicationLoader.cs +++ b/Ryujinx.HLE/HOS/ApplicationLoader.cs @@ -13,6 +13,7 @@ using LibHac.Tools.FsSystem; using LibHac.Tools.FsSystem.NcaUtils; using Ryujinx.Common.Configuration; using Ryujinx.Common.Logging; +using Ryujinx.Common.Utilities; using Ryujinx.Cpu; using Ryujinx.HLE.FileSystem; using Ryujinx.HLE.Loaders.Executables; @@ -24,14 +25,13 @@ using System.IO; using System.Linq; using System.Reflection; using System.Text; +using System.Text.Json; using static Ryujinx.HLE.HOS.ModLoader; using ApplicationId = LibHac.Ncm.ApplicationId; using Path = System.IO.Path; namespace Ryujinx.HLE.HOS { - using JsonHelper = Common.Utilities.JsonHelper; - public class ApplicationLoader { // Binaries from exefs are loaded into mem in this order. Do not change. @@ -57,6 +57,10 @@ namespace Ryujinx.HLE.HOS private string _displayVersion; private BlitStruct<ApplicationControlProperty> _controlData; + private static readonly JsonSerializerOptions SerializerOptions = JsonHelper.GetDefaultSerializerOptions(); + private static readonly DownloadableContentJsonSerializerContext ContentSerializerContext = new(SerializerOptions); + private static readonly TitleUpdateMetadataJsonSerializerContext TitleSerializerContext = new(SerializerOptions); + public BlitStruct<ApplicationControlProperty> ControlData => _controlData; public string TitleName => _titleName; public string DisplayVersion => _displayVersion; @@ -197,7 +201,7 @@ namespace Ryujinx.HLE.HOS if (File.Exists(titleUpdateMetadataPath)) { - updatePath = JsonHelper.DeserializeFromFile<TitleUpdateMetadata>(titleUpdateMetadataPath).Selected; + updatePath = JsonHelper.DeserializeFromFile(titleUpdateMetadataPath, TitleSerializerContext.TitleUpdateMetadata).Selected; if (File.Exists(updatePath)) { @@ -411,7 +415,7 @@ namespace Ryujinx.HLE.HOS if (File.Exists(titleAocMetadataPath)) { - List<DownloadableContentContainer> dlcContainerList = JsonHelper.DeserializeFromFile<List<DownloadableContentContainer>>(titleAocMetadataPath); + List<DownloadableContentContainer> dlcContainerList = JsonHelper.DeserializeFromFile(titleAocMetadataPath, ContentSerializerContext.ListDownloadableContentContainer); foreach (DownloadableContentContainer downloadableContentContainer in dlcContainerList) { |