Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support uid:// paths from external PCK files #79076

Closed
wants to merge 1 commit into from
Closed

Support uid:// paths from external PCK files #79076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions core/io/file_access_pack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,13 @@ void PackedData::add_path(const String &p_pkg_path, const String &p_path, uint64
cd->files.insert(filename);
}
}

// Handle special files
if (simplified_path == ResourceUID::get_cache_file()) {
// UID cache file
Ref<FileAccessPack> f = memnew(FileAccessPack(p_pkg_path, pf));
ResourceUID::get_singleton()->load_from_file(f);
}
}

void PackedData::add_pack_source(PackSource *p_source) {
Expand Down
18 changes: 11 additions & 7 deletions core/io/resource_uid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include "core/config/project_settings.h"
#include "core/crypto/crypto_core.h"
#include "core/io/dir_access.h"
#include "core/io/file_access.h"

static constexpr uint32_t char_count = ('z' - 'a');
static constexpr uint32_t base = char_count + ('9' - '0');
Expand Down Expand Up @@ -169,22 +168,27 @@ Error ResourceUID::save_to_cache() {

Error ResourceUID::load_from_cache() {
Ref<FileAccess> f = FileAccess::open(get_cache_file(), FileAccess::READ);
if (f.is_null()) {
unique_ids.clear();

return load_from_file(f);
}

Error ResourceUID::load_from_file(const Ref<FileAccess> &p_file) {
if (p_file.is_null()) {
return ERR_CANT_OPEN;
}

MutexLock l(mutex);
unique_ids.clear();

uint32_t entry_count = f->get_32();
uint32_t entry_count = p_file->get_32();
for (uint32_t i = 0; i < entry_count; i++) {
int64_t id = f->get_64();
int32_t len = f->get_32();
int64_t id = p_file->get_64();
int32_t len = p_file->get_32();
Cache c;
c.cs.resize(len + 1);
ERR_FAIL_COND_V(c.cs.size() != len + 1, ERR_FILE_CORRUPT); // out of memory
c.cs[len] = 0;
int32_t rl = f->get_buffer((uint8_t *)c.cs.ptrw(), len);
int32_t rl = p_file->get_buffer((uint8_t *)c.cs.ptrw(), len);
ERR_FAIL_COND_V(rl != len, ERR_FILE_CORRUPT);

c.saved_to_cache = true;
Expand Down
2 changes: 2 additions & 0 deletions core/io/resource_uid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#ifndef RESOURCE_UID_H
#define RESOURCE_UID_H

#include "core/io/file_access.h"
#include "core/object/ref_counted.h"
#include "core/string/string_name.h"
#include "core/templates/hash_map.h"
Expand Down Expand Up @@ -74,6 +75,7 @@ class ResourceUID : public Object {
void remove_id(ID p_id);

Error load_from_cache();
Error load_from_file(const Ref<FileAccess> &p_file);
Error save_to_cache();
Error update_cache();

Expand Down