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

Make file system scan more robust 

Previously, a change was missed if it happened while the scan was in progress and already past the affected location.

Also:
- Consider the scan changes thread on termination, in addition to the full scan one
- Add FS-reported hidden to the check for hidden by the editor file system

(cherry picked from commit 3017bdb7ce)
This commit is contained in:
Pedro J. Estébanez 2020-02-10 09:19:10 +01:00 committed by Rémi Verschelde
parent e834e35ea8
commit 59b8f9b2da
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
editor/editor_file_system.cpp
View File

@ -675,9 +675,12 @@ void EditorFileSystem::_scan_new_dir(EditorFileSystemDirectory *p_dir, DirAccess
if (f == "") if (f == "")
break; break;
if (da->current_is_hidden())
continue;
if (da->current_is_dir()) { if (da->current_is_dir()) {
if (f.begins_with(".")) //ignore hidden and . / .. if (f.begins_with(".")) // Ignore special and . / ..
continue; continue;
if (FileAccess::exists(cd.plus_file(f).plus_file("project.godot"))) // skip if another project inside this if (FileAccess::exists(cd.plus_file(f).plus_file("project.godot"))) // skip if another project inside this
@ -871,9 +874,12 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir, const
if (f == "") if (f == "")
break; break;
if (da->current_is_hidden())
continue;
if (da->current_is_dir()) { if (da->current_is_dir()) {
if (f.begins_with(".")) //ignore hidden and . / .. if (f.begins_with(".")) // Ignore special and . / ..
continue; continue;
int idx = p_dir->find_dir_index(f); int idx = p_dir->find_dir_index(f);
@ -1059,8 +1065,12 @@ void EditorFileSystem::get_changed_sources(List<String> *r_changed) {
void EditorFileSystem::scan_changes() { void EditorFileSystem::scan_changes() {
if (scanning || scanning_changes || thread) if (first_scan || // Prevent a premature changes scan from inhibiting the first full scan
scanning || scanning_changes || thread) {
scan_changes_pending = true;
set_process(true);
return; return;
}
_update_extensions(); _update_extensions();
sources_changed.clear(); sources_changed.clear();
@ -1105,16 +1115,18 @@ void EditorFileSystem::_notification(int p_what) {
} break; } break;
case NOTIFICATION_EXIT_TREE: { case NOTIFICATION_EXIT_TREE: {
if (use_threads && thread) { Thread *active_thread = thread ? thread : thread_sources;
if (use_threads && active_thread) {
//abort thread if in progress //abort thread if in progress
abort_scan = true; abort_scan = true;
while (scanning) { while (scanning) {
OS::get_singleton()->delay_usec(1000); OS::get_singleton()->delay_usec(1000);
} }
Thread::wait_to_finish(thread); Thread::wait_to_finish(active_thread);
memdelete(thread); memdelete(active_thread);
thread = NULL; thread = NULL;
WARN_PRINTS("Scan thread aborted..."); thread_sources = NULL;
WARN_PRINT("Scan thread aborted...");
set_process(false); set_process(false);
} }
@ -1164,6 +1176,11 @@ void EditorFileSystem::_notification(int p_what) {
_queue_update_script_classes(); _queue_update_script_classes();
first_scan = false; first_scan = false;
} }
if (!is_processing() && scan_changes_pending) {
scan_changes_pending = false;
scan_changes();
}
} }
} break; } break;
} }
@ -2138,6 +2155,7 @@ EditorFileSystem::EditorFileSystem() {
scan_total = 0; scan_total = 0;
update_script_classes_queued = false; update_script_classes_queued = false;
first_scan = true; first_scan = true;
scan_changes_pending = false;
revalidate_import_files = false; revalidate_import_files = false;
} }

1
editor/editor_file_system.h
View File

@ -145,6 +145,7 @@ class EditorFileSystem : public Node {
bool scanning; bool scanning;
bool importing; bool importing;
bool first_scan; bool first_scan;
bool scan_changes_pending;
float scan_total; float scan_total;
String filesystem_settings_version_for_import; String filesystem_settings_version_for_import;
bool revalidate_import_files; bool revalidate_import_files;