Create .uid files in EditorFileSystem #101650
Conversation
| @@ -1281,6 +1281,7 @@ void EditorFileSystem::_process_file_system(const ScannedDirectory *p_scan_dir, | |||
| if (f.is_valid()) { | |||
| if (fi->uid == ResourceUID::INVALID_ID) { | |||
| fi->uid = ResourceUID::get_singleton()->create_id(); | |||
| ResourceUID::get_singleton()->add_id(fi->uid, path); | |||
There was a problem hiding this comment.
This is another problem I noticed. The UID created here was not assigned to the path.
There was a problem hiding this comment.
Not sure you should call ResourceUID::get_singleton()->add_id(id, file); because it will be called again at line 1305. If the id is added here, it will be regenerated just after because the if (ResourceUID::get_singleton()->has_id(fi->uid)) { at line 1294 will see it as a duplicate.
Not sure what this added line is suppose to fix, the ResourceUID::get_singleton()->add_id(fi->uid, path); just below should have been suffisiant?
| } else { | ||
| if (ResourceLoader::exists(file) && !ResourceLoader::has_custom_uid_support(file) && !FileAccess::exists(file + ".uid")) { | ||
| Ref<FileAccess> f = FileAccess::open(file + ".uid", FileAccess::WRITE); | ||
| if (f.is_valid()) { | ||
| const ResourceUID::ID id = ResourceUID::get_singleton()->create_id(); | ||
| ResourceUID::get_singleton()->add_id(id, file); | ||
| f->store_line(ResourceUID::get_singleton()->id_to_text(id)); | ||
| fi->uid = id; | ||
| } | ||
| } |
There was a problem hiding this comment.
The actual fix is here. The changes around are because of the fi variable.
This comment was marked as resolved.
This comment was marked as resolved.
KoBeWi
force-pushed
the
duality_of_uid_caches
branch
from
339ddb9 to
948bff0
Compare
|
It seems to solve the original problem. 👍 However (and I don't know if it's in the scope of this PR), when a script is moved, its path in the scene does not change.
Which mean that if the original resource moved, the button "open script" will open a new file. The path never changes, even after scene reload or editor restart. |
|
@geowarin I can't reproduce this problem, both with and without this PR, so it's likely unrelated. Open a new issue. |
Fixes #101591
Turns out the
ensure_uid_file()method I once added was wrong, because EditorFileSystem has its own uid cache. The bug occured, because the new UID was not registered in the EditorFileSystem, which is used by ResourceSaver to determine UIDs when saving.I fixed the bug for scripts and shaders, but I see more places where FileInfo is created. There might be some edge case where either UID is not registered or .uid file is not created, idk.