well that's dumb

This commit is contained in:
Adam 2020-12-29 18:28:03 +11:00
parent 05d5e96436
commit 15eb435929

View file

@ -216,17 +216,17 @@ namespace Penumbra.Importer
} }
} }
private static MemoryStream GetStreamFromZipEntry( ZipFile file, ZipEntry entry ) private static Stream GetStreamFromZipEntry( ZipFile file, ZipEntry entry )
{ {
var stream = new MemoryStream(); return file.GetInputStream( entry );
using var s = file.GetInputStream( entry );
s.CopyTo( stream );
return stream;
} }
private static string GetStringFromZipEntry( ZipFile file, ZipEntry entry, Encoding encoding ) private static string GetStringFromZipEntry( ZipFile file, ZipEntry entry, Encoding encoding )
{ {
return encoding.GetString( GetStreamFromZipEntry( file, entry ).ToArray() ); using var ms = new MemoryStream();
using var s = GetStreamFromZipEntry( file, entry );
s.CopyTo( ms );
return encoding.GetString( ms.ToArray() );
} }
private static SqPackStream GetSqPackStreamFromZipEntry( ZipFile file, ZipEntry entry ) private static SqPackStream GetSqPackStreamFromZipEntry( ZipFile file, ZipEntry entry )