zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 00:02:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

ObjLoading: Display error message on directory_iterator throwing an exception

Browse Source
This commit is contained in:
Jan 2020-02-04 19:44:56 +01:00
parent 10342a7b58
commit b8c2557482
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/ObjLoading/SearchPath/SearchPathFilesystem.cpp
View File

@ -25,28 +25,36 @@ FileAPI::IFile* SearchPathFilesystem::Open(const std::string& fileName)
return nullptr; return nullptr;
} }
void SearchPathFilesystem::Find(const SearchPathSearchOptions& options, const std::function<void(const std::string&)>& callback) void SearchPathFilesystem::Find(const SearchPathSearchOptions& options,
const std::function<void(const std::string&)>& callback)
{ {
if (options.m_should_include_subdirectories) try
{ {
std::filesystem::recursive_directory_iterator iterator(m_path); if (options.m_should_include_subdirectories)
for (const auto entry = begin(iterator); iterator != end(iterator); ++iterator)
{ {
auto path = entry->path(); std::filesystem::recursive_directory_iterator iterator(m_path);
if (options.m_filter_extensions && path.extension().string() != options.m_extension) for (const auto entry = begin(iterator); iterator != end(iterator); ++iterator)
continue; {
callback(options.m_absolute_paths ? absolute(path).string() : path.string()); auto path = entry->path();
if (options.m_filter_extensions && path.extension().string() != options.m_extension)
continue;
callback(options.m_absolute_paths ? absolute(path).string() : path.string());
}
}
else
{
std::filesystem::directory_iterator iterator(m_path);
for (const auto entry = begin(iterator); iterator != end(iterator); ++iterator)
{
auto path = entry->path();
if (options.m_filter_extensions && path.extension().string() != options.m_extension)
continue;
callback(options.m_absolute_paths ? absolute(path).string() : path.string());
}
} }
} }
else catch (std::filesystem::filesystem_error& e)
{ {
std::filesystem::directory_iterator iterator(m_path); printf("Directory Iterator threw error when trying to find files: \"%s\"\n", e.what());
for (const auto entry = begin(iterator); iterator != end(iterator); ++iterator)
{
auto path = entry->path();
if (options.m_filter_extensions && path.extension().string() != options.m_extension)
continue;
callback(options.m_absolute_paths ? absolute(path).string() : path.string());
}
} }
} }