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

Manager: Remove non-related parameter from callback

Browse Source
This commit is contained in:
Riyyi
2021-09-23 20:00:18 +02:00
parent c14db5bd46
commit e6842f58d8
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dotfile.cpp
+5 -6
View File
@@ -93,7 +93,8 @@ void Dotfile::list(const std::vector<std::string>& targets)
return; return;
} }
forEachDotfile(targets, [](std::filesystem::directory_entry path, size_t, size_t workingDirectory) { size_t workingDirectory = s_workingDirectory.string().size();
forEachDotfile(targets, [&workingDirectory](std::filesystem::directory_entry path, size_t) {
printf("%s\n", path.path().c_str() + workingDirectory + 1); printf("%s\n", path.path().c_str() + workingDirectory + 1);
}); });
} }
@@ -105,7 +106,7 @@ void Dotfile::pull(const std::vector<std::string>& targets)
std::vector<size_t> systemFiles; std::vector<size_t> systemFiles;
// Separate home and system targets // Separate home and system targets
forEachDotfile(targets, [&](const std::filesystem::directory_entry& path, size_t index, size_t) { forEachDotfile(targets, [&](const std::filesystem::directory_entry& path, size_t index) {
dotfiles.push_back(path.path().string()); dotfiles.push_back(path.path().string());
if (isSystemTarget(path.path().string())) { if (isSystemTarget(path.path().string())) {
systemFiles.push_back(index); systemFiles.push_back(index);
@@ -208,10 +209,8 @@ void Dotfile::sync(const std::vector<std::string>& paths, const std::vector<size
} }
} }
void Dotfile::forEachDotfile(const std::vector<std::string>& targets, const std::function<void(const std::filesystem::directory_entry&, size_t, size_t)>& callback) void Dotfile::forEachDotfile(const std::vector<std::string>& targets, const std::function<void(const std::filesystem::directory_entry&, size_t)>& callback)
{ {
size_t workingDirectory = s_workingDirectory.string().size();
size_t index = 0; size_t index = 0;
for (const auto& path : std::filesystem::recursive_directory_iterator { s_workingDirectory }) { for (const auto& path : std::filesystem::recursive_directory_iterator { s_workingDirectory }) {
if (path.is_directory() || filter(path)) { if (path.is_directory() || filter(path)) {
@@ -220,7 +219,7 @@ void Dotfile::forEachDotfile(const std::vector<std::string>& targets, const std:
if (!targets.empty() && !include(path.path().string(), targets)) { if (!targets.empty() && !include(path.path().string(), targets)) {
continue; continue;
} }
callback(path, index++, workingDirectory); callback(path, index++);
} }
} }
src/dotfile.h
+1 -1
View File
@@ -43,7 +43,7 @@ private:
void sync(const std::vector<std::string>& paths, const std::vector<size_t>& homeIndices, const std::vector<size_t>& systemIndices, void sync(const std::vector<std::string>& paths, const std::vector<size_t>& homeIndices, const std::vector<size_t>& systemIndices,
const std::function<void(std::string*, const std::string&, const std::string&)>& generateHomePaths, const std::function<void(std::string*, const std::string&, const std::string&)>& generateHomePaths,
const std::function<void(std::string*, const std::string&)>& generateSystemPaths); const std::function<void(std::string*, const std::string&)>& generateSystemPaths);
void forEachDotfile(const std::vector<std::string>& targets, const std::function<void(const std::filesystem::directory_entry&, size_t, size_t)>& callback); void forEachDotfile(const std::vector<std::string>& targets, const std::function<void(const std::filesystem::directory_entry&, size_t)>& callback);
bool filter(const std::filesystem::path& path); bool filter(const std::filesystem::path& path);
bool include(const std::filesystem::path& path, const std::vector<std::string>& targets); bool include(const std::filesystem::path& path, const std::vector<std::string>& targets);
bool isSystemTarget(const std::string& target); bool isSystemTarget(const std::string& target);