aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use JSON for resume file instead of XML.

Browse Source
This commit is contained in:
Natalia Portillo
2022-12-15 03:08:28 +00:00
parent fa96da5b29
commit a0ac747fef
5 changed files with 70 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Aaru.Gui/ViewModels/Windows/MediaDumpViewModel.cs
View File

@@ -38,6 +38,8 @@ using System.IO;
using System.Linq;
using System.Reactive;
using System.Text;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Threading;
using System.Threading.Tasks;
using System.Xml.Serialization;
@@ -692,13 +694,32 @@ public sealed class MediaDumpViewModel : ViewModelBase
async Task CheckResumeFile()
{
_resume = null;
var xs = new XmlSerializer(typeof(Resume));
try
{
var sr = new StreamReader(_outputPrefix + ".resume.xml");
_resume = (Resume)xs.Deserialize(sr);
sr.Close();
if(File.Exists(_outputPrefix + ".resume.json"))
{
var fs = new FileStream(_outputPrefix + ".resume.json", FileMode.Open);
_resume = JsonSerializer.Deserialize<ResumeJson>(fs, new JsonSerializerOptions
{
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
IncludeFields = true,
WriteIndented = true
})?.Resume;
fs.Close();
}
// DEPRECATED: To be removed in Aaru 7
else if(File.Exists(_outputPrefix + ".resume.xml"))
{
var xs = new XmlSerializer(typeof(Resume));
var sr = new StreamReader(_outputPrefix + ".resume.xml");
_resume = (Resume)xs.Deserialize(sr);
sr.Close();
}
}
catch
{