fix: fix bug in file lookup

Author: giacomocavalieri

build.sbt

@@ -58,7 +58,8 @@ lazy val root = project
       "io.circe" %% "circe-core" % "0.14.2",
       "io.circe" %% "circe-generic" % "0.14.2",
       "io.circe" %% "circe-parser" % "0.14.2",
-      "org.typelevel" %% "cats-core" % "2.7.0"
+      "org.typelevel" %% "cats-core" % "2.7.0",
+      "org.scalatest" %% "scalatest" % "3.2.12" % "test"
     ),
     Global / onLoad := {
       val old = (Global / onLoad).value

src/main/scala/dev/atedeg/Configuration.scala

@@ -1,20 +1,33 @@
 package dev.atedeg
 
 import scala.util.Try
+
 import better.files.File
-import io.circe.{Decoder, Json}
-import io.circe.generic.auto.*
+import io.circe.{ Decoder, Json }
+import io.circe.generic.auto._
 import io.circe.yaml.parser
-import cats.implicits.*
+import cats.implicits._
+
+import Extensions._
 
 final case class Selector(selector: String) {
+
   def toFiles(workingDir: File): Either[String, List[File]] = {
-    val file = File(workingDir, selector)
-    Try(
-      if (file.isDirectory) file.listRecursively.toList.sortBy(_.name)
-      else if (file.exists) List(file)
-      else workingDir.glob(selector).toList.sortBy(_.name),
-    ).toEither.leftMap(_.toString)
+    Try(unsafeToFiles(workingDir))
+      .map(_.sortBy(_.name))
+      .toEither
+      .filterOrElse(_.nonEmpty, s"No files found matching selector $selector")
+  }
+
+  private def unsafeToFiles(workingDir: File): List[File] = {
+    val dir = File(workingDir, selector)
+    if (dir.isDirectory) dir.listHtmlFiles.toList
+    else {
+      workingDir.listHtmlFiles.find(_.nameWithoutExtension == selector) match {
+        case Some(f) => List(f)
+        case None => workingDir.globHtmlFiles(selector).toList
+      }
+    }
   }
 }
 
@@ -26,12 +39,12 @@ object Configuration {
   private val configFile = ".ubidoc"
 
   def read(defaultLocation: File): Either[String, Configuration] =
-    Try((defaultLocation / configFile).contentAsString).toEither.leftMap(_.toString).flatMap(parse)
+    Try((defaultLocation / configFile).contentAsString).toEither.flatMap(parse)
 
-  def parse(raw: String): Either[String, Configuration] = parser.parse(raw).leftMap(_.toString).flatMap(parseJson)
+  def parse(raw: String): Either[String, Configuration] = parser.parse(raw).flatMap(parseJson)
 
   private def parseJson(json: Json): Either[String, Configuration] = {
     implicit val decoder: Decoder[List[Selector]] = Decoder.decodeList(Decoder.decodeString.map(Selector))
-    json.as[Configuration].leftMap(_.toString)
+    json.as[Configuration]
   }
-}
+}

src/main/scala/dev/atedeg/Extensions.scala

@@ -0,0 +1,20 @@
+package dev.atedeg
+
+import scala.language.implicitConversions
+
+import better.files.File
+import cats.implicits.*
+
+object Extensions {
+  implicit def eitherToEitherString[A, E](e: Either[E, A]): Either[String, A] = e.leftMap(_.toString)
+
+  implicit class BetterFileIterator(val i: Iterator[File]) {
+    def keepHtmlFiles: Iterator[File] = i.filter(_.isHtmlFile)
+  }
+
+  implicit class BetterFile(val f: File) {
+    def isHtmlFile: Boolean = f.extension.contains(".html")
+    def listHtmlFiles: Iterator[File] = f.listRecursively.keepHtmlFiles
+    def globHtmlFiles(g: String): Iterator[File] = f.glob(g).keepHtmlFiles
+  }
+}

src/main/scala/dev/atedeg/Table.scala

@@ -2,8 +2,6 @@ package dev.atedeg
 
 import scala.util.Try
 
-import dev.atedeg.Selector.toFiles
-
 import better.files.File
 import net.ruippeixotog.scalascraper.browser.JsoupBrowser
 import better.files.Dsl.SymbolicOperations
@@ -31,7 +29,7 @@ object Table {
 
   def parse(workingDir: File, tableConfig: TableConfig, ignoredFiles: Set[File]): Either[String, (Table, List[File])] =
     for {
-      files <- tableConfig.rows.flatTraverse(toFiles(workingDir, _)).map(_.filterNot(ignoredFiles.contains))
+      files <- tableConfig.rows.flatTraverse(_.toFiles(workingDir)).map(_.filterNot(ignoredFiles.contains))
       rows <- files.traverse(parseFile(_, tableConfig.columns))
       columnNames = tableConfig.columns.map(_.name)
     } yield (Table(tableConfig.name, columnNames, rows), files)

src/main/scala/dev/atedeg/Ubidoc.scala

@@ -1,10 +1,13 @@
 package dev.atedeg
 
+import java.io.{ File => JFile }
+
+import scala.util.Try
+
 import better.files.{ File, FileExtensions }
 import cats.implicits.*
 
-import java.io.{ File => JFile }
-import scala.util.Try
+import Extensions._
 
 object Ubidoc {
 
@@ -29,10 +32,10 @@ object Ubidoc {
     }
 
     def listAllFiles(workingDir: File): Either[String, Set[File]] =
-      Try(workingDir.listRecursively).toEither.leftMap(_.toString).map(_.toSet)
+      Try(workingDir.listRecursively).toEither.map(_.toSet)
 
     def getIgnoredFiles(conf: Configuration, workingDir: File): Either[String, Set[File]] =
-      conf.ignored.flatTraverse(Selector.toFiles(workingDir, _)).map(_.toSet)
+      conf.ignored.flatTraverse(_.toFiles(workingDir)).map(_.toSet)
 
     def parseAllFiles(
         conf: Configuration,
@@ -43,7 +46,7 @@ object Ubidoc {
       for {
         res <- conf.tables.traverse(Table.parse(workingDir, _, ignoredFiles))
         tables = res.map(_._1)
-        _ <- tables.traverse(_.serialize(targetDir)).toEither.leftMap(_.toString)
+        _ <- tables.traverse(_.serialize(targetDir)).toEither
         files = res.flatMap(_._2)
       } yield files.toSet