RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert old behaviour of `ReadToEnd`

This commit is contained in:
Dean Herbert 2022-07-06 19:53:19 +09:00
parent 12d396a513
commit 01bc6e5cb7
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game.Tests/Beatmaps/IO/LineBufferedReaderTest.cs
View File

@ -108,13 +108,19 @@ public void TestReadToEndNoPeeks()
[Test] [Test]
public void TestReadToEndAfterReadsAndPeeks() public void TestReadToEndAfterReadsAndPeeks()
{ {
const string contents = "first line\r\nsecond line"; const string contents = "this line is gone\rthis one shouldn't be\r\nthese ones\ndefinitely not";
using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(contents))) using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(contents)))
using (var bufferedReader = new LineBufferedReader(stream)) using (var bufferedReader = new LineBufferedReader(stream))
{ {
bufferedReader.PeekLine(); Assert.AreEqual("this line is gone", bufferedReader.ReadLine());
Assert.Throws<InvalidOperationException>(() => bufferedReader.ReadToEnd()); Assert.AreEqual("this one shouldn't be", bufferedReader.PeekLine());
string[] endingLines = bufferedReader.ReadToEnd().Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
Assert.AreEqual(3, endingLines.Length);
Assert.AreEqual("this one shouldn't be", endingLines[0]);
Assert.AreEqual("these ones", endingLines[1]);
Assert.AreEqual("definitely not", endingLines[2]);
} }
} }
} }

15
osu.Game/IO/LineBufferedReader.cs
View File

@ -46,14 +46,21 @@ public LineBufferedReader(Stream stream, bool leaveOpen = false)
/// <summary> /// <summary>
/// Reads the stream to its end and returns the text read. /// Reads the stream to its end and returns the text read.
/// Not compatible with calls to <see cref="PeekLine"/>. /// This includes any peeked but unconsumed lines.
/// </summary> /// </summary>
public string ReadToEnd() public string ReadToEnd()
{ {
if (peekedLine != null) string remainingText = streamReader.ReadToEnd();
throw new InvalidOperationException($"Do not use {nameof(ReadToEnd)} when also peeking for lines."); if (peekedLine == null)
return remainingText;
return streamReader.ReadToEnd(); var builder = new StringBuilder();
// this might not be completely correct due to varying platform line endings
builder.AppendLine(peekedLine);
builder.Append(remainingText);
return builder.ToString();
} }
public void Dispose() public void Dispose()