Fix tap conversion

Author: voytas

src/Spectron.Files/IO/DataWriter.cs

@@ -1,4 +1,5 @@
 using OldBit.Spectron.Files.Serialization;
+using OldBit.Spectron.Files.Szx.Extensions;
 using OldBit.Spectron.Files.Tap;
 using OldBit.Spectron.Files.Tzx.Blocks;
 
@@ -12,20 +13,28 @@ internal class DataWriter(Stream stream)
     /// <summary>
     /// Writes a data block to the stream.
     /// </summary>
-    /// <param name="block">The block to write.</param>
+    /// <param name="block">The block to write to the stream.</param>
     internal void Write(IBlock block)
     {
         var data = FileDataSerializer.Serialize(block);
+
         stream.Write(data, 0, data.Length);
     }
 
     /// <summary>
     /// Writes a TAP data to the stream.
     /// </summary>
-    /// <param name="tapData">The data to write.</param>
+    /// <param name="tapData">The TAP data to write to the stream..</param>
     internal void Write(TapData tapData)
     {
         var data = FileDataSerializer.Serialize(tapData);
+
         stream.Write(data, 0, data.Length);
     }
+
+    /// <summary>
+    /// Writes a word to the stream.
+    /// </summary>
+    /// <param name="value">The word value to write to the stream..</param>
+    internal void WriteWord(Word value) => stream.WriteWord(value);
 }

src/Spectron.Files/Tap/TapData.cs

@@ -9,6 +9,11 @@ namespace OldBit.Spectron.Files.Tap;
 /// </summary>
 public sealed class TapData
 {
+    /// <summary>
+    /// Gets the length of the block data.
+    /// </summary>
+    public Word Length => (Word)(Data.Count + 2);
+
     /// <summary>
     /// Gets or sets type of the block data.
     /// Typically, there are two standard values: 0x00 for header and 0xFF for data.

src/Spectron.Files/Tap/TapFile.cs

@@ -28,6 +28,7 @@ public static TapFile Load(Stream stream)
             {
                 throw new InvalidDataException("Invalid TAP data.");
             }
+
             tapFile.Blocks.Add(tapData);
         }
 
@@ -42,6 +43,7 @@ public static TapFile Load(Stream stream)
     public static TapFile Load(string fileName)
     {
         using var stream = File.OpenRead(fileName);
+
         return Load(stream);
     }
 
@@ -52,8 +54,10 @@ public static TapFile Load(string fileName)
     public void Save(Stream stream)
     {
         var writer = new DataWriter(stream);
+
         foreach (var block in Blocks)
         {
+            writer.WriteWord(block.Length);
             writer.Write(block);
         }
     }
@@ -65,6 +69,7 @@ public void Save(Stream stream)
     public void Save(string fileName)
     {
         using var stream = File.Create(fileName);
+
         Save(stream);
     }
 }