Skip to content
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

Jump to bottom

parsercsv: Minor refactor to prefer standard algorithms and datatypes #10871

Merged
merged 1 commit into from
Sep 6, 2022
Merged

parsercsv: Minor refactor to prefer standard algorithms and datatypes #10871

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
33 changes: 16 additions & 17 deletions src/library/parsercsv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,29 +41,28 @@ QList<QString> ParserCsv::parseAllLocations(const QString& playlistFile) {

QList<QList<QString>> tokens = tokenize(bytes, ',');

// detect Location column
int locationColumnIndex = -1;
const auto detect_location_column =
[&](const auto& tokens_list,
auto predicate) -> std::optional<std::size_t> {
const auto it = std::find_if(std::begin(tokens_list), std::end(tokens_list), predicate);
return (it != std::end(tokens_list))
? std::distance(std::begin(tokens_list), it)
: std::optional<std::size_t>{};
};
if (tokens.size()) {
for (int i = 0; i < tokens[0].size(); ++i) {
if (tokens[0][i] == QObject::tr("Location")) {
locationColumnIndex = i;
break;
}
}
if (locationColumnIndex < 0 && tokens.size() > 1) {
std::optional<std::size_t> locationColumnIndex = detect_location_column(
tokens[0],
[&](auto i) { return i == QObject::tr("Location"); });
if ((!locationColumnIndex.has_value()) && tokens.size() > 1) {
// Last resort, find column with path separators
// This happens in case of csv files in a different language
for (int i = 0; i < tokens[1].size(); ++i) {
if (tokens[1][i].contains(QDir::separator())) {
locationColumnIndex = i;
break;
}
}
locationColumnIndex = detect_location_column(tokens[1],
[&](auto i) { return i.contains(QDir::separator()); });
}
if (locationColumnIndex >= 0) {
if (locationColumnIndex.has_value()) {
for (int row = 1; row < tokens.size(); ++row) {
if (locationColumnIndex < tokens[row].size()) {
locations.append(tokens[row][locationColumnIndex]);
Comment on lines 63 to -66
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would you mind making this range-based for as well?

locations.append(tokens[row][static_cast<int>(*locationColumnIndex)]);
}
}
} else {
Expand Down