Merge pull request #531 from digital-preservation/FilePathSubstitutionRefinements

File path substitution refinements

Author: techncl

csv-validator-cmd/src/main/scala/uk/gov/nationalarchives/csv/validator/cmd/CsvValidatorCmdApp.scala

@@ -146,8 +146,8 @@ object CsvValidatorCmdApp extends App {
   def getColumnFromCsv(csvFile: TextFile, csvSchemaFile: TextFile, columnName: String): List[String] = Try {
     val validator = createValidator(true, Nil, false, false, false)
     val csv = validator.loadCsvFile(csvFile, csvSchemaFile)
-    csv.headOption.map(_.indexOf("identifier")).map { identifierIdx =>
-      csv.tail.map(arr => arr(identifierIdx))
+    csv.headOption.map(_.indexOf(columnName)).map { identifierIdx =>
+      csv.tail.map(row => row(identifierIdx))
     }.getOrElse(Nil)
   }.getOrElse(Nil)
 

csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala

@@ -309,7 +309,7 @@ object CsvValidatorUi extends SimpleSwingApplication {
 
     btnChooseCsvFile.reactions += onClick {
       setPathToLastCsvPath(csvFileChooser)
-      chooseFile(csvFileChooser, txtCsvFile, btnChooseCsvFile)
+      chooseFileOrDir(csvFileChooser, txtCsvFile, btnChooseCsvFile)
       updateLastPath(csvFileChooser, path => Settings(path, path, path))
     }
 
@@ -324,7 +324,7 @@ object CsvValidatorUi extends SimpleSwingApplication {
     private val btnChooseCsvSchemaFile = new Button("...")
     btnChooseCsvSchemaFile.reactions += onClick {
       setPathToLastCsvPath(csvSchemaFileChooser)
-      chooseFile(csvSchemaFileChooser, txtCsvSchemaFile, btnChooseCsvSchemaFile)
+      chooseFileOrDir(csvSchemaFileChooser, txtCsvSchemaFile, btnChooseCsvSchemaFile)
       updateLastPath(csvSchemaFileChooser, path => Settings(path, path, path))
     }
 
@@ -497,34 +497,34 @@ object CsvValidatorUi extends SimpleSwingApplication {
       val identifierRows = CsvValidatorCmdApp.getColumnFromCsv(csvFile, schemaFile, "identifier").sorted
       val fromPath = identifierRows.headOption.getOrElse("")
 
-      val fileTextField = new TextField(30)
-      val fromPathText = new TextField(fromPath, 30)
+      val toPathField = new TextField(30)
+      val fromPathField = new TextField(fromPath, 30)
 
       def pathToUri(path: Path) = {
         val uri = path.toUri.toString
         if (uri.endsWith("/")) uri else s"$uri/"
       }
 
       def updateFileText(path: Path): Try[String] = {
-        fileTextField.text = pathToUri(path)
+        toPathField.text = pathToUri(path)
         Success("Text updated")
       }
 
-      val okButton = new Button("OK")
       val fileButton = new Button("...")
       fileButton.reactions += {
         case ev: ButtonClicked =>
-          val startingDir = if(fileTextField.text.isEmpty) userDir.toFile else Path.of(fileTextField.text).toFile
-          val helpText = s"Select the ${fromPath.split("/").last} folder"
+          val startingDir = if(toPathField.text.isEmpty) userDir.toFile else Path.of(toPathField.text).toFile
+          val fromFolderName = Path.of(fromPathField.text).getFileName
+          val helpText = s"Select the ${fromFolderName} folder"
           val fileChooser = new FileChooser(startingDir)
           fileChooser.title = helpText
-          fileChooser.fileSelectionMode = SelectionMode.FilesAndDirectories
-          chooseFile(fileChooser, f => updateFileText(f), fileButton, helpText)
+          fileChooser.fileSelectionMode = SelectionMode.DirectoriesOnly
+          chooseFileOrDir(fileChooser, f => updateFileText(f), fileButton, helpText)
       }
 
       val rows = List(
-        Row("From", List(fromPathText)),
-        Row("To", List(fileTextField, fileButton))
+        Row("From", List(fromPathField)),
+        Row("To", List(toPathField, fileButton))
       )
       addToTableDialog(parentFrame, "Add Path Substitution...", rows, tblPathSubstitutions.addRow)
     }

csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/ScalaSwingHelpers.scala

@@ -24,39 +24,39 @@ import scala.util.{Failure, Success, Try}
  * the use of scala.swing
  */
 object ScalaSwingHelpers {
-  private def handleSelectedFile(dialogAction: Result.Value, fileChooser: FileChooser, result: Path => Try[String], fileAction: String): Unit =
+  private def handleSelectedFileOrDir(dialogAction: Result.Value, fileOrDirChooser: FileChooser, result: Path => Try[String], fileAction: String): Unit =
     dialogAction match {
       case Result.Approve =>
-        result(fileChooser.selectedFile.toPath) match {
+        result(fileOrDirChooser.selectedFile.toPath) match {
           case Failure(e) =>
             e.printStackTrace()
-            Dialog.showMessage(fileChooser, s"${e.getClass.getName}: ${e.getMessage}", s"Unable to ${fileAction.toLowerCase()} file", Message.Error)
+            Dialog.showMessage(fileOrDirChooser, s"${e.getClass.getName}: ${e.getMessage}", s"Unable to ${fileAction.toLowerCase()} file", Message.Error)
           case _ => ()
         }
       case _ => ()
     }
 
   /**
-   * Opens a FileChooser and sets the path of the chosen file as the text of a Text Component
+   * Opens a FileChooser and sets the path of the chosen file/dir as the text of a Text Component
    *
-   * @param fileChooser FileChooser which is Used to open file dialogs
+   * @param fileOrDirChooser FileChooser which is Used to open file/dir dialogs
    * @param output A text component which displays the absolute path of the chosen file
    * @param locateOver A component over which the FileChooser dialog should be located
    */
-  def chooseFile(fileChooser: FileChooser, output: JTextField, locateOver: Component) : Unit =
-    chooseFile(fileChooser, f => Try(output.setText(f.toAbsolutePath.toString)).map(_ => "Path updated"), locateOver)
+  def chooseFileOrDir(fileOrDirChooser: FileChooser, output: JTextField, locateOver: Component) : Unit =
+    chooseFileOrDir(fileOrDirChooser, f => Try(output.setText(f.toAbsolutePath.toString)).map(_ => "Path updated"), locateOver)
 
   /**
    * Opens a FileChooser and sends the result to a function
    *
-   * @param fileChooser FileChooser which is Used to open file dialogs
+   * @param fileOrDirChooser FileChooser which is Used to open file/dir dialogs
    * @param result A function which takes the chosen file
    * @param locateOver A component over which the FileChooser dialog should be located
    * @param approveBtnText The text to appear on the approval button of the dialog box
    */
-  def chooseFile(fileChooser: FileChooser, result: Path => Try[String], locateOver: Component, approveBtnText: String = "OK") : Unit = {
-    val showDialogAction = fileChooser.showDialog(locateOver, approveBtnText)
-    handleSelectedFile(showDialogAction, fileChooser, result, "get")
+  def chooseFileOrDir(fileOrDirChooser: FileChooser, result: Path => Try[String], locateOver: Component, approveBtnText: String = "OK") : Unit = {
+    val showDialogAction = fileOrDirChooser.showDialog(locateOver, approveBtnText)
+    handleSelectedFileOrDir(showDialogAction, fileOrDirChooser, result, "get")
   }
 
   /**
@@ -69,7 +69,7 @@ object ScalaSwingHelpers {
    */
   def saveFile(fileChooser: FileChooser, result: Path => Try[String], locateOver: Component, approveBtnText: String) : Unit = {
     val saveDialogAction = fileChooser.showSaveDialog(locateOver)
-    handleSelectedFile(saveDialogAction, fileChooser, result, approveBtnText)
+    handleSelectedFileOrDir(saveDialogAction, fileChooser, result, approveBtnText)
   }
 
   /**