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 Aaru Metadata instead of CICM Metadata and convert to it if found.

Browse Source
This commit is contained in:
Natalia Portillo
2022-12-16 03:05:50 +00:00
parent df33cc260b
commit 30144d1ac0
15 changed files with 212 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,6 @@ using JetBrains.Annotations;
using MessageBox.Avalonia;
using MessageBox.Avalonia.Enums;
using ReactiveUI;
using Schemas;
using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo;
using Dump = Aaru.Core.Devices.Dumping.Dump;
using File = System.IO.File;
@@ -515,7 +514,7 @@ public sealed class MediaDumpViewModel : ViewModelBase
Name = UI.Dialog_Aaru_Metadata,
Extensions = new List<string>(new[]
{
".xml"
".json"
})
});
@@ -528,14 +527,17 @@ public sealed class MediaDumpViewModel : ViewModelBase
return;
}
var sidecarXs = new XmlSerializer(typeof(CICMMetadataType));
try
{
var sr = new StreamReader(result[0]);
var fs = new FileStream(result[0], FileMode.Open);
// _sidecar = (CICMMetadataType)sidecarXs.Deserialize(sr);
sr.Close();
_sidecar = JsonSerializer.Deserialize<MetadataJson>(fs, new JsonSerializerOptions
{
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
PropertyNameCaseInsensitive = true
})?.AaruMetadata;
fs.Close();
}
catch
{