godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Merge pull request #99947 from Meorge/ignore-macosx-in-zip

Browse Source 
Ignore `__MACOSX` directory for export template and project ZIPs
This commit is contained in:
Thaddeus Crews
2024-12-05 14:12:22 -06:00
parent 45734bd451 2336415623
commit c153f963ce
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
editor/export/export_template_manager.cpp
View File

@@ -437,6 +437,13 @@ bool ExportTemplateManager::_install_file_selected(const String &p_file, bool p_
} }
String file = String::utf8(fname); String file = String::utf8(fname);
// Skip the __MACOSX directory created by macOS's built-in file zipper.
if (file.begins_with("__MACOSX")) {
ret = unzGoToNextFile(pkg);
continue;
}
if (file.ends_with("version.txt")) { if (file.ends_with("version.txt")) {
Vector<uint8_t> uncomp_data; Vector<uint8_t> uncomp_data;
uncomp_data.resize(info.uncompressed_size); uncomp_data.resize(info.uncompressed_size);
@@ -512,7 +519,8 @@ bool ExportTemplateManager::_install_file_selected(const String &p_file, bool p_
String file = file_path.get_file(); String file = file_path.get_file();
if (file.size() == 0) { // Skip the __MACOSX directory created by macOS's built-in file zipper.
if (file.is_empty() || file.begins_with("__MACOSX")) {
ret = unzGoToNextFile(pkg); ret = unzGoToNextFile(pkg);
continue; continue;
} }

24
editor/project_manager/project_dialog.cpp
View File

@@ -132,6 +132,13 @@ void ProjectDialog::_validate_path() {
ERR_FAIL_COND_MSG(ret != UNZ_OK, "Failed to get current file info."); ERR_FAIL_COND_MSG(ret != UNZ_OK, "Failed to get current file info.");
String name = String::utf8(fname); String name = String::utf8(fname);
// Skip the __MACOSX directory created by macOS's built-in file zipper.
if (name.begins_with("__MACOSX")) {
ret = unzGoToNextFile(pkg);
continue;
}
if (name.get_file() == "project.godot") { if (name.get_file() == "project.godot") {
break; // ret == UNZ_OK. break; // ret == UNZ_OK.
} }
@@ -604,6 +611,13 @@ void ProjectDialog::ok_pressed() {
ERR_FAIL_COND_MSG(ret != UNZ_OK, "Failed to get current file info."); ERR_FAIL_COND_MSG(ret != UNZ_OK, "Failed to get current file info.");
String name = String::utf8(fname); String name = String::utf8(fname);
// Skip the __MACOSX directory created by macOS's built-in file zipper.
if (name.begins_with("__MACOSX")) {
ret = unzGoToNextFile(pkg);
continue;
}
if (name.get_file() == "project.godot") { if (name.get_file() == "project.godot") {
zip_root = name.get_base_dir(); zip_root = name.get_base_dir();
break; break;
@@ -636,7 +650,15 @@ void ProjectDialog::ok_pressed() {
ret = unzGetCurrentFileInfo(pkg, &info, fname, 16384, nullptr, 0, nullptr, 0); ret = unzGetCurrentFileInfo(pkg, &info, fname, 16384, nullptr, 0, nullptr, 0);
ERR_FAIL_COND_MSG(ret != UNZ_OK, "Failed to get current file info."); ERR_FAIL_COND_MSG(ret != UNZ_OK, "Failed to get current file info.");
String rel_path = String::utf8(fname).trim_prefix(zip_root); String name = String::utf8(fname);
// Skip the __MACOSX directory created by macOS's built-in file zipper.
if (name.begins_with("__MACOSX")) {
ret = unzGoToNextFile(pkg);
continue;
}
String rel_path = name.trim_prefix(zip_root);
if (rel_path.is_empty()) { // Root. if (rel_path.is_empty()) { // Root.
} else if (rel_path.ends_with("/")) { // Directory. } else if (rel_path.ends_with("/")) { // Directory.
Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);