smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-19 21:26:26 +01:00
Code Issues Projects Releases Wiki Activity

Use run_functor_for_paths in PBD::find_files_matching_filter

Browse source
This commit is contained in:
Tim Mayberry 2014-06-22 12:53:35 +10:00 • committed by Paul Davis
parent ca8750a5d1
commit 8fe666a930
1 changed files with 1 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

38
libs/pbd/file_utils.cc
View file

@ -297,43 +297,7 @@ find_files_matching_filter (vector<string>& result,
bool match_fullpath, bool return_fullpath, bool match_fullpath, bool return_fullpath,
bool recurse) bool recurse)
{ {
vector<string> all_files; run_functor_for_paths (result, paths, filter, arg, true, match_fullpath, return_fullpath, recurse);
for (vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
string expanded_path = path_expand (*i);
DEBUG_TRACE (DEBUG::FileUtils,
string_compose("Find files in expanded path: %1\n", expanded_path));
get_directory_contents (expanded_path, all_files, true, recurse);
}
for (vector<string>::iterator i = all_files.begin(); i != all_files.end(); ++i) {
string fullpath = *i;
string filename = Glib::path_get_basename (*i);
string search_str;
if (match_fullpath) {
search_str = *i;
} else {
search_str = filename;
}
DEBUG_TRACE (DEBUG::FileUtils,
string_compose("Filter using string: %1\n", search_str));
if (!filter(search_str, arg)) {
continue;
}
DEBUG_TRACE (DEBUG::FileUtils,
string_compose("Found file %1 matching filter\n", search_str));
if (return_fullpath) {
result.push_back(fullpath);
} else {
result.push_back(filename);
}
}
} }
bool bool