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.

Browse Source
This commit is contained in:
Natalia Portillo
2022-12-15 22:21:07 +00:00
parent 031f871a2d
commit cfbcde35f5
346 changed files with 11377 additions and 8653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Aaru.Images/CDRDAO/Properties.cs
View File

@@ -36,7 +36,8 @@ using System.Linq;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
using Schemas;
using DumpHardware = Aaru.CommonTypes.AaruMetadata.DumpHardware;
using Metadata = Aaru.CommonTypes.AaruMetadata.Metadata;
namespace Aaru.DiscImages;
@@ -160,9 +161,9 @@ public sealed partial class Cdrdao
}
/// <inheritdoc />
public List<DumpHardwareType> DumpHardware => null;
public List<DumpHardware> DumpHardware => null;
/// <inheritdoc />
public CICMMetadataType CicmMetadata => null;
public Metadata AaruMetadata => null;
// TODO: Decode CD-Text to text
/// <inheritdoc />

2
Aaru.Images/CDRDAO/Read.cs
View File

@@ -871,7 +871,7 @@ public sealed partial class Cdrdao
}
}
_imageInfo.XmlMediaType = XmlMediaType.OpticalDisc;
_imageInfo.MetadataMediaType = MetadataMediaType.OpticalDisc;
AaruConsole.VerboseWriteLine(Localization.CDRDAO_image_describes_a_disc_of_type_0, _imageInfo.MediaType);

13
Aaru.Images/CDRDAO/Write.cs
View File

@@ -36,9 +36,10 @@ using System.IO;
using System.Linq;
using System.Text;
using Aaru.CommonTypes;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Structs;
using Schemas;
using Track = Aaru.CommonTypes.Structs.Track;
using TrackType = Aaru.CommonTypes.Enums.TrackType;
namespace Aaru.DiscImages;
@@ -624,10 +625,10 @@ public sealed partial class Cdrdao
}
/// <inheritdoc />
public bool SetMetadata(ImageInfo metadata)
public bool SetImageInfo(ImageInfo imageInfo)
{
_discimage.Barcode = metadata.MediaBarcode;
_discimage.Comment = metadata.Comments;
_discimage.Barcode = imageInfo.MediaBarcode;
_discimage.Comment = imageInfo.Comments;
return true;
}
@@ -794,8 +795,8 @@ public sealed partial class Cdrdao
}
/// <inheritdoc />
public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
public bool SetDumpHardware(List<DumpHardware> dumpHardware) => false;
/// <inheritdoc />
public bool SetCicmMetadata(CICMMetadataType metadata) => false;
public bool SetMetadata(Metadata metadata) => false;
}