godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +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 4f891b7060
commit 48108444f1
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
editor/editor_file_system.cpp
View File

@@ -684,9 +684,7 @@ void EditorFileSystem::_scan_new_dir(EditorFileSystemDirectory *p_dir, DirAccess
if (f.begins_with(".")) // Ignore special and . / ..
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;
dirs.push_back(f);
@@ -886,9 +884,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;
EditorFileSystemDirectory *efd = memnew(EditorFileSystemDirectory);
@@ -2024,6 +2020,16 @@ 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);
}