tempDir is just Path

Author: nikololiahim

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

@@ -89,7 +89,6 @@ object Java:
       cfg: ProcessedConfig,
   ): IO[Unit] =
     for
-      tmp <- cfg.tempDir
       _ <- cfg.input match // writing EO files to tempDir
         case Input.FromStdin =>
           for
@@ -102,24 +101,24 @@ object Java:
               j2eoVersion,
               j2eo,
               inputDir = stdinTmp,
-              outputDir = tmp,
+              outputDir = cfg.tempDir,
             )
           yield ()
         case Input.FromFile(path) =>
-          runJ2EO(j2eoVersion, j2eo, inputDir = path, outputDir = tmp)
+          runJ2EO(j2eoVersion, j2eo, inputDir = path, outputDir = cfg.tempDir)
         case Input.FromDirectory(path) =>
-          runJ2EO(j2eoVersion, j2eo, inputDir = path, outputDir = tmp)
+          runJ2EO(j2eoVersion, j2eo, inputDir = path, outputDir = cfg.tempDir)
       // 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.
       _ <- Files[IO]
-        .exists(tmp)
+        .exists(cfg.tempDir)
         .ifM(
           ifTrue = IO.unit,
-          ifFalse = Files[IO].createDirectory(tmp),
+          ifFalse = Files[IO].createDirectory(cfg.tempDir),
         )
       _ <- EO.analyze(
-        cfg.copy(input = Input.FromDirectory(tmp))
+        cfg.copy(input = Input.FromDirectory(cfg.tempDir))
       )
     yield ()
 

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

@@ -69,24 +69,25 @@ object Main extends IOApp:
             lang,
             AnalyzerConfig(inex, input, tmp, fmts, out),
           ) =>
-        val processedConfig = ProcessedConfig(
-          filteredAnalyzers = filterAnalyzers(inex),
-          tempDir = tmp match
+        for
+          tempDir <- tmp match
             case Some(path) =>
               IO.println(s"Cleaning ${path.absolute}...") *> path.clean
             case None => Files[IO].createTempDirectory
-          ,
-          output = out,
-          input = input,
-          fmts = fmts,
-        )
-        val analysisResults: IO[Unit] =
-          lang match
-            case SupportedLanguage.EO => EO.analyze(processedConfig)
-            case SupportedLanguage.Java(j2eo, j2eoVersion) =>
-              Java.analyze(j2eoVersion, j2eo, processedConfig)
-            case SupportedLanguage.Python => Python.analyze(processedConfig)
-        analysisResults
+          processedConfig = ProcessedConfig(
+            filteredAnalyzers = filterAnalyzers(inex),
+            tempDir = tempDir,
+            output = out,
+            input = input,
+            fmts = fmts,
+          )
+          analysisResults: IO[Unit] =
+            lang match
+              case SupportedLanguage.EO => EO.analyze(processedConfig)
+              case SupportedLanguage.Java(j2eo, j2eoVersion) =>
+                Java.analyze(j2eoVersion, j2eo, processedConfig)
+              case SupportedLanguage.Python => Python.analyze(processedConfig)
+        yield ()
   end execute
 
 end Main

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

@@ -20,7 +20,7 @@ object PolystatConfig:
 
   final case class ProcessedConfig(
       filteredAnalyzers: List[ASTAnalyzer[IO]],
-      tempDir: IO[Path],
+      tempDir: Path,
       input: Input,
       fmts: List[OutputFormat],
       output: Output,

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

@@ -12,7 +12,6 @@ object Python:
 
   def analyze(cfg: ProcessedConfig): IO[Unit] =
     for
-      tmp <- cfg.tempDir
       _ <- readCodeFromInput(".py", cfg.input)
         .evalMap { case (path, code) =>
           val fileName = path.fileName.toString
@@ -22,14 +21,14 @@ object Python:
             )
             _ <- maybeCode match
               case Some(code) =>
-                writeOutputTo(tmp / path.replaceExt(".eo"))(code)
+                writeOutputTo(cfg.tempDir / path.replaceExt(".eo"))(code)
               case None => IO.println(s"Couldn't analyze $path...")
           yield ()
           end for
         }
         .compile
         .drain
-      _ <- EO.analyze(cfg.copy(input = Input.FromDirectory(tmp)))
+      _ <- EO.analyze(cfg.copy(input = Input.FromDirectory(cfg.tempDir)))
     yield ()
 
 end Python