sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update stream read operations to use new helper methods

Browse Source
This commit is contained in:
Dean Herbert
2022-02-11 16:02:25 +09:00
parent 176bb4a4e2
commit 908c31c687
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/IO/Archives/ArchiveReader.cs
View File

@ -5,6 +5,7 @@ using System.Collections.Generic;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using osu.Framework.Extensions;
using osu.Framework.IO.Stores;
namespace osu.Game.IO.Archives
@ -35,14 +36,7 @@ namespace osu.Game.IO.Archives
public virtual byte[] Get(string name)
{
using (Stream input = GetStream(name))
{
if (input == null)
return null;
byte[] buffer = new byte[input.Length];
input.Read(buffer);
return buffer;
}
return input?.ReadAllBytesToArray();
}
public async Task<byte[]> GetAsync(string name, CancellationToken cancellationToken = default)
@ -52,9 +46,7 @@ namespace osu.Game.IO.Archives
if (input == null)
return null;
byte[] buffer = new byte[input.Length];
await input.ReadAsync(buffer, cancellationToken).ConfigureAwait(false);
return buffer;
return await input.ReadAllBytesToArrayAsync(cancellationToken).ConfigureAwait(false);
}
}
}