StreamExtensions mit UnitTests versehen
This commit is contained in:
@@ -1,27 +1,36 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AMWD.Common.Extensions
|
||||
namespace System.IO
|
||||
{
|
||||
/// <summary>
|
||||
/// Provides extension methods for the <see cref="Stream"/>.
|
||||
/// </summary>
|
||||
public static class StreamExtensions
|
||||
{
|
||||
public static string ReadLine(this Stream stream, Encoding encoding = null, string eol = null)
|
||||
/// <summary>
|
||||
/// Reads a line from a <see cref="Stream"/>.
|
||||
/// </summary>
|
||||
/// <param name="stream">The stream to read from.</param>
|
||||
/// <param name="encoding">The encoding to use.</param>
|
||||
/// <param name="eol">The character determinating a line end.</param>
|
||||
/// <returns></returns>
|
||||
public static string ReadLine(this Stream stream, Encoding encoding = null, char? eol = null)
|
||||
{
|
||||
if (encoding == null)
|
||||
encoding = Encoding.Default;
|
||||
|
||||
if (eol == null)
|
||||
eol = Environment.NewLine;
|
||||
eol = Environment.NewLine.Last();
|
||||
|
||||
if (!stream.CanRead)
|
||||
return null;
|
||||
|
||||
var bytes = new List<byte>();
|
||||
string s;
|
||||
char ch;
|
||||
do
|
||||
{
|
||||
int result = stream.ReadByte();
|
||||
@@ -30,37 +39,45 @@ namespace AMWD.Common.Extensions
|
||||
|
||||
byte b = (byte)result;
|
||||
bytes.Add(b);
|
||||
s = encoding.GetString(new[] { b });
|
||||
ch = (char)result;
|
||||
}
|
||||
while (!eol.Contains(s));
|
||||
while (ch != eol);
|
||||
|
||||
return encoding.GetString(bytes.ToArray()).Trim();
|
||||
}
|
||||
|
||||
public static async Task<string> ReadLineAsync(this Stream stream, Encoding encoding = null, string eol = null, CancellationToken cancellationToken = default)
|
||||
/// <summary>
|
||||
/// Reads a line from a <see cref="Stream"/> asynchronous.
|
||||
/// </summary>
|
||||
/// <param name="stream">The stream to read from.</param>
|
||||
/// <param name="encoding">The encoding to use.</param>
|
||||
/// <param name="eol">The character determinating a line end.</param>
|
||||
/// <param name="cancellationToken">The token to monitor for cancellation requests. The default value is <see cref="CancellationToken.None"/>.</param>
|
||||
/// <returns></returns>
|
||||
public static async Task<string> ReadLineAsync(this Stream stream, Encoding encoding = null, char? eol = null, CancellationToken cancellationToken = default)
|
||||
{
|
||||
if (encoding == null)
|
||||
encoding = Encoding.Default;
|
||||
|
||||
if (eol == null)
|
||||
eol = Environment.NewLine;
|
||||
eol = Environment.NewLine.Last();
|
||||
|
||||
if (!stream.CanRead)
|
||||
return null;
|
||||
|
||||
var bytes = new List<byte>();
|
||||
string s;
|
||||
char ch;
|
||||
do
|
||||
{
|
||||
byte[] buffer = new byte[1];
|
||||
int count = await stream.ReadAsync(buffer, 0, buffer.Length);
|
||||
int count = await stream.ReadAsync(buffer, 0, buffer.Length, cancellationToken);
|
||||
if (count == 0)
|
||||
break;
|
||||
|
||||
bytes.Add(buffer[0]);
|
||||
s = encoding.GetString(buffer);
|
||||
ch = (char)buffer[0];
|
||||
}
|
||||
while (!eol.Contains(s));
|
||||
while (ch != eol);
|
||||
|
||||
return encoding.GetString(bytes.ToArray()).Trim();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user