Skip to content

Commit 085e40d

Browse files
Sov3rainSov3rain
committed
clean up and restructuring of the codebase.
1 parent bf21952 commit 085e40d

18 files changed

+127
-99
lines changed

‎Assets/Scripts/CSVExample.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22
using System.Linq;
3-
using Sov3rain;
3+
using UniCSV;
44
using UnityEngine;
55

66
public class CSVExample : MonoBehaviour
@@ -27,14 +27,14 @@ private void Start()
2727
LoadCSV(_usernamesCSV);
2828
LoadCSV(_csvWithEmptyLines);
2929

30-
var users = CSVParser.ParseFromString<User>(_usernamesCSV.text).ToList();
30+
var users = CsvParser.ParseFromString<User>(_usernamesCSV.text).ToList();
3131
}
3232

3333
private void LoadCSV(TextAsset usernamesCsv)
3434
{
3535
try
3636
{
37-
var data = CSVParser.ParseFromString(usernamesCsv.text);
37+
var data = CsvParser.ParseFromString(usernamesCsv.text);
3838

3939
Debug.Log($"Loaded {data.Count} rows from file");
4040

‎Assets/uni-csv/Runtime/CSVParser.cs‎

Lines changed: 4 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,12 @@
55
using System.Reflection;
66
using System.Text;
77
using System.Text.RegularExpressions;
8-
using static Sov3rain.CSVParser.Delimiter;
8+
using static UniCSV.Delimiter;
99

10-
namespace Sov3rain
10+
namespace UniCSV
1111
{
12-
public static class CSVParser
12+
public static class CsvParser
1313
{
14-
private static readonly char[] COMMON_DELIMITERS = { ',', '\t', ';', '|' };
15-
16-
public enum Delimiter
17-
{
18-
Auto,
19-
Comma,
20-
Tab,
21-
Semicolon,
22-
Pipe
23-
}
24-
2514
/// <summary>
2615
/// Load CSV data from a specified path.
2716
/// </summary>
@@ -112,7 +101,7 @@ public static List<List<string>> ParseFromString(
112101
{
113102
if (delimiter == Auto)
114103
{
115-
delimiter = DetectDelimiterFromContent(data);
104+
delimiter = DelimiterUtils.DetectDelimiterFromContent(data);
116105
}
117106

118107
ConvertToCrlf(ref data);
@@ -205,31 +194,6 @@ public static List<List<string>> ParseFromString(
205194
return sheet;
206195
}
207196

208-
private static Delimiter DetectDelimiterFromContent(string content)
209-
{
210-
if (string.IsNullOrWhiteSpace(content))
211-
return Comma;
212-
213-
// Get the first non-empty line
214-
var firstLine = content.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None)
215-
.FirstOrDefault(line => !string.IsNullOrWhiteSpace(line));
216-
217-
if (string.IsNullOrWhiteSpace(firstLine))
218-
return Comma;
219-
220-
var delimiterCounts = COMMON_DELIMITERS
221-
.ToDictionary(d => d, d => firstLine.Count(c => c == d));
222-
223-
var mostFrequentDelimiter = delimiterCounts
224-
.OrderByDescending(kvp => kvp.Value)
225-
.First();
226-
227-
if (mostFrequentDelimiter.Value <= 1)
228-
return Comma;
229-
230-
return CharToDelimiter(mostFrequentDelimiter.Key);
231-
}
232-
233197
private static bool IsRowNonEmpty(List<string> row) =>
234198
row.Count > 0 &&
235199
row.Any(cell => !string.IsNullOrWhiteSpace(cell));
@@ -251,24 +215,6 @@ private static void ConvertToCrlf(ref string data)
251215
data = Regex.Replace(data, @"\r\n|\r|\n", "\r\n");
252216
}
253217

254-
private static char ToChar(this Delimiter delimiter) => delimiter switch
255-
{
256-
Comma => ',',
257-
Tab => '\t',
258-
Semicolon => ';',
259-
Pipe => '|',
260-
_ => throw new ArgumentException($"Unsupported delimiter: {delimiter}")
261-
};
262-
263-
private static Delimiter CharToDelimiter(char delimiterChar) => delimiterChar switch
264-
{
265-
',' => Comma,
266-
'\t' => Tab,
267-
';' => Semicolon,
268-
'|' => Pipe,
269-
_ => Comma
270-
};
271-
272218
private static object ConvertValue(string value, Type targetType)
273219
{
274220
if (string.IsNullOrWhiteSpace(value))
@@ -279,9 +225,6 @@ private static object ConvertValue(string value, Type targetType)
279225
return targetType.IsValueType ? Activator.CreateInstance(targetType) : null;
280226
}
281227

282-
if (string.IsNullOrWhiteSpace(value))
283-
return targetType.IsValueType ? Activator.CreateInstance(targetType) : null;
284-
285228
if (targetType == typeof(string))
286229
return value;
287230

@@ -303,15 +246,4 @@ private static object ConvertValue(string value, Type targetType)
303246
throw new NotSupportedException($"Type {targetType} is not supported for conversion.");
304247
}
305248
}
306-
}
307-
308-
[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
309-
public class CsvColumnAttribute : Attribute
310-
{
311-
public string Name { get; }
312-
313-
public CsvColumnAttribute(string name)
314-
{
315-
Name = name;
316-
}
317249
}

‎Assets/uni-csv/Runtime/CsvColumnAttribute.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
using System;
2+
3+
namespace UniCSV
4+
{
5+
[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
6+
public sealed class CsvColumnAttribute : Attribute
7+
{
8+
public string Name { get; }
9+
10+
public CsvColumnAttribute(string name)
11+
{
12+
Name = name;
13+
}
14+
}
15+
}

‎Assets/uni-csv/Runtime/CsvColumnAttribute.cs.meta‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/uni-csv/Runtime/Delimiter.cs‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
using System;
2+
using System.Linq;
3+
using static UniCSV.Delimiter;
4+
5+
namespace UniCSV
6+
{
7+
public enum Delimiter
8+
{
9+
Auto,
10+
Comma,
11+
Tab,
12+
Semicolon,
13+
Pipe
14+
}
15+
16+
public static class DelimiterUtils
17+
{
18+
private static readonly char[] COMMON_DELIMITERS = { ',', '\t', ';', '|' };
19+
20+
public static Delimiter DetectDelimiterFromContent(string content)
21+
{
22+
if (string.IsNullOrWhiteSpace(content))
23+
return Comma;
24+
25+
// Get the first non-empty line
26+
var firstLine = content.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None)
27+
.FirstOrDefault(line => !string.IsNullOrWhiteSpace(line));
28+
29+
if (string.IsNullOrWhiteSpace(firstLine))
30+
return Comma;
31+
32+
var delimiterCounts = COMMON_DELIMITERS
33+
.ToDictionary(d => d, d => firstLine.Count(c => c == d));
34+
35+
var mostFrequentDelimiter = delimiterCounts
36+
.OrderByDescending(kvp => kvp.Value)
37+
.First();
38+
39+
if (mostFrequentDelimiter.Value <= 1)
40+
return Comma;
41+
42+
return CharToDelimiter(mostFrequentDelimiter.Key);
43+
}
44+
45+
public static char ToChar(this Delimiter delimiter) => delimiter switch
46+
{
47+
Comma => ',',
48+
Tab => '\t',
49+
Semicolon => ';',
50+
Pipe => '|',
51+
_ => throw new ArgumentException($"Unsupported delimiter: {delimiter}")
52+
};
53+
54+
public static Delimiter CharToDelimiter(char delimiterChar) => delimiterChar switch
55+
{
56+
',' => Comma,
57+
'\t' => Tab,
58+
';' => Semicolon,
59+
'|' => Pipe,
60+
_ => Comma
61+
};
62+
}
63+
}

‎Assets/uni-csv/Runtime/Delimiter.cs.meta‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/uni-csv/Runtime/Sov3rain.UniCSV.asmdef‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"name": "Sov3rain.UniCSV"
3+
}

Assets/uni-csv/Runtime/Sov3rain.Unity-CSV.asmdef.meta renamed to Assets/uni-csv/Runtime/Sov3rain.UniCSV.asmdef.meta

File renamed without changes.

‎Assets/uni-csv/Runtime/Sov3rain.Unity-CSV.asmdef‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎Assets/uni-csv/Tests/Editor/AttributeMappingTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Linq;
22
using NUnit.Framework;
33

4-
namespace Sov3rain.Tests
4+
namespace UniCSV.Tests
55
{
66
[TestFixture]
77
public class AttributeMappingTests
@@ -34,7 +34,7 @@ private class NullableTypesClass
3434
public void ParseFromString_WithAttributes_MapsCorrectly()
3535
{
3636
string csvData = "FirstName,YearsOld,Country\nJohn,25,USA";
37-
var result = CSVParser.ParseFromString<PersonWithAttributes>(csvData).ToList();
37+
var result = CsvParser.ParseFromString<PersonWithAttributes>(csvData).ToList();
3838

3939
Assert.AreEqual(1, result.Count);
4040
Assert.AreEqual("John", result[0].Name);
@@ -46,7 +46,7 @@ public void ParseFromString_WithAttributes_MapsCorrectly()
4646
public void ParseFromString_WithAttributes_HandlesEmptyValues()
4747
{
4848
string csvData = "FirstName,YearsOld,Country\n,25,\nJane,,UK";
49-
var result = CSVParser.ParseFromString<PersonWithAttributes>(csvData).ToList();
49+
var result = CsvParser.ParseFromString<PersonWithAttributes>(csvData).ToList();
5050

5151
Assert.AreEqual(2, result.Count);
5252

@@ -63,7 +63,7 @@ public void ParseFromString_WithAttributes_HandlesEmptyValues()
6363
public void ParseFromString_HandlesNullableTypes()
6464
{
6565
string csvData = "Int,Decimal,String\n,,\nInvalid,Invalid,Value";
66-
var result = CSVParser.ParseFromString<NullableTypesClass>(csvData).ToList();
66+
var result = CsvParser.ParseFromString<NullableTypesClass>(csvData).ToList();
6767

6868
Assert.AreEqual(1, result.Count);
6969
Assert.IsNull(result[0].NullableInt);

0 commit comments

Comments
 (0)