Ignore __MACOSX directory for export template and project ZIPs
#99947
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bruvzg
approved these changes
Dec 3, 2024
|
Looks good! Could you squash the commits? See PR workflow for instructions. |
…d project import ZIP file Update editor/export/export_template_manager.cpp Co-authored-by: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com>
Meorge
force-pushed
the
ignore-macosx-in-zip
branch
from
4ba8635 to
2336415
Compare
|
Done! 😄 |
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
macOS's Archive Utility (built-in ZIP file creator) apparently adds a secret
__MACOSXdirectory to the files it zips. When Godot is unzipping archives it expects to have a specific structure, the presence of the__MACOSXdirectory and its subfiles can confuse it. For example, a macOS-zipped export templates file could not be imported because Godot was finding a dummy version ofversion.txtwithin__MACOSX.This PR causes the export template importer and the project importer to skip any files in a zipped archive whose paths begin with
__MACOSX. I've tested this with both a macOS-zipped export template file and a macOS-zipped project.