URL path extension APIs should strip trailing slashes #965
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
|
@swift-ci please test |
jmschonfeld
approved these changes
Oct 7, 2024
jrflat
added a commit
to jrflat/swift-foundation
that referenced
this pull request
Oct 8, 2024
jrflat
added a commit
to jrflat/swift-foundation
that referenced
this pull request
Oct 14, 2024
jrflat
added a commit
that referenced
this pull request
Oct 14, 2024
* (133878310) URL.fileSystemPath should drop all trailing slashes (#852) * (133882014) URL(filePath: path, directoryHint: .notDirectory) should strip trailing slashes (#867) * (137129292) URL(filePath:) should not treat "~" as absolute (#961) * (137068266) URL.fileSystemPath should strip leading slash for Windows drive letters (#964) * (137287143) URL path extension APIs should strip trailing slashes (#965)
jrflat
added a commit
that referenced
this pull request
Oct 14, 2024
* (133878310) URL.fileSystemPath should drop all trailing slashes (#852) * (133882014) URL(filePath: path, directoryHint: .notDirectory) should strip trailing slashes (#867) * (137129292) URL(filePath:) should not treat "~" as absolute (#961) * (137068266) URL.fileSystemPath should strip leading slash for Windows drive letters (#964) * (137287143) URL path extension APIs should strip trailing slashes (#965)
cthielen
pushed a commit
to cthielen/swift-foundation
that referenced
this pull request
Nov 8, 2024
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 supplying a directory to
URLlikeURL(filePath: "/my/directory", directoryHint: .checkFileSystem), the initializer will automatically append a trailing slash, so the.path()is/my/directory/.The current logic for
.appendingPathExtension("zip")then directly appends the path extension, creating the unexpected path:/my/directory/.zip. A similar issue occurs where.deletingPathExtension()does not search before the trailing slash.This PR restores the behavior from before the Swift
URLimplementation, which strips the trailing slash before appending or deleting the path extension, then appends a slash if the path was a directory. E.g. after appending the path extension, the resulting.path()is now/my/directory.zip/as expected.