Browse Source

Manager: Rename filter() -> match()

The function returns true on a pattern match, so reflect this in the
name.
master
Riyyi 3 years ago
parent
commit
3b4ea3f42d
  1. 6
      src/dotfile.cpp
  2. 4
      src/dotfile.h
  3. 2
      test/unit/testdotfile.cpp

6
src/dotfile.cpp

@ -106,7 +106,7 @@ void Dotfile::push(const std::vector<std::string>& targets)
pullOrPush(SyncType::Push, targets);
}
bool Dotfile::filter(const std::filesystem::directory_entry& path,
bool Dotfile::match(const std::filesystem::directory_entry& path,
const std::vector<std::string>& patterns)
{
std::string pathString = path.path().string();
@ -490,11 +490,11 @@ void Dotfile::forEachDotfile(const std::vector<std::string>& targets, const std:
continue;
}
// Ignore pattern check
if (filter(path, Config::the().ignorePatterns())) {
if (match(path, Config::the().ignorePatterns())) {
continue;
}
// Include check
if (!targets.empty() && !filter(path, targets)) {
if (!targets.empty() && !match(path, targets)) {
continue;
}
callback(path, index++);

4
src/dotfile.h

@ -30,8 +30,8 @@ public:
void pull(const std::vector<std::string>& targets = {});
void push(const std::vector<std::string>& targets = {});
bool filter(const std::filesystem::directory_entry& path,
const std::vector<std::string>& patterns);
bool match(const std::filesystem::directory_entry& path,
const std::vector<std::string>& patterns);
private:
void pullOrPush(SyncType type, const std::vector<std::string>& targets = {});

2
test/unit/testdotfile.cpp

@ -94,7 +94,7 @@ void testDotfileFilters(const std::unordered_map<std::string, bool>& tests,
createTestDotfiles(fileNames, fileContents);
for (const auto& path : fileNames) {
bool result = Dotfile::the().filter(std::filesystem::directory_entry { "/" + path }, testIgnorePatterns);
bool result = Dotfile::the().match(std::filesystem::directory_entry { "/" + path }, testIgnorePatterns);
EXPECT_EQ(result, tests.at(path), printf(" path = '%s'\n", path.c_str()));
}

Loading…
Cancel
Save