ArchiveFileSystem bugfixes

Author: Thealexbarney

XbTool/XbTool/Xb2/ArchiveFile.cs

@@ -12,8 +12,9 @@ public class ArchiveFile : FileBase
         private bool IsCompressed { get; set; }
         private byte[] FileData { get; set; }
 
-        public ArchiveFile(byte[] file)
+        public ArchiveFile(byte[] file, OpenMode mode)
         {
+            Mode = mode;
             FileData = file;
             IsCompressed = true;
             Size = file.Length;
@@ -33,7 +34,7 @@ public override int Read(Span<byte> destination, long offset)
 
             if (IsCompressed)
             {
-                FileData.CopyTo(destination.Slice((int)offset, toRead));
+                FileData.AsSpan((int)offset, toRead).CopyTo(destination);
             }
             else
             {
@@ -45,9 +46,9 @@ public override int Read(Span<byte> destination, long offset)
         }
 
         public override long GetSize() => Size;
+        public override void Flush() { }
 
         public override void Write(ReadOnlySpan<byte> source, long offset) => throw new NotSupportedException();
-        public override void Flush() => throw new NotSupportedException();
         public override void SetSize(long size) => throw new NotSupportedException();
     }
 }

XbTool/XbTool/Xb2/ArchiveFileSystem.cs

@@ -118,16 +118,16 @@ public IFile OpenFile(string path, OpenMode mode)
             {
                 case 2:
                     var decompData = new byte[fileInfo.UncompressedSize];
-                    Stream compStream = DataFile.Slice(fileInfo.Offset + 0x30, fileInfo.CompressedSize).AsStream();
+                    Stream compStream = DataFile.Slice(fileInfo.Offset + 0x30).AsStream();
 
                     using (var deflate = new ZlibStream(compStream, CompressionMode.Decompress, true))
                     {
                         deflate.CopyTo(new MemoryStream(decompData), fileInfo.UncompressedSize);
                     }
 
-                    return new ArchiveFile(decompData);
+                    return new ArchiveFile(decompData, OpenMode.Read);
                 case 0:
-                    return new ArchiveFile(DataFile, fileInfo.Offset, fileInfo.UncompressedSize);
+                    return new ArchiveFile(DataFile, fileInfo.Offset, fileInfo.CompressedSize);
                 default:
                     throw new InvalidDataException();
             }