riyyi/manafiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Manager: Change match() path argument type

Browse Source 
Changed the path argument from directory_iterator to string, as nothing
in this function relied on the functionality.
This commit is contained in:
Riyyi
2022-03-08 00:18:04 +01:00
parent f4fe44ad02
commit 4cac25b5b3
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dotfile.cpp
+10 -11
View File
@@ -51,8 +51,7 @@ void Dotfile::add(const std::vector<std::string>& targets)
continue;
}
if (match(std::filesystem::directory_entry { targets.at(i) },
Config::the().systemPatterns())) {
if (match(targets.at(i), Config::the().systemPatterns())) {
systemIndices.push_back(i);
}
else {
@@ -107,15 +106,13 @@ void Dotfile::push(const std::vector<std::string>& targets)
pullOrPush(SyncType::Push, targets);
}
bool Dotfile::match(const std::filesystem::directory_entry& path,
const std::vector<std::string>& patterns)
bool Dotfile::match(const std::string& path, const std::vector<std::string>& patterns)
{
std::string pathString = path.path().string();
assert(pathString.front() == '/');
assert(path.front() == '/');
// Cut off working directory
size_t cutFrom = pathString.find(Config::the().workingDirectory()) == 0 ? Config::the().workingDirectorySize() : 0;
pathString = pathString.substr(cutFrom);
size_t cutFrom = path.find(Config::the().workingDirectory()) == 0 ? Config::the().workingDirectorySize() : 0;
std::string pathString = path.substr(cutFrom);
for (const auto& pattern : patterns) {
@@ -244,7 +241,7 @@ void Dotfile::pullOrPush(SyncType type, const std::vector<std::string>& targets)
// Separate home and system targets
forEachDotfile(targets, [&](const std::filesystem::directory_entry& path, size_t index) {
dotfiles.push_back(path.path().string());
if (match(path, Config::the().systemPatterns())) {
if (match(path.path().string(), Config::the().systemPatterns())) {
systemIndices.push_back(index);
}
else {
@@ -487,15 +484,17 @@ void Dotfile::forEachDotfile(const std::vector<std::string>& targets, const std:
{
size_t index = 0;
for (const auto& path : std::filesystem::recursive_directory_iterator { Config::the().workingDirectory() }) {
std::string pathString = path.path().string();
if (path.is_directory()) {
continue;
}
// Ignore pattern check
if (match(path, Config::the().ignorePatterns())) {
if (match(pathString, Config::the().ignorePatterns())) {
continue;
}
// Include check
if (!targets.empty() && !match(path, targets)) {
if (!targets.empty() && !match(pathString, targets)) {
continue;
}
callback(path, index++);
src/dotfile.h
+1 -2
View File
@@ -30,8 +30,7 @@ public:
void pull(const std::vector<std::string>& targets = {});
void push(const std::vector<std::string>& targets = {});
bool match(const std::filesystem::directory_entry& path,
const std::vector<std::string>& patterns);
bool match(const std::string& path, const std::vector<std::string>& patterns);
private:
void pullOrPush(SyncType type, const std::vector<std::string>& targets = {});