#13 is fixed, cleaning directories before writing

Author: nikololiahim

.scalafmt.conf

@@ -2,7 +2,8 @@ version = "3.5.2"
 runner.dialect = scala3
 trailingCommas = multiple
 rewrite.scala3.convertToNewSyntax = yes
-rewrite.scala3.insertEndMarkerMinLines = 4
+# FIXME: this line causes EO.scala to fail
+# rewrite.scala3.insertEndMarkerMinLines = 4
 rewrite.scala3.removeOptionalBraces = oldSyntaxToo
 project.git = true
 

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

@@ -44,9 +44,10 @@ object EO:
             cfg.output.dirs.traverse_(out =>
               val outPath =
                 out / "sarif" / codePath.replaceExt(".sarif.json")
-
-              IO.println(s"Writing results to $outPath") *>
-                writeOutputTo(outPath)(sarifJson)
+              for
+                _ <- IO.println(s"Writing results to $outPath")
+                _ <- writeOutputTo(outPath)(sarifJson)
+              yield ()
             )
           }
         yield ()
@@ -68,6 +69,16 @@ object EO:
       }
     }
 
-    analyzeToDirs *> analyzeAggregate
+    for
+      _ <- cfg.output.dirs.traverse_ { outDir =>
+        for
+          _ <- IO.println(s"Cleaning $outDir before writing...")
+          _ <- outDir.clean
+        yield ()
+      }
+      _ <- analyzeToDirs
+      _ <- analyzeAggregate
+    yield ()
+    end for
   end analyze
 end EO

src/main/scala/org/polystat/InputUtils.scala

@@ -20,6 +20,12 @@ object InputUtils:
           ._1 + newExt
       )
 
+    def clean: IO[Path] =
+      for
+        _ <- Files[IO].deleteRecursively(path)
+        _ <- Files[IO].createDirectory(path)
+      yield path
+
     def toInput: IO[Input] =
       Files[IO]
         .isDirectory(path)

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

@@ -72,10 +72,7 @@ object Main extends IOApp:
           filteredAnalyzers = filterAnalyzers(inex),
           tempDir = tmp match
             case Some(path) =>
-              (IO.println(s"Cleaning ${path.absolute}...") *>
-                Files[IO].deleteRecursively(path) *>
-                Files[IO].createDirectory(path))
-                .as(path)
+              IO.println(s"Cleaning ${path.absolute}...") *> path.clean
             case None => Files[IO].createTempDirectory
           ,
           output = out,