Refactor loading embedded pck

yvie-k · Sep 6, 2023 · a5d5ec8 · a5d5ec8
1 parent 973876f
commit a5d5ec8
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 4 deletions.
diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp
@@ -458,6 +458,24 @@ void ProjectSettings::_emit_changed() {
 	emit_signal("settings_changed");
 }
 
+bool ProjectSettings::_load_embedded_resource_pack(const String &p_pack, bool p_replace_files) {
+	if (PackedData::get_singleton()->is_disabled()) {
+		return false;
+	}
+
+	bool ok = PackedData::get_singleton()->add_embedded_pack(p_pack, p_replace_files) == OK;
+
+	if (!ok) {
+		return false;
+	}
+
+	//if data.pck is found, all directory access will be from here
+	DirAccess::make_default<DirAccessPack>(DirAccess::ACCESS_RESOURCES);
+	using_datapack = true;
+
+	return true;
+}
+
 bool ProjectSettings::_load_resource_pack(const String &p_pack, bool p_replace_files, int p_offset) {
 	if (PackedData::get_singleton()->is_disabled()) {
 		return false;
@@ -549,7 +567,7 @@ Error ProjectSettings::_setup(const String &p_path, const String &p_main_pack, b
 		// and if so, we attempt loading it at the end.
 
 		// Attempt with PCK bundled into executable.
-		bool found = _load_resource_pack(exec_path);
+		bool found = _load_embedded_resource_pack(exec_path);
 
 		// Attempt with exec_name.pck.
 		// (This is the usual case when distributing a Godot game.)

diff --git a/core/config/project_settings.h b/core/config/project_settings.h
@@ -140,6 +140,7 @@ class ProjectSettings : public Object {
 	void _convert_to_last_version(int p_from_version);
 
 	bool _load_resource_pack(const String &p_pack, bool p_replace_files = true, int p_offset = 0);
+	bool _load_embedded_resource_pack(const String &p_pack, bool p_replace_files = true);
 
 	void _add_property_info_bind(const Dictionary &p_info);
 

diff --git a/core/io/file_access_pack.cpp b/core/io/file_access_pack.cpp
@@ -47,6 +47,16 @@ Error PackedData::add_pack(const String &p_path, bool p_replace_files, uint64_t
 	return ERR_FILE_UNRECOGNIZED;
 }
 
+Error PackedData::add_embedded_pack(const String &p_path, bool p_replace_files) {
+	for (int i = 0; i < sources.size(); i++) {
+		if (sources[i]->try_open_pack_embedded(p_path, p_replace_files)) {
+			return OK;
+		}
+	}
+
+	return ERR_FILE_UNRECOGNIZED;
+}
+
 void PackedData::add_path(const String &p_pkg_path, const String &p_path, uint64_t p_ofs, uint64_t p_size, const uint8_t *p_md5, PackSource *p_src, bool p_replace_files, bool p_encrypted) {
 	String simplified_path = p_path.simplify_path();
 	PathMD5 pmd5(simplified_path.md5_buffer());
@@ -312,9 +322,18 @@ bool PCKFile::file_exists(const String &p_path, bool p_case_sensitive) {
 
 bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files, uint64_t p_offset) {
 	if (!file.try_open_pack(p_path, p_offset)) {
-		if (!file.try_open_embedded(p_path)) {
-			return false;
-		}
+		return false;
+	}
+
+	for (auto [path, f] : file.get_files()) {
+		PackedData::get_singleton()->add_path(p_path, path, f.offset, f.size, f.md5, this, p_replace_files, f.encrypted);
+	}
+	return true;
+}
+
+bool PackedSourcePCK::try_open_pack_embedded(const String &p_path, bool p_replace_files) {
+	if (!file.try_open_embedded(p_path)) {
+		return false;
 	}
 
 	for (auto [path, f] : file.get_files()) {

diff --git a/core/io/file_access_pack.h b/core/io/file_access_pack.h
@@ -117,6 +117,7 @@ class PackedData {
 
 	static PackedData *get_singleton() { return singleton; }
 	Error add_pack(const String &p_path, bool p_replace_files, uint64_t p_offset);
+	Error add_embedded_pack(const String &p_path, bool p_replace_files);
 
 	_FORCE_INLINE_ Ref<FileAccess> try_open_path(const String &p_path);
 	_FORCE_INLINE_ bool has_path(const String &p_path);
@@ -131,6 +132,7 @@ class PackedData {
 class PackSource {
 public:
 	virtual bool try_open_pack(const String &p_path, bool p_replace_files, uint64_t p_offset) = 0;
+	virtual bool try_open_pack_embedded(const String &p_path, bool p_replace_files) = 0;
 	virtual Ref<FileAccess> get_file(const String &p_path, PackedData::PackedFile *p_file) = 0;
 	virtual ~PackSource() {}
 };
@@ -156,6 +158,7 @@ class PackedSourcePCK : public PackSource {
 	PCKFile file;
 public:
 	virtual bool try_open_pack(const String &p_path, bool p_replace_files, uint64_t p_offset) override;
+	virtual bool try_open_pack_embedded(const String &p_path, bool p_replace_files) override;
 	virtual Ref<FileAccess> get_file(const String &p_path, PackedData::PackedFile *p_file) override;
 };
 

diff --git a/core/io/file_access_zip.cpp b/core/io/file_access_zip.cpp
@@ -206,6 +206,11 @@ bool ZipArchive::try_open_pack(const String &p_path, bool p_replace_files, uint6
 	return true;
 }
 
+bool ZipArchive::try_open_pack_embedded(const String &p_path, bool p_replace_files) {
+	// We do not support zip files embedded in the binary
+	return false;
+}
+
 bool ZipArchive::file_exists(String p_name) const {
 	return files.has(p_name);
 }

diff --git a/core/io/file_access_zip.h b/core/io/file_access_zip.h
@@ -68,6 +68,7 @@ class ZipArchive : public PackSource {
 	bool file_exists(String p_name) const;
 
 	virtual bool try_open_pack(const String &p_path, bool p_replace_files, uint64_t p_offset) override;
+	virtual bool try_open_pack_embedded(const String &p_path, bool p_replace_files) override;
 	Ref<FileAccess> get_file(const String &p_path, PackedData::PackedFile *p_file) override;
 
 	static ZipArchive *get_singleton();