h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-19 07:41:18 +08:00
Code Issues Releases Wiki Activity

Fix incorrect handling of non-MemoryStream pathway

Browse Source
This commit is contained in:
Dean Herbert
2023-09-14 22:19:18 +09:00
Unverified
parent 364094fcf2
commit 57f32b177d
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Database/ImportTask.cs
+6 -8
View File
@@ -58,16 +58,14 @@ namespace osu.Game.Database
throw new InvalidFormatException($"{Path} is not a valid archive");
}
if (Stream is MemoryStream memoryStream)
{
if (ZipUtils.IsZipArchive(memoryStream))
return new ZipArchiveReader(memoryStream, Path);
if (Stream is not MemoryStream memoryStream)
// Path used primarily in tests (converting `ManifestResourceStream`s to `MemoryStream`s).
memoryStream = new MemoryStream(Stream.ReadAllBytesToArray());
return new MemoryStreamArchiveReader(memoryStream, Path);
}
if (ZipUtils.IsZipArchive(memoryStream))
return new ZipArchiveReader(memoryStream, Path);
// This isn't used in any current path. May need to reconsider for performance reasons (ie. if we don't expect the incoming stream to be copied out).
return new ByteArrayArchiveReader(Stream.ReadAllBytesToArray(), Path);
return new MemoryStreamArchiveReader(memoryStream, Path);
}
/// <summary>