Skip to content

Commit

Permalink
Fix FileSystem dock won't show any file folders (v2)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Hilderin
Hilderin committed Aug 21, 2024
1 parent ee363af commit 9b7dac2
Show file tree
Hide file tree
Showing 7 changed files with 152 additions and 66 deletions.
8 changes: 3 additions & 5 deletions core/io/file_access.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,9 @@ bool FileAccess::exists(const String &p_name) {
return true;
}

Ref<FileAccess> f = open(p_name, READ);
if (f.is_null()) {
return false;
}
return true;
// Using file_exists because it's faster than trying to open the file.
Ref<FileAccess> ret = create_for_path(p_name);
return ret->file_exists(p_name);
}

void FileAccess::_set_access_type(AccessType p_access) {
Expand Down
17 changes: 17 additions & 0 deletions core/io/resource_importer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,23 @@ ResourceUID::ID ResourceFormatImporter::get_resource_uid(const String &p_path) c
return pat.uid;
}

Error ResourceFormatImporter::get_resource_import_info(const String &p_path, StringName &r_type, ResourceUID::ID &r_uid, String &r_import_group_file) const {
PathAndType pat;
Error err = _get_path_and_type(p_path, pat);

if (err == OK) {
r_type = pat.type;
r_uid = pat.uid;
r_import_group_file = pat.group_file;
} else {
r_type = "";
r_uid = ResourceUID::INVALID_ID;
r_import_group_file = "";
}

return err;
}

