SbtProcess supports multifile

Author: warcholjakub

api/src/main/scala/org/scastie/api/FileOrFolder.scala

@@ -7,6 +7,7 @@ import io.circe.syntax._
 sealed trait FileOrFolder {
   val name: String
   val path: String
+
   def isFolder: Boolean
 }
 
@@ -40,63 +41,41 @@ object File {
   implicit val fileDecoder: Decoder[File] = deriveDecoder[File]
 }
 
-object Folder {
-
-  def singleton(code: String): Folder = {
-    Folder("root", List(File("Main.scala", code, "/root/Main.scala")), "/root", isRoot = true)
-  }
-
-  implicit val folderEncoder: Encoder[Folder] =
-    deriveEncoder[Folder].mapJson(_.deepMerge(Json.obj("isFolder" -> Json.fromBoolean(true))))
-  implicit val folderDecoder: Decoder[Folder] = deriveDecoder[Folder]
-}
-
 case class Folder(
   override val name: String,
   children: List[FileOrFolder] = List(),
-  override val path: String = "",
-  isRoot: Boolean = false
+  override val path: String = ""
 ) extends FileOrFolder {
   def isFolder: Boolean = true
 
   def isEmpty: Boolean = children.isEmpty
 
+  def summary: String = {
+    import System.{lineSeparator => nl}
+    children.headOption match {
+      case Some(File(_, content, _)) => content.split(nl).take(3).mkString(nl)
+      case _ => this.toString.take(200) + "..."
+    }
+  }
+
   def childHeadFileContent: String = {
     children.headOption match {
       case Some(f: File) => f.content
       case _             => ""
     }
   }
 
-  def take(i: Int): String = childHeadFileContent.take(i)
-
-  def split(nl: String): Array[String] = childHeadFileContent.split(nl)
+}
 
-  def add(ff: FileOrFolder): Folder = {
-    if (this.path.nonEmpty) {
-      val f = FileOrFolderUtils.prependPath(this.path, ff)
-      this.copy(children = this.children :+ f)
-    } else {
-      val rootName = name
-      val f        = if (isRoot) FileOrFolderUtils.prependPath(rootName, ff) else ff
-      this.copy(children = this.children :+ f)
-    }
-  }
+object Folder {
 
-  def add2(path: String, isFolder: Boolean = false): Folder = {
-    path.split("/").toList match {
-      case Nil => this
-      case head :: Nil =>
-        val newFilePath = this.path + "/" + head
-        val newFile     = if (isFolder) Folder(head, path = newFilePath) else File(head, newFilePath)
-        copy(children = children :+ newFile)
-      case head :: tail =>
-        val newIntermediate = Folder(head, path = this.path + "/" + head)
-        val folder          = children.find(_.name.equals(head)).getOrElse(newIntermediate).asInstanceOf[Folder]
-        copy(children = children.filterNot(_.name == head) :+ folder.add2(tail.mkString("/"), isFolder))
-    }
+  def singleton(code: String): Folder = {
+    Folder("", List(File("code.scala", code, "/code.scala")), "/")
   }
 
+  implicit val folderEncoder: Encoder[Folder] =
+    deriveEncoder[Folder].mapJson(_.deepMerge(Json.obj("isFolder" -> Json.fromBoolean(true))))
+  implicit val folderDecoder: Decoder[Folder] = deriveDecoder[Folder]
 }
 
 object FileOrFolderUtils {
@@ -159,11 +138,13 @@ object FileOrFolderUtils {
   }
 
   def recomputePaths(f: Folder, prefix: String = ""): Folder = {
+    val isRoot = f.name.isEmpty
+    val currFolderPath = if (isRoot) prefix else prefix + "/" + f.name
     f.copy(
-      path = prefix + "/" + f.name,
+      path = if (isRoot) "/" else currFolderPath,
       children = f.children.map {
-        case folder: Folder => recomputePaths(folder, prefix + "/" + f.name)
-        case file: File     => file.copy(path = prefix + "/" + f.name + "/" + file.name)
+        case folder: Folder => recomputePaths(folder, prefix = currFolderPath)
+        case file: File     => file.copy(path = currFolderPath + "/" + file.name)
       }
     )
   }
@@ -183,15 +164,4 @@ object FileOrFolderUtils {
     })
   }
 
-  def prependPath(p: String, fileOrFolder: FileOrFolder): FileOrFolder = {
-    fileOrFolder match {
-      case f: File =>
-        val nonEmptyPath = if (f.path.isEmpty) f.name else f.path
-        f.copy(path = p + "/" + nonEmptyPath)
-      case f: Folder =>
-        val nonEmptyPath = if (f.path.isEmpty) f.name else f.path
-        f.copy(children = f.children.map(x => prependPath(p + "/" + f.name, x)), path = p + "/" + nonEmptyPath)
-    }
-  }
-
 }

client/src/main/scala/org/scastie/client/ScastieBackend.scala

