Skip to content

Commit ce4e095

Browse files
author
Joakim Wennergren
committed
Allow files with only a CR as newline (Mac?)
Based on PR #43
1 parent 635b547 commit ce4e095

File tree

5 files changed

+33
-7
lines changed

5 files changed

+33
-7
lines changed

‎CsvGen/Program.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,29 +38,31 @@ private static void Main()
3838
{
3939
var rowsToCreate = Param.Get('n', 100000);
4040
var columns = Param.Get('c', 10);
41+
var newline = System.Text.RegularExpressions.Regex.Unescape( Param.Get('N', "\\r\\n"));
42+
var sep = Param.Get('s', ",");
4143
var filename = Param.FirstOr($"random{rowsToCreate}x{columns}.csv");
4244

4345
using (var fs = new StreamWriter(filename))
44-
GenerateCsv(columns, rowsToCreate, fs);
46+
GenerateCsv(columns, rowsToCreate, fs, sep, newline);
4547
}
4648
}
4749

48-
private static void GenerateCsv(int columns, int rowsToCreate, TextWriter fs, string separator=",")
50+
private static void GenerateCsv(int columns, int rowsToCreate, TextWriter fs, string separator=",", string newline = "\r\n")
4951
{
5052
var r = new Random();
5153
var columnTypes = Enumerable.Range(0, columns).Select(x => x < 7 ? x : r.Next(7)).Cast<CsvColumnType>().ToList();
5254

5355
// Headers
5456
foreach (var str in columnTypes.Select(x => r.RandomString(5) + x.ToString()).Interspace(separator))
5557
fs.Write(str);
56-
fs.WriteLine();
58+
fs.Write(newline);
5759

5860
// Rows
5961
for (var l = 0; l < rowsToCreate; l++)
6062
{
6163
foreach (var str in columnTypes.Select(x => r.GenColumn(x)).Interspace(separator))
6264
fs.Write(str);
63-
fs.WriteLine();
65+
fs.Write(newline);
6466
}
6567
}
6668

