Skip to content

Fix CSV import failing when '\n' or '\r' is present in a string #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix CSV import failing when '\n' or '\r' is present in a string #116

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion WDBXEditor/Storage/DBEntry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,30 @@ public bool ImportCSV(string filename, bool headerrow, UpdateMode mode, out stri

while (!sr.EndOfStream)
{
string line = sr.ReadLine();
string line = "";

// if it's not the end of the file, read the 2 first char
if (sr.EndOfStream)
{
break;
}
line += (char)sr.Read();

if (sr.EndOfStream)
{
break;
}
line += (char)sr.Read();

// while it's not the end of a row (marked by \r\n), neither the end of the file, append the chars to the line
while (line.Substring(line.Length-2) != "\r\n" && !sr.EndOfStream)
{
line += (char)sr.Read(); ;
}

// remove the \r\n last chars as the old code don't expect them
line = line.Remove(line.Length - 2);

string[] rows = Regex.Split(line, ",(?=(?:[^\"]*\"[^\"]*\")*(?![^\"]*\"))", RegexOptions.Compiled);
DataRow dr = importTable.NewRow();

Expand Down