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

Merge pull request #93006 from Hilderin/fix-update-files-pr-#92893

Browse Source 
Fix EditorFileSystem `update_files` after #92893
This commit is contained in:
Rémi Verschelde 2024-06-11 11:51:09 +02:00
commit 928e044ef5
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 60 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
editor/editor_file_system.cpp
View File

@ -1725,7 +1725,7 @@ void EditorFileSystem::update_files(const Vector<String> &p_script_paths) {
if (!_find_file(file, &fs, cpos)) { if (!_find_file(file, &fs, cpos)) {
if (!fs) { if (!fs) {
return; continue;
} }
} }
@ -1748,77 +1748,72 @@ void EditorFileSystem::update_files(const Vector<String> &p_script_paths) {
memdelete(fs->files[cpos]); memdelete(fs->files[cpos]);
fs->files.remove_at(cpos); fs->files.remove_at(cpos);
} }
_update_pending_script_classes();
_update_pending_scene_groups();
call_deferred(SNAME("emit_signal"), "filesystem_changed"); //update later
return;
}
String type = ResourceLoader::get_resource_type(file);
if (type.is_empty() && textfile_extensions.has(file.get_extension())) {
type = "TextFile";
}
String script_class = ResourceLoader::get_resource_script_class(file);
ResourceUID::ID uid = ResourceLoader::get_resource_uid(file);
if (cpos == -1) {
// The file did not exist, it was added.
int idx = 0;
String file_name = file.get_file();
for (int i = 0; i < fs->files.size(); i++) {
if (file.filenocasecmp_to(fs->files[i]->file) < 0) {
break;
}
idx++;
}
EditorFileSystemDirectory::FileInfo *fi = memnew(EditorFileSystemDirectory::FileInfo);
fi->file = file_name;
fi->import_modified_time = 0;
fi->import_valid = type == "TextFile" ? true : ResourceLoader::is_import_valid(file);
if (idx == fs->files.size()) {
fs->files.push_back(fi);
} else {
fs->files.insert(idx, fi);
}
cpos = idx;
} else { } else {
//the file exists and it was updated, and was not added in this step. String type = ResourceLoader::get_resource_type(file);
//this means we must force upon next restart to scan it again, to get proper type and dependencies if (type.is_empty() && textfile_extensions.has(file.get_extension())) {
late_update_files.insert(file); type = "TextFile";
_save_late_updated_files(); //files need to be updated in the re-scan }
} String script_class = ResourceLoader::get_resource_script_class(file);
fs->files[cpos]->type = type; ResourceUID::ID uid = ResourceLoader::get_resource_uid(file);
fs->files[cpos]->resource_script_class = script_class;
fs->files[cpos]->uid = uid;
fs->files[cpos]->script_class_name = _get_global_script_class(type, file, &fs->files[cpos]->script_class_extends, &fs->files[cpos]->script_class_icon_path);
fs->files[cpos]->import_group_file = ResourceLoader::get_import_group_file(file);
fs->files[cpos]->modified_time = FileAccess::get_modified_time(file);
fs->files[cpos]->deps = _get_dependencies(file);
fs->files[cpos]->import_valid = type == "TextFile" ? true : ResourceLoader::is_import_valid(file);
if (uid != ResourceUID::INVALID_ID) { if (cpos == -1) {
if (ResourceUID::get_singleton()->has_id(uid)) { // The file did not exist, it was added.
ResourceUID::get_singleton()->set_id(uid, file); int idx = 0;
String file_name = file.get_file();
for (int i = 0; i < fs->files.size(); i++) {
if (file.filenocasecmp_to(fs->files[i]->file) < 0) {
break;
}
idx++;
}
EditorFileSystemDirectory::FileInfo *fi = memnew(EditorFileSystemDirectory::FileInfo);
fi->file = file_name;
fi->import_modified_time = 0;
fi->import_valid = type == "TextFile" ? true : ResourceLoader::is_import_valid(file);
if (idx == fs->files.size()) {
fs->files.push_back(fi);
} else {
fs->files.insert(idx, fi);
}
cpos = idx;
} else { } else {
ResourceUID::get_singleton()->add_id(uid, file); //the file exists and it was updated, and was not added in this step.
//this means we must force upon next restart to scan it again, to get proper type and dependencies
late_update_files.insert(file);
_save_late_updated_files(); //files need to be updated in the re-scan
} }
ResourceUID::get_singleton()->update_cache(); fs->files[cpos]->type = type;
} fs->files[cpos]->resource_script_class = script_class;
// Update preview fs->files[cpos]->uid = uid;
EditorResourcePreview::get_singleton()->check_for_invalidation(file); fs->files[cpos]->script_class_name = _get_global_script_class(type, file, &fs->files[cpos]->script_class_extends, &fs->files[cpos]->script_class_icon_path);
fs->files[cpos]->import_group_file = ResourceLoader::get_import_group_file(file);
fs->files[cpos]->modified_time = FileAccess::get_modified_time(file);
fs->files[cpos]->deps = _get_dependencies(file);
fs->files[cpos]->import_valid = type == "TextFile" ? true : ResourceLoader::is_import_valid(file);
if (ClassDB::is_parent_class(fs->files[cpos]->type, SNAME("Script"))) { if (uid != ResourceUID::INVALID_ID) {
_queue_update_script_class(file); if (ResourceUID::get_singleton()->has_id(uid)) {
} ResourceUID::get_singleton()->set_id(uid, file);
if (fs->files[cpos]->type == SNAME("PackedScene")) { } else {
_queue_update_scene_groups(file); ResourceUID::get_singleton()->add_id(uid, file);
}
ResourceUID::get_singleton()->update_cache();
}
// Update preview
EditorResourcePreview::get_singleton()->check_for_invalidation(file);
if (ClassDB::is_parent_class(fs->files[cpos]->type, SNAME("Script"))) {
_queue_update_script_class(file);
}
if (fs->files[cpos]->type == SNAME("PackedScene")) {
_queue_update_scene_groups(file);
}
} }
} }