github/obs-localvocal
1
1
Fork 0
mirror of https://github.com/royshil/obs-localvocal.git synced 2026-01-09 12:28:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Improve error handling in find_file_in_folder_by_regex_expression

Browse Source 
- Add error handling for cases where the folder does not exist or is not a directory
- Handle empty file name regex gracefully
- Catch and log any exceptions that occur during the file search process
This commit is contained in:
Roy Shilkrot
2024-07-18 17:03:03 -04:00
parent b009bd0c37
commit 9f10390d55
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/model-utils/model-find-utils.cpp
View File

@@ -24,11 +24,28 @@ std::string find_file_in_folder_by_name(const std::string &folder_path,
std::string find_file_in_folder_by_regex_expression(const std::string &folder_path,
const std::string &file_name_regex)
{
for (const auto &entry : std::filesystem::directory_iterator(folder_path)) {
if (std::regex_match(entry.path().filename().string(),
std::regex(file_name_regex))) {
return entry.path().string();
if (!std::filesystem::exists(folder_path)) {
obs_log(LOG_ERROR, "Folder does not exist: %s", folder_path.c_str());
return "";
}
if (!std::filesystem::is_directory(folder_path)) {
obs_log(LOG_ERROR, "Path is not a folder: %s", folder_path.c_str());
return "";
}
if (file_name_regex.empty()) {
obs_log(LOG_ERROR, "Empty file name regex");
return "";
}
try {
for (const auto &entry : std::filesystem::directory_iterator(folder_path)) {
if (std::regex_match(entry.path().filename().string(),
std::regex(file_name_regex))) {
return entry.path().string();
}
}
} catch (const std::exception &e) {
obs_log(LOG_ERROR, "Error finding file in folder by regex expression: %s",
e.what());
}
return "";
}