Skip to content

Fix os.write.outputStream with perms for Scala 3 #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 7, 2025
Merged

Fix os.write.outputStream with perms for Scala 3 #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd3574f
Fix os.write.outputStream with perms for Scala 3
kiendang Mar 5, 2025
1c3ece0
Skip test on Windows
kiendang Mar 5, 2025
cacdf03
Format
kiendang Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions os/src/ReadWriteOps.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ object write {
checker.value.onWrite(target)
if (createFolders) makeDir.all(target / RelPath.up, perms)
if (perms != null && !exists(target)) {
val permArray =
if (perms == null) Array[FileAttribute[PosixFilePermission]]()
Comment on lines -33 to -34
Copy link
Contributor Author

@kiendang kiendang Mar 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lihaoyi It's because the type here is wrong. It should be Array[FileAttribute[java.util.Set[PosixFilePermission]]] instead. I don't know how this compiles or why it runs on Scala 2 though.

Copy link
Contributor Author

@kiendang kiendang Mar 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know the details, but looks like Scala 3 handles varargs differently https://docs.scala-lang.org/scala3/reference/changed-features/vararg-splices.html

val permArray: Array[FileAttribute[_]] =
if (perms == null) Array.empty
else Array(PosixFilePermissions.asFileAttribute(perms.toSet()))
java.nio.file.Files.createFile(target.toNIO, permArray: _*)
}
Expand Down
15 changes: 15 additions & 0 deletions os/test/src/ReadingWritingTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,21 @@ object ReadingWritingTests extends TestSuite {
os.read(wd / "New File.txt") ==> "Hello"
}
}
test("outputStreamWithPerms") {
test - prep { wd =>
if (!scala.util.Properties.isWin) {
val out = os.write.outputStream(wd / "New File.txt", perms = os.PermSet(420))
out.write('H')
out.write('e')
out.write('l')
out.write('l')
out.write('o')
out.close()

os.read(wd / "New File.txt") ==> "Hello"
}
}
}
}
test("truncate") {
test - prep { wd =>
Expand Down
Loading