Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions src/main/scala/org/scalastyle/Directory.scala
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,27 @@ object Directory {
files: Iterable[File],
excludeFilter: Option[FileFilter] = None
): Seq[FileSpec] = {
files.flatMap { f =>
if (excludeFilter.exists(_.accept(f))) {
Nil
} else if (f.isDirectory) {
privateGetFiles(encoding, f.listFiles, excludeFilter)
} else if (scalaFileFilter.accept(f)) {
Seq(new DirectoryFileSpec(f.getAbsolutePath, encoding, f.getAbsoluteFile))
} else {
Nil

def getFilesHelper(currentFiles: Iterable[File], acc: Set[File]): Set[File] = {
currentFiles.headOption match {
case Some(f) =>
if (excludeFilter.exists(_.accept(f))) {
getFilesHelper(currentFiles.tail, acc)
} else if (f.isDirectory) {
val newCurrentFiles = currentFiles.tail ++ f.listFiles
getFilesHelper(newCurrentFiles, acc)
} else if (scalaFileFilter.accept(f) && !acc(f)) {
val newAcc = acc + f
getFilesHelper(currentFiles.tail, newAcc)
} else {
getFilesHelper(currentFiles.tail, acc)
}
case None => acc
}
}.toSeq
}

val uniqueFiles = getFilesHelper(files, Set.empty)
uniqueFiles.toSeq.map(f => new DirectoryFileSpec(f.getAbsolutePath, encoding, f.getAbsoluteFile))
}

}
39 changes: 39 additions & 0 deletions src/test/scala/org/scalastyle/DirectoryTest.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package org.scalastyle

import java.io.File

import org.junit.{Assert, Test}
import org.scalatestplus.junit.AssertionsForJUnit

class DirectoryTest extends AssertionsForJUnit {

private def toFile(s: String) = {
val base = "src/test/resources/testDir/"
new File(base + s)
}

@Test
def processSingleFileOnlyOnce(): Unit = {
val duplicatedFile = List("dirA/X.scala", "dirA/X.scala")
assertGetFiles(1, duplicatedFile)
}

@Test
def processDirectoryOnlyOnce(): Unit = {
val duplicatedDir = List("dirA", "dirA")
assertGetFiles(1, duplicatedDir)
}

@Test
def processFileInProcessDirOnlyOnce(): Unit = {
val duplicatedFileInDir = List("dirB", "dirB/Y.scala")
assertGetFiles(2, duplicatedFileInDir)
}


private def assertGetFiles(nrExpectedFiles: Int, inputFiles: Seq[String]): Unit = {
val files = Directory.getFiles(None, inputFiles.map(toFile))
Assert.assertEquals(nrExpectedFiles, files.size)
}

}