Merge pull request #2789 from armanbilge/feature/cwd-and-home

Add `userHome`, `currentWorkingDirectory` to `Files` API
typelevel · Jan 13, 2022 · 8b285a6 · 8b285a6
2 parents aee10a7 + 1485b61
commit 8b285a6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/io/js/src/main/scala/fs2/io/file/FilesPlatform.scala b/io/js/src/main/scala/fs2/io/file/FilesPlatform.scala
@@ -31,6 +31,7 @@ import fs2.internal.jsdeps.node.fsMod
 import fs2.internal.jsdeps.node.fsPromisesMod
 import fs2.internal.jsdeps.node.nodeStrings
 import fs2.internal.jsdeps.node.osMod
+import fs2.internal.jsdeps.node.processMod
 import fs2.io.file.Files.UnsealedFiles
 
 import scala.concurrent.duration._
@@ -133,6 +134,12 @@ private[fs2] trait FilesCompanionPlatform {
         F.fromPromise(F.delay(fsPromisesMod.rm(path.toString)))
       ).adaptError { case IOException(ex) => ex }
 
+    def currentWorkingDirectory: F[Path] =
+      F.delay(Path(processMod.cwd()))
+
+    def userHome: F[Path] =
+      F.delay(Path(osMod.homedir()))
+
     override def delete(path: Path): F[Unit] =
       rmMaybeDir(path)
 

diff --git a/io/jvm/src/main/scala/fs2/io/file/FilesPlatform.scala b/io/jvm/src/main/scala/fs2/io/file/FilesPlatform.scala
@@ -163,6 +163,12 @@ private[file] trait FilesCompanionPlatform {
           )
       }).map(Path.fromNioPath)
 
+    def currentWorkingDirectory: F[Path] =
+      Sync[F].delay(Path(Option(System.getProperty("user.dir")).get))
+
+    def userHome: F[Path] =
+      Sync[F].delay(Path(Option(System.getProperty("user.home")).get))
+
     def delete(path: Path): F[Unit] =
       Sync[F].blocking(JFiles.delete(path.toNioPath))
 

diff --git a/io/shared/src/main/scala/fs2/io/file/Files.scala b/io/shared/src/main/scala/fs2/io/file/Files.scala
@@ -128,6 +128,9 @@ sealed trait Files[F[_]] extends FilesPlatform[F] {
       permissions: Option[Permissions]
   ): F[Path]
 
+  /** User's current working directory */
+  def currentWorkingDirectory: F[Path]
+
   /** Deletes the specified file or empty directory, failing if it does not exist. */
   def delete(path: Path): F[Unit]
 
@@ -350,6 +353,9 @@ sealed trait Files[F[_]] extends FilesPlatform[F] {
       permissions: Option[Permissions]
   ): Resource[F, Path]
 
+  /** User's home directory */
+  def userHome: F[Path]
+
   /** Creates a stream of paths contained in a given file tree. Depth is unlimited. */
   def walk(start: Path): Stream[F, Path] =
     walk(start, Int.MaxValue, false)