Variant ResourceFormatImporter::get_resource_metadata(const String &p_path) const {
PathAndType pat;
Error err = _get_path_and_type(p_path, pat);
Expand Down
1 change: 1 addition & 0 deletions core/io/resource_importer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ class ResourceFormatImporter : public ResourceFormatLoader {
String get_import_settings_hash() const;

String get_import_base_path(const String &p_for_file) const;
Error get_resource_import_info(const String &p_path, StringName &r_type, ResourceUID::ID &r_uid, String &r_import_group_file) const;
ResourceFormatImporter();
};

Expand Down
61 changes: 32 additions & 29 deletions core/io/resource_loader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1060,36 +1060,39 @@ String ResourceLoader::_path_remap(const String &p_path, bool *r_translation_rem
new_path = path_remaps[new_path];
} else {
// Try file remap.
Error err;
Ref<FileAccess> f = FileAccess::open(new_path + ".remap", FileAccess::READ, &err);
if (f.is_valid()) {
VariantParser::StreamFile stream;
stream.f = f;

String assign;
Variant value;
VariantParser::Tag next_tag;

int lines = 0;
String error_text;
while (true) {
assign = Variant();
next_tag.fields.clear();
next_tag.name = String();

err = VariantParser::parse_tag_assign_eof(&stream, lines, error_text, next_tag, assign, value, nullptr, true);
if (err == ERR_FILE_EOF) {
break;
} else if (err != OK) {
ERR_PRINT("Parse error: " + p_path + ".remap:" + itos(lines) + " error: " + error_text + ".");
break;
}
// Usually, there's no remap file and FileAccess::exists() is faster than FileAccess::open().
if (FileAccess::exists(new_path + ".remap")) {
Error err;
Ref<FileAccess> f = FileAccess::open(new_path + ".remap", FileAccess::READ, &err);
if (f.is_valid()) {
VariantParser::StreamFile stream;
stream.f = f;

String assign;
Variant value;
VariantParser::Tag next_tag;

int lines = 0;
String error_text;
while (true) {
assign = Variant();
next_tag.fields.clear();
next_tag.name = String();

err = VariantParser::parse_tag_assign_eof(&stream, lines, error_text, next_tag, assign, value, nullptr, true);
if (err == ERR_FILE_EOF) {
break;
} else if (err != OK) {
ERR_PRINT("Parse error: " + p_path + ".remap:" + itos(lines) + " error: " + error_text + ".");
break;
}

if (assign == "path") {
new_path = value;
break;
} else if (next_tag.name != "remap") {
break;
if (assign == "path") {
new_path = value;
break;
} else if (next_tag.name != "remap") {
break;
}
}
}
}
Expand Down
78 changes: 64 additions & 14 deletions editor/editor_file_system.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,15 +228,19 @@ EditorFileSystem::ScannedDirectory::~ScannedDirectory() {
}

void EditorFileSystem::_first_scan_filesystem() {
EditorProgress ep = EditorProgress("first_scan_filesystem", TTR("Project initialization"), 5);
int step_count = 0;

Check failure on line 232 in editor/editor_file_system.cpp

View workflow job for this annotation

GitHub Actions / 🐧 Linux / Editor w/ Mono (target=editor) 

unused variable 'step_count' [-Werror=unused-variable]

Check failure on line 232 in editor/editor_file_system.cpp

View workflow job for this annotation

GitHub Actions / 🐧 Linux / Editor with clang sanitizers (target=editor, tests=yes, dev_build=yes, use_asan=yes, use_ubsan=yes, use_llvm=yes, linker=lld) 

unused variable 'step_count' [-Werror,-Wunused-variable]

Check failure on line 232 in editor/editor_file_system.cpp

View workflow job for this annotation

GitHub Actions / 🐧 Linux / Editor with ThreadSanitizer (target=editor, tests=yes, dev_build=yes, use_tsan=yes, use_llvm=yes, linker=lld) 

unused variable 'step_count' [-Werror,-Wunused-variable]

Check failure on line 232 in editor/editor_file_system.cpp

View workflow job for this annotation

GitHub Actions / 🏁 Windows / Editor (target=editor, tests=yes) 

the following warning is treated as an error

Check warning on line 232 in editor/editor_file_system.cpp

View workflow job for this annotation

GitHub Actions / 🏁 Windows / Editor (target=editor, tests=yes) 

'step_count': local variable is initialized but not referenced
Ref<DirAccess> d = DirAccess::create(DirAccess::ACCESS_RESOURCES);
first_scan_root_dir = memnew(ScannedDirectory);
first_scan_root_dir->full_path = "res://";
HashSet<String> existing_class_names;

ep.step(TTR("Scanning file structure..."), 0, true);
nb_files_total = _scan_new_dir(first_scan_root_dir, d);

// This loads the global class names from the scripts and ensures that even if the
// global_script_class_cache.cfg was missing or invalid, the global class names are valid in ScriptServer.
ep.step(TTR("Loading global class names..."), 1, true);
_first_scan_process_scripts(first_scan_root_dir, existing_class_names);

// Removing invalid global class to prevent having invalid paths in ScriptServer.
Expand All @@ -245,8 +249,13 @@ void EditorFileSystem::_first_scan_filesystem() {
// Now that all the global class names should be loaded, create autoloads and plugins.
// This is done after loading the global class names because autoloads and plugins can use
// global class names.
ep.step(TTR("Creating autoload scripts..."), 3, true);
ProjectSettingsEditor::get_singleton()->init_autoloads();

ep.step(TTR("Initializing plugins..."), 4, true);
EditorNode::get_singleton()->init_plugins();

ep.step(TTR("Starting file scan..."), 5, true);
}

void EditorFileSystem::_first_scan_process_scripts(const ScannedDirectory *p_scan_dir, HashSet<String> &p_existing_class_names) {
Expand Down Expand Up @@ -648,6 +657,12 @@ bool EditorFileSystem::_update_scan_actions() {
Vector<String> reimports;
Vector<String> reloads;

EditorProgress *ep = nullptr;
if (scan_actions.size() > 1) {
ep = memnew(EditorProgress("_update_scan_actions", TTR("Scanning actions..."), scan_actions.size()));
}

int step_count = 0;
for (const ItemAction &ia : scan_actions) {
switch (ia.action) {
case ItemAction::ACTION_NONE: {
Expand Down Expand Up @@ -779,8 +794,14 @@ bool EditorFileSystem::_update_scan_actions() {

} break;
}

if (ep) {
ep->step(ia.file, step_count++, false);
}
}

memdelete_notnull(ep);

if (_scan_extensions()) {
//needs editor restart
//extensions also may provide filetypes to be imported, so they must run before importing
Expand Down Expand Up @@ -870,8 +891,6 @@ void EditorFileSystem::scan() {
scan_total = 0;
s.priority = Thread::PRIORITY_LOW;
thread.start(_thread_func, this, s);
//tree->hide();
//progress->show();
}
}

Expand Down Expand Up @@ -1020,9 +1039,8 @@ void EditorFileSystem::_process_file_system(const ScannedDirectory *p_scan_dir,
}

} else {
fi->type = ResourceFormatImporter::get_singleton()->get_resource_type(path);
fi->uid = ResourceFormatImporter::get_singleton()->get_resource_uid(path);
fi->import_group_file = ResourceFormatImporter::get_singleton()->get_import_group_file(path);
// Using get_resource_import_info() to prevent calling 3 times ResourceFormatImporter::_get_path_and_type.
ResourceFormatImporter::get_singleton()->get_resource_import_info(path, fi->type, fi->uid, fi->import_group_file);
fi->script_class_name = _get_global_script_class(fi->type, path, &fi->script_class_extends, &fi->script_class_icon_path);
fi->modified_time = 0;
fi->import_modified_time = 0;
Expand Down Expand Up @@ -1826,10 +1844,21 @@ void EditorFileSystem::_update_script_classes() {

update_script_mutex.lock();

EditorProgress *ep = nullptr;
if (update_script_paths.size() > 1) {
ep = memnew(EditorProgress("update_scripts_classes", TTR("Registering global classes..."), update_script_paths.size()));
}

int step_count = 0;
for (const KeyValue<String, ScriptInfo> &E : update_script_paths) {
_register_global_class_script(E.key, E.key, E.value.type, E.value.script_class_name, E.value.script_class_extends, E.value.script_class_icon_path);
if (ep) {
ep->step(E.value.script_class_name, step_count++, false);
}
}

memdelete_notnull(ep);

update_script_paths.clear();
update_script_mutex.unlock();

Expand All @@ -1854,6 +1883,12 @@ void EditorFileSystem::_update_script_documentation() {

update_script_mutex.lock();

EditorProgress *ep = nullptr;
if (update_script_paths_documentation.size() > 1) {
ep = memnew(EditorProgress("update_script_paths_documentation", TTR("Updating scripts documentation"), update_script_paths_documentation.size()));
}

int step_count = 0;
for (const String &path : update_script_paths_documentation) {
int index = -1;
EditorFileSystemDirectory *efd = find_file(path, &index);
Expand All @@ -1876,8 +1911,14 @@ void EditorFileSystem::_update_script_documentation() {
}
}
}

if (ep) {
ep->step(efd->files[index]->file, step_count++, false);
}
}

memdelete_notnull(ep);

update_script_paths_documentation.clear();
update_script_mutex.unlock();
}
Expand Down Expand Up @@ -1912,7 +1953,7 @@ void EditorFileSystem::_update_scene_groups() {

EditorProgress *ep = nullptr;
if (update_scene_paths.size() > 20) {
ep = memnew(EditorProgress("update_scene_groups", TTR("Update Scene Groups"), update_scene_paths.size()));
ep = memnew(EditorProgress("update_scene_groups", TTR("Updating Scene Groups"), update_scene_paths.size()));
}
int step_count = 0;

Expand All @@ -1934,7 +1975,7 @@ void EditorFileSystem::_update_scene_groups() {
}

if (ep) {
ep->step(TTR("Updating Scene Groups..."), step_count++);
ep->step(efd->files[index]->file, step_count++);
}
}

Expand Down Expand Up @@ -2650,13 +2691,15 @@ void EditorFileSystem::reimport_files(const Vector<String> &p_files) {

Vector<String> reloads;

EditorProgress pr("reimport", TTR("(Re)Importing Assets"), p_files.size());
EditorProgress *ep = memnew(EditorProgress("reimport", TTR("(Re)Importing Assets"), p_files.size()));

Vector<ImportFile> reimport_files;

HashSet<String> groups_to_reimport;

for (int i = 0; i < p_files.size(); i++) {
ep->step(TTR("Preparing files to reimport..."), i, false);

String file = p_files[i];

ResourceUID::ID uid = ResourceUID::get_singleton()->text_to_id(file);
Expand Down Expand Up @@ -2696,6 +2739,8 @@ void EditorFileSystem::reimport_files(const Vector<String> &p_files) {

reimport_files.sort();

ep->step(TTR("Executing pre-reimport operations..."), 0, true);

// Emit the resource_reimporting signal for the single file before the actual importation.
emit_signal(SNAME("resources_reimporting"), reloads);

Expand All @@ -2716,7 +2761,7 @@ void EditorFileSystem::reimport_files(const Vector<String> &p_files) {
if (i + 1 == reimport_files.size() || reimport_files[i + 1].importer != reimport_files[from].importer || groups_to_reimport.has(reimport_files[i + 1].path)) {
if (from - i == 0) {
// Single file, do not use threads.
pr.step(reimport_files[i].path.get_file(), i);
ep->step(reimport_files[i].path.get_file(), i, false);
_reimport_file(reimport_files[i].path);
} else {
Ref<ResourceImporter> importer = ResourceFormatImporter::get_singleton()->get_importer_by_name(reimport_files[from].importer);
Expand All @@ -2738,7 +2783,7 @@ void EditorFileSystem::reimport_files(const Vector<String> &p_files) {
do {
if (current_index < tdata.max_index.get()) {
current_index = tdata.max_index.get();
pr.step(reimport_files[current_index].path.get_file(), current_index);
ep->step(reimport_files[current_index].path.get_file(), current_index, false);
}
OS::get_singleton()->delay_usec(1);
} while (!WorkerThreadPool::get_singleton()->is_group_task_completed(group_task));
Expand All @@ -2752,7 +2797,7 @@ void EditorFileSystem::reimport_files(const Vector<String> &p_files) {
}

} else {
pr.step(reimport_files[i].path.get_file(), i);
ep->step(reimport_files[i].path.get_file(), i, false);
_reimport_file(reimport_files[i].path);

// We need to increment the counter, maybe the next file is multithreaded
Expand All @@ -2769,7 +2814,7 @@ void EditorFileSystem::reimport_files(const Vector<String> &p_files) {
HashMap<String, Vector<String>> group_files;
_find_group_files(filesystem, group_files, groups_to_reimport);
for (const KeyValue<String, Vector<String>> &E : group_files) {
pr.step(E.key.get_file(), from++);
ep->step(E.key.get_file(), from++, false);
Error err = _reimport_group(E.key, E.value);
reloads.push_back(E.key);
reloads.append_array(E.value);
Expand All @@ -2780,15 +2825,20 @@ void EditorFileSystem::reimport_files(const Vector<String> &p_files) {
}

ResourceUID::get_singleton()->update_cache(); // After reimporting, update the cache.

_save_filesystem_cache();

memdelete_notnull(ep);

_process_update_pending();
importing = false;

ep = memnew(EditorProgress("reimport", TTR("(Re)Importing Assets"), p_files.size()));
ep->step(TTR("Executing post-reimport operations..."), 0, true);
if (!is_scanning()) {
emit_signal(SNAME("filesystem_changed"));
}

emit_signal(SNAME("resources_reimported"), reloads);
memdelete_notnull(ep);
}

Error EditorFileSystem::reimport_append(const String &p_file, const HashMap<StringName, Variant> &p_custom_options, const String &p_custom_importer, Variant p_generator_parameters) {
Expand Down
Loading

0 comments on commit 9b7dac2

Please sign in to comment.