Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-25 15:45:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added try/catch statements to a couple of std::filesystem functions in FileSystemUtil

Browse source
This commit is contained in:
Leon Styhre 2023-08-02 19:32:46 +02:00
parent 5705672957
commit 05cfbb55bd
1 changed files with 61 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
es-core/src/utils/FileSystemUtil.cpp
View file

@ -70,25 +70,30 @@ namespace Utils
if (!isDirectory(genericPath))
return contentList;
if (recursive) {
for (auto& entry : std::filesystem::recursive_directory_iterator(genericPath)) {
try {
if (recursive) {
for (auto& entry : std::filesystem::recursive_directory_iterator(genericPath)) {
#if defined(_WIN64)
contentList.emplace_back(
Utils::String::wideStringToString(entry.path().generic_wstring()));
contentList.emplace_back(
Utils::String::wideStringToString(entry.path().generic_wstring()));
#else
contentList.emplace_back(entry.path().generic_string());
contentList.emplace_back(entry.path().generic_string());
#endif
}
}
else {
for (auto& entry : std::filesystem::directory_iterator(genericPath)) {
#if defined(_WIN64)
contentList.emplace_back(
Utils::String::wideStringToString(entry.path().generic_wstring()));
#else
contentList.emplace_back(entry.path().generic_string());
#endif
}
}
}
else {
for (auto& entry : std::filesystem::directory_iterator(genericPath)) {
#if defined(_WIN64)
contentList.emplace_back(
Utils::String::wideStringToString(entry.path().generic_wstring()));
#else
contentList.emplace_back(entry.path().generic_string());
#endif
}
catch (...) {
return contentList;
}
contentList.sort();
@ -884,12 +889,17 @@ namespace Utils
bool exists(const std::string& path)
{
const std::string& genericPath {getGenericPath(path)};
try {
const std::string& genericPath {getGenericPath(path)};
#if defined(_WIN64)
return std::filesystem::exists(Utils::String::stringToWideString(genericPath));
return std::filesystem::exists(Utils::String::stringToWideString(genericPath));
#else
return std::filesystem::exists(genericPath);
return std::filesystem::exists(genericPath);
#endif
}
catch (...) {
return false;
}
}
bool driveExists(const std::string& path)
@ -911,42 +921,64 @@ namespace Utils
bool isAbsolute(const std::string& path)
{
const std::string& genericPath {getGenericPath(path)};
try {
const std::string& genericPath {getGenericPath(path)};
#if defined(_WIN64)
return ((genericPath.size() > 1) && (genericPath[1] == ':'));
return ((genericPath.size() > 1) && (genericPath[1] == ':'));
#else
return ((genericPath.size() > 0) && (genericPath[0] == '/'));
return ((genericPath.size() > 0) && (genericPath[0] == '/'));
#endif
}
catch (...) {
return false;
}
}
bool isRegularFile(const std::string& path)
{
const std::string& genericPath {getGenericPath(path)};
try {
const std::string& genericPath {getGenericPath(path)};
#if defined(_WIN64)
return std::filesystem::is_regular_file(Utils::String::stringToWideString(genericPath));
return std::filesystem::is_regular_file(
Utils::String::stringToWideString(genericPath));
#else
return std::filesystem::is_regular_file(genericPath);
return std::filesystem::is_regular_file(genericPath);
#endif
}
catch (...) {
return false;
}
}
bool isDirectory(const std::string& path)
{
const std::string& genericPath {getGenericPath(path)};
try {
const std::string& genericPath {getGenericPath(path)};
#if defined(_WIN64)
return std::filesystem::is_directory(Utils::String::stringToWideString(genericPath));
return std::filesystem::is_directory(
Utils::String::stringToWideString(genericPath));
#else
return std::filesystem::is_directory(genericPath);
return std::filesystem::is_directory(genericPath);
#endif
}
catch (...) {
return false;
}
}
bool isSymlink(const std::string& path)
{
const std::string& genericPath {getGenericPath(path)};
try {
const std::string& genericPath {getGenericPath(path)};
#if defined(_WIN64)
return std::filesystem::is_symlink(Utils::String::stringToWideString(genericPath));
return std::filesystem::is_symlink(Utils::String::stringToWideString(genericPath));
#else
return std::filesystem::is_symlink(genericPath);
return std::filesystem::is_symlink(genericPath);
#endif
}
catch (...) {
return false;
}
}
bool isHidden(const std::string& path)