Update libhac and extract

Thealexbarney · Thealexbarney · commit 5c28af8887bf · 2019-02-22T20:49:25.000-06:00
diff --git a/XbTool/XbTool/Tasks.cs b/XbTool/XbTool/Tasks.cs
@@ -449,6 +449,9 @@ private static void SdPrintTest(Options options)
             IFileSystem fs = new Xb2FileSystem(options.Input);
             File.WriteAllLines(options.Output,
                 fs.EnumerateEntries().Where(x => x.Type == DirectoryEntryType.File).Select(x => x.FullPath));
+
+            var localFs = new LocalFileSystem("output");
+            fs.CopyFileSystem(localFs, options.Progress);
         }
     }
 }
diff --git a/XbTool/XbTool/Xb2/ArchiveFileSystem.cs b/XbTool/XbTool/Xb2/ArchiveFileSystem.cs
@@ -118,7 +118,7 @@ public IFile OpenFile(string path, OpenMode mode)
             {
                 case 2:
                     var decompData = new byte[fileInfo.UncompressedSize];
-                    Stream compStream = DataFile.Slice(fileInfo.Offset + 0x30).AsStream();
+                    Stream compStream = DataFile.Slice(fileInfo.Offset + 0x30, fileInfo.CompressedSize).AsStream();
 
                     using (var deflate = new ZlibStream(compStream, CompressionMode.Decompress, true))
                     {
diff --git a/XbTool/XbTool/XbTool.csproj b/XbTool/XbTool/XbTool.csproj
@@ -18,7 +18,7 @@
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="7.0.1" />
     <PackageReference Include="DotNet.Glob" Version="2.0.3" />
-    <PackageReference Include="LibHac" Version="0.3.1-alpha.5" />
+    <PackageReference Include="LibHac" Version="0.3.1-alpha.6" />
     <PackageReference Include="Npgsql" Version="4.0.3" />
     <PackageReference Condition=" '$(TargetFramework)' == 'net46' " Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Condition=" '$(TargetFramework)' == 'net46' " Include="DotNetZip" Version="1.11.0" />

Original file line number	Diff line number	Diff line change
`@@ -449,6 +449,9 @@ private static void SdPrintTest(Options options)`
`449`	`449`	`IFileSystem fs = new Xb2FileSystem(options.Input);`
`450`	`450`	`File.WriteAllLines(options.Output,`
`451`	`451`	`fs.EnumerateEntries().Where(x => x.Type == DirectoryEntryType.File).Select(x => x.FullPath));`
	`452`	`+`
	`453`	`+ var localFs = new LocalFileSystem("output");`
	`454`	`+ fs.CopyFileSystem(localFs, options.Progress);`
`452`	`455`	`}`
`453`	`456`	`}`
`454`	`457`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public IFile OpenFile(string path, OpenMode mode)`
`118`	`118`	`{`
`119`	`119`	`case 2:`
`120`	`120`	`var decompData = new byte[fileInfo.UncompressedSize];`
`121`		`- Stream compStream = DataFile.Slice(fileInfo.Offset + 0x30).AsStream();`
	`121`	`+ Stream compStream = DataFile.Slice(fileInfo.Offset + 0x30, fileInfo.CompressedSize).AsStream();`
`122`	`122`
`123`	`123`	`using (var deflate = new ZlibStream(compStream, CompressionMode.Decompress, true))`
`124`	`124`	`{`