Add -nodelete argument

Closes #3
obruchez · Jan 14, 2024 · 6ac5a8c · 6ac5a8c
1 parent c94fffd
commit 6ac5a8c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/scala/org/bruchez/olivier/flactomp3/Arguments.scala b/src/main/scala/org/bruchez/olivier/flactomp3/Arguments.scala
@@ -7,6 +7,7 @@ case class Arguments(
  srcPath: Path,
  dstPath: Path,
  trashPath: Path,
+ noDelete: Boolean = false,
  inputExtensionsToConvert: Set[String] = Arguments.DefaultInputExtensionsToConvert,
  outputFormat: Format = Aac,
  outputBitrateOption: Option[Bitrate] = None,
@@ -60,6 +61,8 @@ object Arguments {
  (arg match {
  case TrashPathArgument if remainingArgs.nonEmpty =>
  Success((arguments.copy(trashPath = Paths.get(remainingArgs.head)), remainingArgs.tail))
+ case NoDeleteArgument =>
+ Success((arguments.copy(noDelete = true), remainingArgs))
  case InputExtensionsToConvertArgument if remainingArgs.nonEmpty =>
  val extensions = remainingArgs.head.split(",").map(_.trim.toLowerCase).toSet
  Success((arguments.copy(inputExtensionsToConvert = extensions), remainingArgs.tail))
@@ -131,6 +134,7 @@ object Arguments {
  |Options:
  |
  |-trash trash_directory directory where removed destination files will be put (default is destination_directory/.FlacToMp3Trash)
+ |-nodelete do not delete any file in the destination directory
  |-extensions extensions comma-separated list of extensions to convert using ffmpeg (default is ${DefaultInputExtensionsToConvert.toSeq.sorted
  .mkString(",")})
  |-format format output format (aac or mp3)
@@ -144,6 +148,7 @@ object Arguments {
  |-noop do not convert, copy, or remove any file in the destination directory""".stripMargin
 
  private val TrashPathArgument = "-trash"
+ private val NoDeleteArgument = "-nodelete"
  private val InputExtensionsToConvertArgument = "-extensions"
  private val OutputFormatArgument = "-format"
  private val ConstantBitrateArgument = "-cbr"

diff --git a/src/main/scala/org/bruchez/olivier/flactomp3/FlacToMp3.scala b/src/main/scala/org/bruchez/olivier/flactomp3/FlacToMp3.scala
@@ -102,7 +102,11 @@ object FlacToMp3 {
  dstPaths.filter(Files.isSymbolicLink).map(RemoveSymbolicLinkAction)
 
  val removeFileActions =
- dstPaths.filterNot(expectedDestinationPaths.contains).map(RemoveFileAction)
+ if (!arguments.noDelete) {
+ dstPaths.filterNot(expectedDestinationPaths.contains).map(RemoveFileAction)
+ } else {
+ Seq()
+ }
 
  val convertFileActions = filesToConvert.map { case (srcPath, dstPath) =>
  ConvertFileAction(srcPath, dstPath)