godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Find in Files: 

- FileAccess was accessed null (remains of GDScript port)
- `_current_file` wasn't going up correctly in case a scanned directory had no subdirectories
- Paths stored in `_files_to_scan` were not full paths
This commit is contained in:
Marc Gilleron 2018-04-21 17:19:25 +02:00
parent 7d6f210ccb
commit 4c415001b2
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
editor/find_in_files.cpp
View File

@ -154,9 +154,7 @@ void FindInFiles::_iterate() {
PoolStringArray sub_dirs; PoolStringArray sub_dirs;
_scan_dir(_root_prefix + _current_dir, sub_dirs); _scan_dir(_root_prefix + _current_dir, sub_dirs);
if (sub_dirs.size() != 0) { _folders_stack.push_back(sub_dirs);
_folders_stack.push_back(sub_dirs);
}
} else { } else {
// Go back one level // Go back one level
@ -176,7 +174,7 @@ void FindInFiles::_iterate() {
String fpath = _files_to_scan[_files_to_scan.size() - 1]; String fpath = _files_to_scan[_files_to_scan.size() - 1];
pop_back(_files_to_scan); pop_back(_files_to_scan);
_scan_file(_root_prefix + fpath); _scan_file(fpath);
} else { } else {
print_line("Search complete"); print_line("Search complete");
@ -202,8 +200,6 @@ void FindInFiles::_scan_dir(String path, PoolStringArray &out_folders) {
return; return;
} }
//print_line(String("Scanning ") + path);
dir->list_dir_begin(); dir->list_dir_begin();
for (int i = 0; i < 1000; ++i) { for (int i = 0; i < 1000; ++i) {
@ -222,7 +218,7 @@ void FindInFiles::_scan_dir(String path, PoolStringArray &out_folders) {
else { else {
String file_ext = file.get_extension(); String file_ext = file.get_extension();
if (_extension_filter.has(file_ext)) { if (_extension_filter.has(file_ext)) {
_files_to_scan.push_back(file); _files_to_scan.push_back(path.plus_file(file));
} }
} }
} }
@ -232,7 +228,6 @@ void FindInFiles::_scan_file(String fpath) {
FileAccess *f = FileAccess::open(fpath, FileAccess::READ); FileAccess *f = FileAccess::open(fpath, FileAccess::READ);
if (f == NULL) { if (f == NULL) {
f->close();
print_line(String("Cannot open file ") + fpath); print_line(String("Cannot open file ") + fpath);
return; return;
} }