removed bad casts

Author: nikololiahim

src/main/scala/org/polystat/cli/EO.scala

@@ -29,8 +29,7 @@ object EO:
               a.analyze(
                 tmpDir = cfg.tempDir,
                 // TODO: make sure cfg input is always converted to directory
-                pathToSrcRoot =
-                  cfg.input.asInstanceOf[Input.FromDirectory].path,
+                pathToSrcRoot = cfg.input,
                 pathToCode = codePath,
                 code = code,
               ).handleError(e =>
@@ -56,8 +55,7 @@ object EO:
                 codePath
                   .mount(
                     to = (out / "sarif").unsafeToDirectory,
-                    relativelyTo =
-                      cfg.input.asInstanceOf[Input.FromDirectory].path,
+                    relativelyTo = cfg.input,
                   )
                   .replaceExt(newExt = ".sarif.json")
               for
@@ -81,7 +79,7 @@ object EO:
       }
 
     for
-      inputFiles <- readCodeFromInput(".eo", cfg.input).compile.toVector
+      inputFiles <- readCodeFromDir(".eo", cfg.input).compile.toVector
       analyzed <- runAnalyzers(inputFiles)
       _ <- cfg.output.dirs.traverse_ { outDir =>
         for

src/main/scala/org/polystat/cli/Java.scala

@@ -92,25 +92,7 @@ object Java:
   ): IO[Unit] =
     for
       dirForEO <- (cfg.tempDir / "eo").unsafeToDirectory.createDirIfDoesntExist
-      _ <- cfg.input match // writing EO files to tempDir
-        case Input.FromStdin =>
-          for
-            code <- readCodeFromStdin.compile.string
-            stdinTmp <- Files[IO].createTempDirectory.map(path =>
-              (path / "stdin").unsafeToDirectory
-            )
-            _ <- writeOutputTo(stdinTmp)(code)
-            _ <- runJ2EO(
-              j2eoVersion,
-              j2eo,
-              input = stdinTmp,
-              outputDir = dirForEO,
-            )
-          yield ()
-        case Input.FromFile(path) =>
-          runJ2EO(j2eoVersion, j2eo, input = path, outputDir = dirForEO)
-        case Input.FromDirectory(path) =>
-          runJ2EO(j2eoVersion, j2eo, input = path, outputDir = dirForEO)
+      _ <- runJ2EO(j2eoVersion, j2eo, input = cfg.input, outputDir = dirForEO)
       // J2EO deletes the tmp directory when there are no files to analyze
       // This causes the subsequent call to EO.analyze to fail, because there is no temp directory.
       // The line below patches this issue by creating the temp directory if it was deleted by J2EO.
@@ -121,7 +103,7 @@ object Java:
           ifFalse = Files[IO].createDirectories(dirForEO),
         )
       _ <- EO.analyze(
-        cfg.copy(input = Input.FromDirectory(dirForEO))
+        cfg.copy(input = dirForEO)
       )
     yield ()
 

src/main/scala/org/polystat/cli/Python.scala

@@ -13,7 +13,7 @@ object Python:
   def analyze(cfg: ProcessedConfig): IO[Unit] =
     val dirForEO = (cfg.tempDir / "eo").unsafeToDirectory
     for
-      _ <- readCodeFromInput(".py", cfg.input)
+      _ <- readCodeFromDir(".py", cfg.input)
         .evalMap { case (path, code) =>
           for
             maybeCode <- IO(
@@ -22,8 +22,7 @@ object Python:
             pathToEOCode = path
               .mount(
                 to = dirForEO,
-                // TODO: remove asInstanceOf
-                relativelyTo = cfg.input.asInstanceOf[Input.FromDirectory].path,
+                relativelyTo = cfg.input,
               )
               .replaceExt(newExt = ".eo")
             _ <- maybeCode match
@@ -35,7 +34,7 @@ object Python:
         }
         .compile
         .drain
-      _ <- EO.analyze(cfg.copy(input = Input.FromDirectory(dirForEO)))
+      _ <- EO.analyze(cfg.copy(input = dirForEO))
     yield ()
 
 end Python

src/main/scala/org/polystat/cli/util/FileTypes.scala

@@ -12,13 +12,15 @@ object FileTypes:
 
   given Conversion[Directory, Path] = _.underlying
   object Directory:
+
     def fromPath(path: Path): IO[Option[Directory]] =
       Files[IO]
         .isDirectory(path)
         .ifM(
           ifTrue = IO.pure(Some(Directory(path))),
           ifFalse = IO.pure(None),
         )
+
     def fromPathFailFast(path: Path): IO[Directory] =
       fromPath(path).flatMap {
         case Some(dir) => IO.pure(dir)
@@ -55,17 +57,28 @@ object FileTypes:
           ifTrue = IO.pure(Some(File(path))),
           ifFalse = IO.pure(None),
         )
+
     def fromPathFailFast(path: Path): IO[File] =
       fromPath(path).flatMap {
         case Some(file) => IO.pure(file)
         case None =>
           IO.raiseError(new Exception(s"$path must be a regular file!"))
       }
+
     def fromPathUnsafe(path: Path): File = File(path)
+
   extension (file: File)
+    def createFileIfDoesntExist: IO[File] =
+      file.parent match
+        case Some(parent) =>
+          (Files[IO].createDirectories(parent) *> Files[IO].createFile(file))
+            .as(file)
+        case None => Files[IO].createFile(file).as(file)
+
     def filenameNoExt: String =
       val fileName = file.fileName.toString
       fileName.splitAt(fileName.indexOf("."))._1
+
     def replaceExt(newExt: String): File =
       File.fromPathUnsafe(
         Path(
@@ -74,6 +87,7 @@ object FileTypes:
             ._1 + newExt
         )
       )
+
     def mount(to: Directory, relativelyTo: Directory): File =
       val relativePath =
         relativelyTo.absolute.normalize.relativize(file.absolute.normalize)