@@ -154,7 +154,7 @@ case class ScastieBackend(scastieId: UUID, serverUrl: Option[String], scope: Bac
       scope.modState(ss => {
         def updateTab(tab: Tab): Tab = {
           if (tab.tabId == f.path)
-            tab.copy(tabId = dstFolderPath + "/" + f.name)
+            tab.copy(tabId = dstFolderPath.stripSuffix("/") + "/" + f.name)
           else tab
         }
 

client/src/main/scala/org/scastie/client/components/fileHierarchy/FileHierarchy.scala

@@ -45,7 +45,7 @@ object FileHierarchy {
               Callback.empty
             } else {
               moveFileOrFolder(src, dstPath) >>
-              fhs.setState(FileHierarchyState(selectedFile = dstPath + "/" + src.name, dragOver = ""))
+              fhs.setState(FileHierarchyState(selectedFile = dstPath.stripSuffix("/") + "/" + src.name, dragOver = ""))
             }
           } else {
             fhs.modState(_.copy(dragOver = dragInfo.fileOrFolder.path))

sbt-runner/src/main/scala/org/scastie/sbt/SbtProcess.scala

@@ -18,6 +18,7 @@ import org.scastie.util._
 import org.scastie.instrumentation.PositionMapper
 
 import scala.concurrent.duration._
+import scala.reflect.io.Directory
 import scala.util.Random
 
 object SbtProcess {
@@ -129,8 +130,8 @@ class SbtProcess(runTimeout: FiniteDuration,
   // log.info(s"sbtVersion: $sbtVersion")
   write(projectDir.resolve("build.properties"), s"sbt.version = ${org.scastie.buildinfo.BuildInfo.sbtVersion}")
   private val pluginFile = projectDir.resolve("plugins.sbt")
-  private val codeFile = sbtDir.resolve("src/main/scala/main.scala")
-  Files.createDirectories(codeFile.getParent)
+  private val scalaDir = sbtDir.resolve("src/main/scala")
+  Files.createDirectories(scalaDir)
 
   private def scalaJsContent(): Option[String] = {
     slurp(sbtDir.resolve(Js.targetFilename))
@@ -210,7 +211,7 @@ class SbtProcess(runTimeout: FiniteDuration,
 
   when(Ready) {
     case Event(task @ SbtTask(snippetId, taskInputs, ip, login, progressActor), SbtData(stateInputs)) =>
-      println(s"Running: (login: $login, ip: $ip) \n ${taskInputs.code.take(30)}")
+      println(s"Running: (login: $login, ip: $ip) \n ${taskInputs.code.toString.take(30)}")
 
       val _sbtRun = SbtRun(
         snippetId = snippetId,
@@ -323,7 +324,14 @@ class SbtProcess(runTimeout: FiniteDuration,
     writeFile(buildFile, prompt + "\n" + inputs.sbtConfig)
     Files.deleteIfExists(sbtDir.resolve(Js.targetFilename))
     Files.deleteIfExists(sbtDir.resolve(Js.sourceMapFilename))
-    write(codeFile, inputs.code.childHeadFileContent, truncate = true)
+    new Directory(scalaDir.toFile).deleteRecursively()
+    Files.createDirectories(scalaDir)
+
+    FileOrFolderUtils.allFiles(inputs.code).foreach(f => {
+      val path = scalaDir.resolve(f.path.substring(1))
+      Files.createDirectories(path.getParent)
+      write(path, f.content, truncate = true)
+    })
   }
 
   private def writeFile(path: Path, content: String): Unit = {

storage/src/main/scala/org/scastie/storage/filesystem/FilesystemSnippetsContainer.scala

@@ -113,7 +113,7 @@ trait FilesystemSnippetsContainer extends SnippetsContainer with GenericFilesyst
                       List(
                         SnippetSummary(
                           snippetId,
-                          inputs.code.split(nl).take(3).mkString(nl),
+                          inputs.code.summary,
                           getFileTimestamp(snippetId)
                         )
                       )

storage/src/main/scala/org/scastie/storage/inmemory/InMemorySnippetsContainer.scala

@@ -7,7 +7,6 @@ import org.scastie.storage.UserLogin
 import scala.collection.mutable
 import scala.concurrent.Future
 
-import System.{lineSeparator => nl}
 
 
 trait InMemorySnippetsContainer extends SnippetsContainer {
@@ -41,7 +40,7 @@ trait InMemorySnippetsContainer extends SnippetsContainer {
       .map { m =>
         SnippetSummary(
           m.snippetId,
-          m.inputs.code.split(nl).take(3).mkString(nl),
+          m.inputs.code.summary,
           m.time
         )
       }

storage/src/main/scala/org/scastie/storage/mongodb/MongoDBSnippetsContainer.scala

@@ -10,7 +10,6 @@ import org.mongodb.scala.model._
 import org.scastie.api._
 import org.scastie.storage._
 
-import java.lang.System.{lineSeparator => nl}
 import scala.concurrent.Await
 import scala.concurrent.Future
 import scala.concurrent.duration._
@@ -156,7 +155,7 @@ trait MongoDBSnippetsContainer extends SnippetsContainer with GenericMongoContai
         val sortedSnippets = results.getOrElse(Nil).flatten.sortBy(-_.time)
         sortedSnippets
           .map(result =>
-            SnippetSummary(result.snippetId, result.inputs.code.split(nl).take(3).mkString(nl), result.time)
+            SnippetSummary(result.snippetId, result.inputs.code.summary, result.time)
           )
           .toList
       })