From fa22f609c36fffc871e4c53f4fe3031760b3681b Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Fri, 16 Dec 2022 01:16:48 +0000
Subject: [PATCH] Add converters from CICM Metadata to Aaru Metadata.

---
 Aaru.CommonTypes                |  2 +-
 Aaru.Core/Sidecar/AudioMedia.cs | 10 +++++-----
 Aaru.Core/Sidecar/BlockMedia.cs |  2 +-
 Aaru.Core/Sidecar/BlockTape.cs  |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes
index 4cdf541a0..647d3fac2 160000
--- a/Aaru.CommonTypes
+++ b/Aaru.CommonTypes
@@ -1 +1 @@
-Subproject commit 4cdf541a0981a07044ce73e2f5656560d63dbe98
+Subproject commit 647d3fac26b2dca37adf53280ce02a4b929800a2
diff --git a/Aaru.Core/Sidecar/AudioMedia.cs b/Aaru.Core/Sidecar/AudioMedia.cs
index 75b76becd..633f15b42 100644
--- a/Aaru.Core/Sidecar/AudioMedia.cs
+++ b/Aaru.Core/Sidecar/AudioMedia.cs
@@ -56,7 +56,7 @@ public sealed partial class Sidecar
                            List<CommonTypes.AaruMetadata.Checksum> imgChecksums, ref Metadata sidecar,
                            Encoding encoding)
     {
-        sidecar.AudioMedia = new List<AudioMedia>
+        sidecar.AudioMedias = new List<AudioMedia>
         {
             new()
             {
@@ -78,13 +78,13 @@ public sealed partial class Sidecar
         if(image.Info.MediaSequence     != 0 &&
            image.Info.LastMediaSequence != 0)
         {
-            sidecar.AudioMedia[0].Sequence.MediaSequence = (uint)image.Info.MediaSequence;
-            sidecar.AudioMedia[0].Sequence.TotalMedia    = (uint)image.Info.LastMediaSequence;
+            sidecar.AudioMedias[0].Sequence.MediaSequence = (uint)image.Info.MediaSequence;
+            sidecar.AudioMedias[0].Sequence.TotalMedia    = (uint)image.Info.LastMediaSequence;
         }
         else
         {
-            sidecar.AudioMedia[0].Sequence.MediaSequence = 1;
-            sidecar.AudioMedia[0].Sequence.TotalMedia    = 1;
+            sidecar.AudioMedias[0].Sequence.MediaSequence = 1;
+            sidecar.AudioMedias[0].Sequence.TotalMedia    = 1;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Sidecar/BlockMedia.cs b/Aaru.Core/Sidecar/BlockMedia.cs
index fc368a0da..ccc32c127 100644
--- a/Aaru.Core/Sidecar/BlockMedia.cs
+++ b/Aaru.Core/Sidecar/BlockMedia.cs
@@ -673,7 +673,7 @@ public sealed partial class Sidecar
                     filesInPartition.Add(thisFile);
                 }
 
-                thisPartition.File = filesInPartition;
+                thisPartition.Files = filesInPartition;
                 tapePartitions.Add(thisPartition);
             }
 
diff --git a/Aaru.Core/Sidecar/BlockTape.cs b/Aaru.Core/Sidecar/BlockTape.cs
index bdb6731d6..f2c293f8b 100644
--- a/Aaru.Core/Sidecar/BlockTape.cs
+++ b/Aaru.Core/Sidecar/BlockTape.cs
@@ -171,7 +171,7 @@ public sealed partial class Sidecar
         _sidecar.BlockMedias[0].TapeInformation[0].EndBlock  = currentBlock - 1;
         _sidecar.BlockMedias[0].TapeInformation[0].Size      = totalSize;
         _sidecar.BlockMedias[0].TapeInformation[0].Checksums = _sidecar.BlockMedias[0].Checksums;
-        _sidecar.BlockMedias[0].TapeInformation[0].File      = tapeFiles;
+        _sidecar.BlockMedias[0].TapeInformation[0].Files     = tapeFiles;
 
         // This is purely for convenience, as typically these kind of data represents QIC tapes
         if(blockSize == 512)