‎CsvQuery/Csv/CsvSettings.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ public IEnumerable<string[]> ParseCustom(TextReader reader)
120120
{
121121
var c = (char)ch;
122122

123-
if (c == '\n' || (c == '\r' && (char)reader.Peek() == '\n'))
123+
if (c == '\n' || c == '\r')
124124
{
125125
// If it's a \r\n combo consume the \n part and throw it away.
126-
if (c == '\r')
126+
if (c == '\r' && ((char)reader.Peek() == '\n'))
127127
reader.Read();
128128

129129
if (inQuotes)

‎Tests/CsvColumnTypesFacts.cs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,24 @@ public void CanDetectNoHeader()
5252
Assert.IsTrue(result.Columns[6].DataType == ColumnType.Decimal);
5353
}
5454

55+
/// <summary>
56+
/// With CR as the newline (rare but not unheard of),
57+
/// the plugin should act the same as if CRLF or LF was the newline
58+
/// </summary>
59+
[TestMethod]
60+
public void WorksWithCRNewline()
61+
{
62+
var data = CsvSettings.Comma.Parse(File.ReadAllText(@"TestFiles\random50x10CRonly.csv")).ToList();
63+
var result = new CsvColumnTypes(data, null);
64+
// if there are more than 10 columns it's probably because CsvQuery didn't properly recognize CR as a newline
65+
Assert.AreEqual(result.Columns.Count, 10);
66+
// same tests as for previous data with header
67+
Assert.AreEqual(true, result.HasHeader);
68+
Assert.IsTrue(result.Columns[0].DataType == ColumnType.Integer);
69+
Assert.IsTrue(result.Columns[6].DataType == ColumnType.Decimal);
70+
Assert.IsTrue(result.Columns[1].DataType == ColumnType.String);
71+
}
72+
5573
[TestMethod]
5674
public void CanDetectLocalCurrency()
5775
{

‎Tests/TestFiles/random50x10CRonly.csv‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
FjyczInteger,IurkgShortString,JwgguLongString,WvuktChar,TxusaDate,MpftxDateAndTime,JrlbwDecimal,OuqdiLongString,SktkoInteger,VzianShortString1789304147,Aimh,Fbntoymwrkejfbeqbbidkdfmg,e,2016-10-15,2024-07-20 04:13:58,416.631625693586,Dppyppppdmgnxkuyvmriygddfb,1874129074,M862497032,Kla,Pugmpbmxwxwgurhjtkcswll,t,2025-01-20,2022-01-15 13:10:39,539.705133782562,Ssvcwcedozbgmjggjvbk,423908690,A5971530,Il,Jnzxnjfebuksmdvtjwfne,e,2021-10-27,2022-02-13 07:44:26,629.051269790647,Xrsvtnqauaaetddcfokjx,95203160,H1394607938,Dy,Fdhgjmnlfaxbmjuseccjbyvgggwll,e,2018-04-18,2023-04-15 23:00:00,714.182769280943,Oxtxjrqraonilrlomjao,1992231008,I40627310,C,Baaumilvwzgtltkyhsxufawsxj,d,2013-09-27,2023-08-05 20:01:39,587.221307487796,Xgboqatbazvopfqpvnibhcikbeh,1899428373,E748682535,Hgj,Kfuynrxujlgngtipaolvyqml,s,2035-05-17,2021-03-17 09:57:20,808.7111016776,Ihjvefqtjopenbqytqjwumtuon,1601308848,Ifq1657155427,E,Ewrcosvqzvqlpwnygoyw,w,2025-09-11,2022-08-12 17:38:34,281.5135765269,Mxkeyvbjbmbcoveywtzxbewuhj,483280752,H349055466,Ikk,Ulmbzpcnkmwsttyzupjp,h,2011-09-17,2022-05-10 13:54:23,881.122593246923,Pwbwvsrdsknkrzizqmhkrmlie,1819546900,Avu1670061923,Pnks,Qoteoajlpcpaqrnimwcl,t,2030-07-09,2020-11-28 17:41:21,992.156411051823,Iypsudpqyzynfdmbxptdzfcgmd,1375180164,Gh2028282279,Ung,Ttvyaksspugtqjwdgwqc,v,2021-01-26,2023-12-04 16:23:55,664.022006869326,Ijrajtrwlidtucpnkrrwwqwkv,667698687,Xdfk1081429403,L,Aarfaoxebsjmtbplsouqrngfbwu,t,2017-07-22,2021-02-22 01:35:35,644.002335911618,Ikomtlqizmvslvdvnuryjvbnul,323874966,T343685136,Dbtd,Mdrgxlqerntfszflgsgnjbr,h,2019-01-30,2023-01-03 06:14:03,575.721255771686,Nrqsrtijckaxewvgrxluymwjmqal,1014977086,Zl1888538936,Rzxb,Yqvjvrjimfkpjauwbugfbtxxr,l,2027-02-09,2024-09-28 01:39:33,334.753452024773,Vjqjmeccbsdhogbuplcyqf,1366784955,Nfsy1482022709,Ci,Hjbzznqtytoctfqvxvdy,j,2027-03-11,2022-04-08 20:42:23,724.629114719401,Whlekrqvhgxaupylerlcttaccuo,2027789061,Qs1529527960,Fd,Fpncyglytvcffmfxfqacgi,c,2028-06-12,2024-06-02 05:12:29,682.748693359433,Roerpmsgpejemhcigritxlun,1469595262,A4300571,Nwzg,Ukpdmtnfpsvmnvdavyuyoftrzlms,k,2013-02-17,2023-09-01 08:18:54,386.772844654868,Rmstcfpgrvcrfqfwvsyfhgpqxdbgv,1752823771,Llo1819357269,Lg,Teswkrauvgvojjeplxbvydilwhr,f,2028-03-10,2021-09-29 19:41:16,888.717122789806,Ozeapjezxjgzzgebhzkkjktp,1762806379,Ac33789823,Eajl,Kedabscypxilpdpyqjmaefpfijcyc,e,2016-08-13,2022-05-15 02:24:18,544.657600831547,Uxdzjrhmdsmvkzkwnrxkve,1279306255,Rsqd1811453796,Ss,Jjsurzvtrcwtnycnfqntdkphehrad,q,2030-11-11,2024-11-05 09:00:21,752.772140201541,Bqsbvrbqecsfetoqqueztytkpkiup,88596263,Wz1300719967,Mvev,Rngnozdxmnayvtddwhlljhadswfo,x,2012-10-16,2021-08-22 00:22:02,463.684842672052,Iigrfvqhlicalbfmsqnsjmjmdvsuo,2145449363,So2054197071,Lx,Rlvexyychvzcelhtpvyunkdv,s,2023-01-12,2021-03-25 17:29:36,385.623126470308,Mouogybwfpkobnxvmvzkujqm,246614772,Gial1034617818,O,Vgfnymgxkgnfmwfagpyzrdxhlh,r,2031-01-28,2021-06-08 23:42:17,761.096265521411,Jalsrqyxmexyjyxmkczf,1869934901,O2012582523,Ixb,Unaqeefaeokisluuenjouhqwof,g,2022-11-25,2022-11-14 01:46:15,999.32456715001,Swgrrwifurmfnpxdruenuom,1823103621,Xeb2001938284,Uneg,Lmtdxwioxibcgrbpqimnejkeur,g,2019-02-24,2021-05-14 18:44:07,872.616968058337,Bgylrxqgrmzpnluxkwidestmbbojg,1333053579,R63674283,Aw,Fkracuafuwtztvlostjnlkp,i,2018-05-26,2024-11-09 20:41:46,53.8538107899268,Hodlypelqdcxshhevjmupdhr,1381710528,Xv1681803075,Tc,Oxftibeqzxprlvdclnxngxdgmup,r,2021-03-16,2022-02-25 09:16:49,311.100490070461,Zeekclnhhdpgszfmusjvwpm,1405657019,Yhn991015726,Hhp,Rhrsazzpgchxompdxqimnk,s,2024-11-06,2022-03-18 06:45:38,147.182047435633,Zvuwhrmhxvbsjvhijjvjv,1963253726,Pq2108029417,S,Pebwwztlgzfcerivyyqgbi,d,2033-08-10,2021-09-30 15:39:51,320.673700571374,Negiptaiqavnvnxdjqhq,484201497,U1510570048,L,Ggagcnxggzrqiejrvclvseft,f,2024-12-14,2022-02-27 18:03:57,858.780093425317,Kohdiubputzxhqdszymwjyqp,1356749899,Bbh74854548,Wbu,Ljnakhbbimxlobbgoezdmysmpsai,t,2015-12-01,2024-05-27 16:50:58,860.739231976093,Usilycohxhdtgnafuarbrjnr,49822959,Rh1571494922,Dj,Zuisuqclvpqptieacydl,u,2034-02-17,2023-04-09 01:17:01,193.705941174974,Lnkhoodtshtrnakoqvuxcgdmhq,836712094,X512713570,J,Ajdrdgamvbalipxtweaph,p,2015-10-06,2023-04-25 19:52:13,919.411686677212,Yedwlejnmrhxnotkgecb,2011851705,M592259851,B,Tvlestdiwiyqvbvcglzrl,v,2035-08-14,2023-07-25 17:40:28,980.103714847986,Wcxswvjbqrbmodjgxbioha,255539727,Gvbk1473008008,Ycfl,Akdmdguldbtwvheyvakavyzmatzjs,s,2036-09-03,2023-10-12 00:50:55,118.407706319544,Ivtpeimpzwmzfdnzdculbc,912295953,Ljg871780963,Kdm,Pyjefvbngzdabnvwspvmregkbdv,b,2013-08-10,2021-06-07 03:13:06,564.483654948177,Zfpfdvxhsyvchrkvlnbvhablryc,175617207,A910887051,Kk,Vyqswsottiedktzqovtk,y,2015-04-05,2024-03-19 05:50:16,535.906677849547,Tvgsnlrxroxuvedthidmvs,725903610,J1869025933,Rzc,Tcncwhagwmftebvtqqrrvabkbm,g,2020-10-28,2022-05-01 12:58:39,888.202324457561,Xoxdshcgmgbgzpzeyndy,80694257,Lw1577069152,D,Kbrqzmiehydlokekttbu,c,2019-11-24,2023-09-21 23:52:17,827.378210996919,Yzpdakqebwlplhnguwajsjqda,206346985,Aiyb1627642107,Cant,Gnngmntvhmonhlglupil,c,2036-11-30,2023-02-08 23:05:52,635.089174208738,Curtigzntqnwlwcjfummuqqmkilf,652383811,Icwk850342262,Bcyf,Aovtpjsfbxdyebldeiavufuil,z,2012-07-30,2022-12-01 05:54:17,356.73315886256,Cvhxucvtvytzgbedsiypxty,824753381,Utmi1249014192,Fw,Uhqghjilnccvztehhsotkjxxezi,i,2022-08-27,2023-12-02 07:30:58,645.934635608427,Dmhwmlbphmfwhyvaibhprcikk,1596449186,H42876063,Ahlo,Mmhuwrzlydbpfdiajybwadwmti,t,2026-06-20,2023-08-23 07:25:54,451.75321421202,Kthjoaglxsrkhidxeszqijrqipvbn,1971383987,Dm403923426,Vyu,Zdndejtodplpwivpbcqayfexahn,x,2013-12-07,2022-02-21 20:34:15,312.817581143611,Jxamugmgpbslciovrppshuvtyqdxw,1800199333,Lh1059046233,Y,Iuuqjkxntvrtrgnbpqpcgoe,c,2027-05-26,2023-04-23 11:09:26,755.287993585359,Gepcpnjuucyjygfvldepyksvq,1854383440,U1346715734,Azr,Hpfpdewtgmsfdzijqlfdqwl,t,2023-03-30,2021-12-04 21:42:30,464.042749006321,Dccysqzqpwaasfdgdlsblgbpu,1103793655,Kdm303029158,Si,Ekunnzsuulellsfqzakdwbnde,y,2026-10-13,2022-11-28 14:12:48,105.784104254928,Pikpzwiyebsmhdqcgsxwdkhescw,1404350241,Pl503460970,Avv,Vtjhbvikkujncrwogpfa,f,2035-08-31,2021-06-01 08:48:38,968.483556047307,Ppqmvghubkyooboztiindfxork,955850280,Uuy1933441043,Ql,Ryonbsagyasnqblonlnkrc,v,2022-07-07,2021-08-30 15:47:16,655.527795504559,Hmadxpiivtulleqpqsya,1593609900,Jj2047768610,B,Ocdskstuxxuxhtquszcfamfsw,q,2018-05-04,2021-02-18 23:30:13,123.185212315612,Evottsqcbslwrsyasasoqyawob,1955508491,Wt964387245,Qgsz,Nzxeqykudvmtwygfoafvrfr,v,2016-01-15,2023-12-20 03:08:12,290.14008133213,Pflzzreaujaapckglravep,184624003,N

‎Tests/Tests.csproj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,15 @@
109109
<None Include="TestFiles\convertcsv.csv">
110110
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
111111
</None>
112-
<EmbeddedResource Include="TestFiles\semicolon.csv" />
112+
<EmbeddedResource Include="TestFiles\semicolon.csv">
113+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
114+
</EmbeddedResource>
113115
<None Include="TestFiles\multline.csv">
114116
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
115117
</None>
118+
<None Include="TestFiles\random50x10CRonly.csv">
119+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
120+
</None>
116121
<None Include="TestFiles\TabsWithQuotesInText.csv">
117122
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
118123
</None>

0 commit comments

Comments
 (0)