Support symlink for NioFSWrappingFS #1275
Merged
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
oldergod
force-pushed
the
bquenaudon.2023-06-19.symlink
branch
from
5750324 to
fea8371
Compare
Base automatically changed from
bquenaudon.2023-06-19.nomoresupportsfilehandle
to
bquenaudon.2023-06-19.getdefaultfilehandletest
June 19, 2023 14:15
oldergod
force-pushed
the
bquenaudon.2023-06-19.symlink
branch
6 times, most recently
from
c294f3a to
5a6e6d9
Compare
oldergod
commented
Jun 19, 2023
| // TODO(Benoit) How do deal with multiple directories? Test with Windows someday. | ||
| private val delegateRoot = javaNioFileSystem.rootDirectories.first() | ||
|
|
||
| internal class NioFileSystemWrappingFileSystem(private val nioFileSystem: NioFileSystem) : NioSystemFileSystem() { | ||
| /** | ||
| * On a `java.nio.file.FileSystem`, `java.nio.file.Path` are stateful and hold a reference to the file system they | ||
| * got provided from. We need to [resolve][java.nio.file.Path.resolve] all okio paths before doing operations on the | ||
| * nio file system in order for things to work properly. | ||
| */ | ||
| private fun Path.resolve(readSymlink: Boolean = false): NioPath { |
There was a problem hiding this comment.
Maybe I could rename the method to something else
oldergod
force-pushed
the
bquenaudon.2023-06-19.symlink
branch
from
5a6e6d9 to
cc917b2
Compare
oldergod
commented
Jun 19, 2023
| path | ||
| } | ||
| } | ||
| val result = entries.mapTo(mutableListOf()) { entry -> dir / entry.toString() } |
There was a problem hiding this comment.
everything's simpler once you start using it correctly....
swankjesse
reviewed
Jun 20, 2023
| Files.createSymbolicLink(source.resolve(), target.resolve()) | ||
| val sourceNioPath = source.resolve() | ||
| val targetNioPath = | ||
| if (source.isAbsolute && target.isRelative) { |
There was a problem hiding this comment.
Why is this necessary? Relative symlinks should be okay?
swankjesse
approved these changes
Jun 20, 2023
Base automatically changed from
bquenaudon.2023-06-19.getdefaultfilehandletest
to
master
June 20, 2023 16:24
oldergod
force-pushed
the
bquenaudon.2023-06-19.symlink
branch
from
9e5b9d1 to
00e31d5
Compare
oldergod
force-pushed
the
bquenaudon.2023-06-19.symlink
branch
from
00e31d5 to
a681001
Compare
oldergod
commented
Jun 21, 2023
| @@ -2211,6 +2247,7 @@ abstract class AbstractFileSystemTest( | |||
| @Test | |||
| fun openSymlinkSink() { | |||
| if (!supportsSymlink()) return | |||
| if (isJimFileSystem()) return | |||
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.
No description provided.