Fix handling of trailing slash in dir (TmpZip) #52
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
When adding files to a TmpZip using `/path/to/files/` (instead of `/path/to/files`), the current code throws errors about absolute paths in `ZipEntry` names. This is because the regex is `/#{dir}\//i`, which translates out to `/\/path\/to\/files\/\//i`, and matches (and therefore replaces) nothing.
The intended functionality *is* to treat `/path/to/files/` differently from `/path/to/files`, but rather than the current implementation's "does not work" versus "add contents of dir", it's supposed to be "add contents of dir" versus "add contents *and* dir". This change, which is admittedly slightly hackish, fixes that.
|
It seems to me that this PR still doesn't cover regexp special characters in path, e.g. |
|
closing in favor of #64 |
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.
When adding files to a TmpZip using
/path/to/files/(instead of/path/to/files), the current code throws errors about absolute paths inZipEntrynames. This is because the regex is/#{dir}\//i, which translates out to/\/path\/to\/files\/\//i, and matches (and therefore replaces) nothing.The intended functionality is to treat
/path/to/files/differently from/path/to/files, but rather than the current implementation's "does not work" versus "add contents of dir", it's supposed to be "add contents of dir" versus "add contents and dir". This change, which is admittedly slightly hackish, fixes that.