Update container copy to use FilePath#1580
Merged
Merged
Conversation
Code Coverage
|
jglogan
approved these changes
May 20, 2026
| } | ||
| let finalDest = destPath.appending(lastComponent) | ||
| try await client.copyOut(id: id, source: path, destination: finalDest.string) | ||
| } else if localPath.hasSuffix("/") { |
Contributor
There was a problem hiding this comment.
Side note, when Swift brings FilePath into its standard library, there'll be a hasTrailingSeparator property.
| let srcURL = URL(fileURLWithPath: path) | ||
| let destURL = URL(fileURLWithPath: localPath).standardizedFileURL | ||
| let srcPath = FilePath(path) | ||
| let destPath = FilePath((localPath as NSString).standardizingPath) |
Contributor
There was a problem hiding this comment.
Suggested change
| let destPath = FilePath((localPath as NSString).standardizingPath) | |
| // TODO - extract to utility function without NSString in ContainerizationOS, apple/containerization#744 | |
| let destPath = FilePath((localPath as NSString).standardizingPath) |
| } | ||
| case (.local(let localPath), .container(let id, let path)): | ||
| let srcURL = URL(fileURLWithPath: localPath).standardizedFileURL | ||
| let srcPath = FilePath((localPath as NSString).standardizingPath) |
Contributor
There was a problem hiding this comment.
Suggested change
| let srcPath = FilePath((localPath as NSString).standardizingPath) | |
| // TODO - extract to utility function in ContainerizationOS, apple/containerization#744 | |
| let srcPath = FilePath((localPath as NSString).standardizingPath) |
Contributor
|
lgtm, I'll add the TODO comments in my next follow-up commit on container. |
This was referenced May 23, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Replace
URLwithFilePathincontainer copy(#1557).In addition, make
copyIn/copyOutAPI to useStringfor path as we need to preserve the trailing slash to theLinuxContainer.copy---i.e., this trailing slash is used inLinuxContainer.copyto determine copy behavior.