noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 2 Wiki Activity

Merge pull request #115903 from bruvzg/zip_proj_perm

Browse Source 
Fix "Pack Project as Zip" not saving permissions and time.
This commit is contained in:
Thaddeus Crews
2026-03-30 13:35:40 -05:00
parent 2e56f4ee53 7e1c6ce8f0
commit aa56bcb233
2 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/export/editor_export_platform.cpp
+2 -2
View File
@@ -1985,7 +1985,7 @@ void EditorExportPlatform::zip_folder_recursive(zipFile &p_zip, const String &p_
// 0000755: permissions rwxr-xr-x
// 0000644: permissions rw-r--r--
uint32_t _mode = 0120644;
zipfi.external_fa = (_mode << 16L) | !(_mode & 0200);
zipfi.external_fa = (_mode << 16L) | ((_mode & 0200) ? 0 : 1); // UUUUUUUUUUUUUUUU0000000000ADVSHR: Unix permissions (U) + DOS read-only flag (R).
zipfi.internal_fa = 0;
zipOpenNewFileInZip4(p_zip,
@@ -2029,7 +2029,7 @@ void EditorExportPlatform::zip_folder_recursive(zipFile &p_zip, const String &p_
// 0000755: permissions rwxr-xr-x
// 0000644: permissions rw-r--r--
uint32_t _mode = (_is_executable ? 0100755 : 0100644);
zipfi.external_fa = (_mode << 16L) | !(_mode & 0200);
zipfi.external_fa = (_mode << 16L) | ((_mode & 0200) ? 0 : 1); // UUUUUUUUUUUUUUUU0000000000ADVSHR: Unix permissions (U) + DOS read-only flag (R).
zipfi.internal_fa = 0;
zipOpenNewFileInZip4(p_zip,
editor/export/project_zip_packer.cpp
+30 -1
View File
@@ -74,10 +74,39 @@ void ProjectZIPPacker::_zip_file(const String &p_path, const String &p_base_path
data.resize(len);
f->get_buffer(data.ptrw(), len);
uint64_t time = FileAccess::get_modified_time(p_path);
if (time == 0) {
time = Time::get_singleton()->get_unix_time_from_system();
}
Dictionary tz = Time::get_singleton()->get_time_zone_from_system();
time += tz["bias"].operator int() * 60;
Dictionary dt = Time::get_singleton()->get_datetime_dict_from_unix_time(time);
zip_fileinfo zipfi;
zipfi.tmz_date.tm_year = dt["year"];
zipfi.tmz_date.tm_mon = dt["month"].operator int() - 1; // Note: "tm" month range - 0..11, Godot month range - 1..12, https://www.cplusplus.com/reference/ctime/tm/
zipfi.tmz_date.tm_mday = dt["day"];
zipfi.tmz_date.tm_hour = dt["hour"];
zipfi.tmz_date.tm_min = dt["minute"];
zipfi.tmz_date.tm_sec = dt["second"];
zipfi.dosDate = 0;
// 0100000: regular file type
// 0000755: permissions rwxr-xr-x
// 0000644: permissions rw-r--r--
uint32_t _mode = FileAccess::get_unix_permissions(p_path);
if (_mode == 0) {
_mode = 0100644;
} else {
_mode |= 0100000;
}
zipfi.external_fa = (_mode << 16L) | ((_mode & 0200) ? 0 : 1); // UUUUUUUUUUUUUUUU0000000000ADVSHR: Unix permissions (U) + DOS read-only flag (R).
zipfi.internal_fa = 0;
String path = p_path.trim_prefix(p_base_path);
zipOpenNewFileInZip4(p_zip,
path.utf8().get_data(),
nullptr,
&zipfi,
nullptr,
0,
nullptr,