owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restored cancellable scan

Browse Source
This commit is contained in:
emeric
2020-02-20 14:09:52 +01:00
parent 284231ff92
commit 0ad4973a5a
3 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/utils/impl/Path.cpp
+11 -4
View File
@@ -88,7 +88,7 @@ getLastWriteTime(const std::filesystem::path& file)
}
void
exploreFilesRecursive(const std::filesystem::path& directory, std::function<void(std::error_code, const std::filesystem::path&)> cb)
exploreFilesRecursive(const std::filesystem::path& directory, std::function<bool(std::error_code, const std::filesystem::path&)> cb)
{
std::error_code ec;
std::filesystem::directory_iterator itPath {directory, std::filesystem::directory_options::follow_directory_symlink, ec};
@@ -102,23 +102,30 @@ exploreFilesRecursive(const std::filesystem::path& directory, std::function<void
std::filesystem::directory_iterator itEnd;
while (itPath != itEnd)
{
bool continueExploring {true};
if (ec)
{
cb(ec, *itPath);
continueExploring = cb(ec, *itPath);
}
else
{
if (std::filesystem::is_regular_file(*itPath, ec))
cb(ec, *itPath);
{
continueExploring = cb(ec, *itPath);
}
else if (std::filesystem::is_directory(*itPath, ec))
{
if (!ec)
exploreFilesRecursive(*itPath, cb);
else
cb(ec, *itPath);
continueExploring = cb(ec, *itPath);
}
}
if (!continueExploring)
break;
itPath.increment(ec);
}
}