godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Update the filtering logic to properly handle directories with .gdignore files.

Browse Source
This commit is contained in:
Fredia Huya-Kouadio
2021-02-21 21:34:27 -08:00
parent 757c151219
commit eda18fcc1f
4 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
editor/editor_file_system.cpp
View File

@@ -669,10 +669,7 @@ void EditorFileSystem::_scan_new_dir(EditorFileSystemDirectory *p_dir, DirAccess
continue;
}
if (FileAccess::exists(cd.plus_file(f).plus_file("project.godot"))) { // skip if another project inside this
continue;
}
if (FileAccess::exists(cd.plus_file(f).plus_file(".gdignore"))) { // skip if another project inside this
if (_should_skip_directory(cd.plus_file(f))) {
continue;
}
@@ -874,10 +871,7 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir, const
int idx = p_dir->find_dir_index(f);
if (idx == -1) {
if (FileAccess::exists(cd.plus_file(f).plus_file("project.godot"))) { // skip if another project inside this
continue;
}
if (FileAccess::exists(cd.plus_file(f).plus_file(".gdignore"))) { // skip if another project inside this
if (_should_skip_directory(cd.plus_file(f))) {
continue;
}
@@ -1979,6 +1973,20 @@ Error EditorFileSystem::_resource_import(const String &p_path) {
return OK;
}
bool EditorFileSystem::_should_skip_directory(const String &p_path) {
if (FileAccess::exists(p_path.plus_file("project.godot"))) {
// skip if another project inside this
return true;
}
if (FileAccess::exists(p_path.plus_file(".gdignore"))) {
// skip if a `.gdignore` file is inside this
return true;
}
return false;
}
bool EditorFileSystem::is_group_file(const String &p_path) const {
return group_file_cache.has(p_path);
}