SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-09-22 23:05:12 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Use new IO extension

Browse Source
This commit is contained in:
Matt Nadareski
2024-04-02 16:12:08 -04:00
parent 49c6c4412b
commit 15452ded52
1 changed files with 3 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
SabreTools.Serialization/Streams/CueSheet.Deserializer.cs
View File

@@ -33,7 +33,7 @@ namespace SabreTools.Serialization.Streams
string? lastLine = null;
while (true)
{
string? line = lastLine ?? ReadLine(data);
string? line = lastLine ?? data.ReadQuotedString();
lastLine = null;
// If we have a null line, break from the loop
@@ -141,7 +141,7 @@ namespace SabreTools.Serialization.Streams
while (true)
{
string? line = lastLine ?? ReadLine(data);
string? line = lastLine ?? data.ReadQuotedString();
lastLine = null;
// If we have a null line, break from the loop
@@ -226,7 +226,7 @@ namespace SabreTools.Serialization.Streams
while (true)
{
string? line = lastLine ?? ReadLine(data);
string? line = lastLine ?? data.ReadQuotedString();
lastLine = null;
// If we have a null line, break from the loop
@@ -506,39 +506,6 @@ namespace SabreTools.Serialization.Streams
#region Helpers
/// <summary>
/// Read a line from the input file, where a line is either terminated by a newline character
/// or by an end quote
/// </summary>
private static string? ReadLine(Stream data)
{
// If we are at the end of data
if (data.Position >= data.Length)
return null;
var bytes = new List<byte>();
bool openQuote = false;
while (data.Position < data.Length)
{
// Read the byte value
byte b = data.ReadByteValue();
// If we have a quote, flip the flag
if (b == (byte)'"')
openQuote = !openQuote;
// If we have a newline not in a quoted string, exit the loop
else if (b == (byte)'\n' && !openQuote)
break;
// Add the byte to the set
bytes.Add(b);
}
var line = new string(bytes.Select(b => (char)b).ToArray());
return line.TrimEnd();
}
/// <summary>
/// Get the file type from a given string
/// </summary>