Language/CSV/Mapping: CRLF support

Author: MorganCaron

modules/Language/CSV/Mapping.mpp

@@ -63,7 +63,12 @@ export namespace CppUtils::Language::CSV
 	{
 		const auto lines = csv
 			| std::views::split(lineSeparator)
-			| std::views::transform([](auto&& range) { return std::string_view{range}; })
+			| std::views::transform([&](auto&& range) {
+				auto line = std::string_view{range};
+				if (lineSeparator == "\n" and not std::empty(line) and line.back() == '\r')
+					line.remove_suffix(1);
+				return line;
+			})
 			| std::ranges::to<std::vector<std::string_view>>();
 		for (auto i = dropNFirstLines; i < std::size(lines); ++i)
 			if (const auto trimmedLine = String::trimString(lines[i]); not std::empty(trimmedLine))

tests/Language/CSV/Mapping.mpp

@@ -29,22 +29,22 @@ namespace CppUtils::UnitTest::Language::CSV::Mapping
 	using namespace CppUtils::String::Literals;
 
 	using CSVMapping = CppUtils::Type::Mapping<
-		CppUtils::Type::Pair<"String view"_token, "A"_excelColumn>,
-		CppUtils::Type::Pair<"String"_token, "B"_excelColumn>,
+		CppUtils::Type::Pair<"String 1"_token, "A"_excelColumn>,
+		CppUtils::Type::Pair<"String 2"_token, "B"_excelColumn>,
 		CppUtils::Type::Pair<"Unsigned integer"_token, "C"_excelColumn>,
 		CppUtils::Type::Pair<"Signed integer"_token, "D"_excelColumn>,
 		CppUtils::Type::Pair<"Floating point"_token, "E"_excelColumn>>;
 
 	using StructMapping = CppUtils::Type::Mapping<
-		CppUtils::Type::Pair<"String view"_token, &Object::a>,
-		CppUtils::Type::Pair<"String"_token, &Object::b>,
+		CppUtils::Type::Pair<"String 1"_token, &Object::a>,
+		CppUtils::Type::Pair<"String 2"_token, &Object::b>,
 		CppUtils::Type::Pair<"Unsigned integer"_token, &Object::c>,
 		CppUtils::Type::Pair<"Signed integer"_token, &Object::d>,
 		CppUtils::Type::Pair<"Floating point"_token, &Object::e>>;
 
 	using FileStructMapping = CppUtils::Type::Mapping<
-		CppUtils::Type::Pair<"String view"_token, &FileObject::a>,
-		CppUtils::Type::Pair<"String"_token, &FileObject::b>,
+		CppUtils::Type::Pair<"String 1"_token, &FileObject::a>,
+		CppUtils::Type::Pair<"String 2"_token, &FileObject::b>,
 		CppUtils::Type::Pair<"Unsigned integer"_token, &FileObject::c>,
 		CppUtils::Type::Pair<"Signed integer"_token, &FileObject::d>,
 		CppUtils::Type::Pair<"Floating point"_token, &FileObject::e>>;
@@ -133,6 +133,17 @@ namespace CppUtils::UnitTest::Language::CSV::Mapping
 			}};
 		});
 
+		suite.addTest("load CSV File with CRLF", [&] {
+			CppUtils::FileSystem::TemporaryDirectory{[&suite](const auto& directory) {
+				const auto filePath = directory / "test_crlf.csv";
+				CppUtils::FileSystem::String::write(filePath, "a;b;c;d;e\r\nfoo;bar;42;-1;3.14\r\n"sv);
+
+				const auto objects = CppUtils::Language::CSV::loadFile<FileObject, FileObjectMapping>(filePath, ";", "\n", 1uz);
+
+				suite.expectEqual(objects, std::vector<FileObject>{{"foo", "bar", 42, -1, 3.14f}});
+			}};
+		});
+
 		suite.addTest("load CSV Directory", [&] {
 			CppUtils::FileSystem::TemporaryDirectory{[&suite](const auto& directory) {
 				CppUtils::FileSystem::String::write(directory / "test1.csv", "a;b;c;d;e\nfoo;bar;1;-10;1.1\n"sv);

tests/Type/Mapping.mpp

@@ -6,10 +6,10 @@ namespace CppUtils::UnitTest::Type::Mapping
 {
 	namespace Map
 	{
-		using Map = ::CppUtils::Type::Mapping<
-			::CppUtils::Type::Pair<0, 100>,
-			::CppUtils::Type::Pair<1, 200>,
-			::CppUtils::Type::Pair<2, 300>>;
+		using Map = CppUtils::Type::Mapping<
+			CppUtils::Type::Pair<0, 100>,
+			CppUtils::Type::Pair<1, 200>,
+			CppUtils::Type::Pair<2, 300>>;
 
 		static_assert(std::get<0>(Map::toRhs<0>()) == 100);
 		static_assert(std::get<0>(Map::toRhs<1>()) == 200);
@@ -30,8 +30,8 @@ namespace CppUtils::UnitTest::Type::Mapping
 
 	namespace MultiMap
 	{
-		using MultiMap = ::CppUtils::Type::Mapping<
-			::CppUtils::Type::Pair<0, 1, 2, 3>>;
+		using MultiMap = CppUtils::Type::Mapping<
+			CppUtils::Type::Pair<0, 1, 2, 3>>;
 
 		static_assert(std::tuple_size_v<decltype(MultiMap::toRhs<0>())> == 3);
 		static_assert(std::get<0>(MultiMap::toRhs<0>()) == 1);
@@ -49,9 +49,9 @@ namespace CppUtils::UnitTest::Type::Mapping
 
 	namespace Boolean
 	{
-		using BooleanMap = ::CppUtils::Type::Mapping<
-			::CppUtils::Type::Pair<0, true>,
-			::CppUtils::Type::Pair<1, false>>;
+		using BooleanMap = CppUtils::Type::Mapping<
+			CppUtils::Type::Pair<0, true>,
+			CppUtils::Type::Pair<1, false>>;
 
 		static_assert(BooleanMap::toSingleRhs<0>());
 		static_assert(not BooleanMap::toSingleRhs<1>());
@@ -68,8 +68,8 @@ namespace CppUtils::UnitTest::Type::Mapping
 			return x * 2;
 		}
 
-		using FunctionMap = ::CppUtils::Type::Mapping<
-			::CppUtils::Type::Pair<0, &function>>;
+		using FunctionMap = CppUtils::Type::Mapping<
+			CppUtils::Type::Pair<0, &function>>;
 
 		static_assert(FunctionMap::toSingleRhs<0>() == &function);
 
@@ -83,8 +83,8 @@ namespace CppUtils::UnitTest::Type::Mapping
 			int value;
 		};
 
-		using MemberMap = ::CppUtils::Type::Mapping<
-			::CppUtils::Type::Pair<0, &Struct::value>>;
+		using MemberMap = CppUtils::Type::Mapping<
+			CppUtils::Type::Pair<0, &Struct::value>>;
 
 		static_assert(MemberMap::toSingleRhs<0>() == &Struct::value);