Merge pull request #220 from rladstaetter/218-if-you-drop-a-directory…

…-with-zip-files-those-should-be-unpacked-and-displayed

#218: opens zip files in dropped directory

app-tests/src/test/scala/app/logorrr/usecases/dnd/DndDropDirectoryTest.scala

@@ -0,0 +1,49 @@
+package app.logorrr.usecases.dnd
+
+import app.logorrr.io.FileId
+import app.logorrr.steps.{CheckTabPaneActions, VisibleItemActions}
+import app.logorrr.usecases.StartEmptyApplicationTest
+import app.logorrr.views.UiNodes
+import app.logorrr.{LogoRRRApp, TestFiles}
+import javafx.scene.Scene
+import javafx.scene.control.ToolBar
+import javafx.scene.input.MouseButton
+import javafx.stage.Stage
+import org.junit.jupiter.api.{BeforeAll, Test}
+
+object DndDropDirectoryTest {
+
+  @BeforeAll
+  def setUp(): Unit = {
+    // necessary for https://github.com/TestFX/TestFX/issues/33
+    System.setProperty("testfx.robot", "awt")
+  }
+
+}
+
+class DndDropDirectoryTest extends StartEmptyApplicationTest
+  with VisibleItemActions
+  with CheckTabPaneActions {
+
+  @throws[Exception]
+  override def start(stage: Stage): Unit = {
+    LogoRRRApp.start(stage, services)
+    stage.toFront()
+
+    val dndStage = new Stage()
+    val dropBox = new ToolBar(Seq(new DragSourceButton(TestFiles.baseDir)): _*)
+    dndStage.setScene(new Scene(dropBox))
+    dndStage.show()
+
+  }
+
+  @Test def testOpeningDirectoryWith5FilesAndAZipContaining10Files(): Unit = {
+    checkForEmptyTabPane()
+    drag(DragSourceButton.uiNode(FileId(TestFiles.baseDir)).ref, MouseButton.PRIMARY).dropTo(UiNodes.MainTabPane.ref)
+    expectCountOfOpenFiles(15)
+  }
+
+}
+
+
+

app/src/main/scala/app/logorrr/views/main/MainTabPane.scala

@@ -12,6 +12,8 @@ import javafx.scene.control.{Tab, TabPane}
 import javafx.scene.input.{DragEvent, TransferMode}
 
 import java.nio.file.{Files, Path}
+import java.util.stream.Collectors
+import java.{lang, util}
 import scala.collection.mutable
 import scala.jdk.CollectionConverters._
 
@@ -90,7 +92,11 @@ class MainTabPane extends TabPane with CanLog {
   }
 
   private def dropDirectory(path: Path): Unit = {
-    Files.list(path).filter((p: Path) => Files.isRegularFile(p)).forEach((t: Path) => openFile(FileId(t)))
+    val files = Files.list(path).filter((p: Path) => Files.isRegularFile(p))
+    // diff between regular files and zip files, try to open zip files as container
+    val collectorResults: util.Map[lang.Boolean, util.List[Path]] = files.collect(Collectors.partitioningBy((p: Path) => p.getFileName.toString.endsWith(".zip")))
+    collectorResults.get(false).forEach(p => openFile(FileId(p)))
+    collectorResults.get(true).forEach(p => openZipFile(p))
   }
 
   /**