From f5b7458bfee95fb29c296c694e9beaf90394fc56 Mon Sep 17 00:00:00 2001 From: Florian OMNES Date: Mon, 10 Feb 2025 17:41:08 +0100 Subject: [PATCH] More simplification --- .../DataSeriesRepoImporter.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/io/inputs/data-series-csv-importer/DataSeriesRepoImporter.cpp b/src/io/inputs/data-series-csv-importer/DataSeriesRepoImporter.cpp index 9e867cfde2..c73b43c295 100644 --- a/src/io/inputs/data-series-csv-importer/DataSeriesRepoImporter.cpp +++ b/src/io/inputs/data-series-csv-importer/DataSeriesRepoImporter.cpp @@ -43,12 +43,14 @@ DataSeriesRepository DataSeriesRepoImporter::importFromDirectory(const std::file throw std::invalid_argument("Not a directory: " + path.string()); } - auto paths = std::filesystem::directory_iterator{path}; - auto pathFilter = std::views::filter([](const auto& e) { return is_regular_file(e); }) - | std::views::filter(&hasRightExtension); + using std::views::filter; + auto pathFilter = filter(static_cast( + &std::filesystem::is_regular_file)) + | filter(&hasRightExtension); DataSeriesRepository repo{}; - for (const auto& entry: paths | pathFilter) + for (auto paths = std::filesystem::directory_iterator{path}; + const auto& entry: paths | pathFilter) { std::unique_ptr timeSeriesSet = std::make_unique( TimeSeriesSetImporter::importFromFile(entry, csvSeparator));