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 20, 2024
1 parent ee363af commit a01b43f
Show file tree
Hide file tree
Showing 6 changed files with 133 additions and 50 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
69 changes: 55 additions & 14 deletions editor/editor_file_system.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,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 +785,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 +882,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 +1030,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 +1835,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 +1874,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 +1902,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 +1944,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 +1966,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 +2682,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 +2730,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 +2752,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 +2774,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 +2788,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 +2805,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 +2816,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
27 changes: 25 additions & 2 deletions editor/editor_node.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1044,8 +1044,15 @@ void EditorNode::_resources_reimporting(const Vector<String> &p_resources) {
// which will trigger a recopy of the previous mesh, preventing the reload.
scenes_modification_table.clear();
List<String> scenes;
EditorFileSystem *editor_file_system = EditorFileSystem::get_singleton();
for (const String &res_path : p_resources) {
if (ResourceLoader::get_resource_type(res_path) == "PackedScene") {
// It's faster to use EditorFileSystem::get_file_type than fetching the resource type from disk.
// This makes a big difference when reimporting many resources.
String file_type = editor_file_system->get_file_type(res_path);
if (file_type.is_empty()) {
file_type = ResourceLoader::get_resource_type(res_path);
}
if (file_type == "PackedScene") {
scenes.push_back(res_path);
}
}
Expand All @@ -1058,9 +1065,15 @@ void EditorNode::_resources_reimporting(const Vector<String> &p_resources) {
void EditorNode::_resources_reimported(const Vector<String> &p_resources) {
List<String> scenes;
int current_tab = scene_tabs->get_current_tab();
EditorFileSystem *editor_file_system = EditorFileSystem::get_singleton();

for (const String &res_path : p_resources) {
String file_type = ResourceLoader::get_resource_type(res_path);
// It's faster to use EditorFileSystem::get_file_type than fetching the resource type from disk.
// This makes a big difference when reimporting many resources.
String file_type = editor_file_system->get_file_type(res_path);
if (file_type.is_empty()) {
file_type = ResourceLoader::get_resource_type(res_path);
}
if (file_type == "PackedScene") {
scenes.push_back(res_path);
// Reload later if needed, first go with normal resources.
Expand Down Expand Up @@ -5198,6 +5211,8 @@ void EditorNode::save_editor_layout_delayed() {
}

void EditorNode::_load_editor_layout() {
EditorProgress ep("loading_editor_layout", TTR("Loading editor"), 5);
ep.step(TTR("Loading editor layout..."), 0, true);
Ref<ConfigFile> config;
config.instantiate();
Error err = config->load(EditorPaths::get_singleton()->get_project_settings_dir().path_join("editor_layout.cfg"));
Expand All @@ -5219,11 +5234,19 @@ void EditorNode::_load_editor_layout() {
return;
}

ep.step(TTR("Loading docks..."), 1, true);
editor_dock_manager->load_docks_from_config(config, "docks");

ep.step(TTR("Reopening scenes..."), 2, true);
_load_open_scenes_from_config(config);

ep.step(TTR("Loading central editor layout..."), 3, true);
_load_central_editor_layout_from_config(config);

ep.step(TTR("Loading plugin window layout..."), 4, true);
editor_data.set_plugin_window_layout(config);

ep.step(TTR("Editor layout ready."), 5, true);
}

void EditorNode::_save_central_editor_layout_to_config(Ref<ConfigFile> p_config_file) {
Expand Down

0 comments on commit a01b43f

Please sign in to comment.