Format and fix messages from cmta studentify/linearize/`delinea…

…rize` (#273)
scalacenter · Jul 31, 2023 · 744e9c6 · 744e9c6
1 parent 911795f
commit 744e9c6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/cmta/src/main/scala/com/lunatech/cmt/admin/command/Delinearize.scala b/cmta/src/main/scala/com/lunatech/cmt/admin/command/Delinearize.scala
@@ -42,14 +42,14 @@ object Delinearize:
 
         for {
           _ <- Right(()).withLeft[CmtError]
-          _ = println(s"De-linearizing ${toConsoleGreen(mainRepository.value.getPath)} to ${toConsoleGreen(
-              options.linearizeBaseDirectory.value.getPath)}")
 
           mainRepoName = mainRepository.value.getName
+          linearizedRootFolder = options.linearizeBaseDirectory.value / mainRepoName
 
-          ExercisesMetadata(_, exercisesInMain, _) <- getExerciseMetadata(mainRepository.value)(config)
+          _ = println(
+            s"De-linearizing ${toConsoleGreen(linearizedRootFolder.getPath)} to ${toConsoleGreen(mainRepository.value.getCanonicalPath)}")
 
-          linearizedRootFolder = options.linearizeBaseDirectory.value / mainRepoName
+          ExercisesMetadata(_, exercisesInMain, _) <- getExerciseMetadata(mainRepository.value)(config)
 
           exercisesAndSHAsInLinearized <- getExercisesAndSHAs(linearizedRootFolder)
 

diff --git a/cmta/src/main/scala/com/lunatech/cmt/admin/command/Linearize.scala b/cmta/src/main/scala/com/lunatech/cmt/admin/command/Linearize.scala
@@ -54,12 +54,12 @@ object Linearize:
             mainRepoName = mainRepository.value.getName
             tmpFolder = sbtio.createTemporaryDirectory
             cleanedMainRepo = tmpFolder / mainRepository.value.getName
-            ExercisesMetadata(prefix, exercises, exerciseNumbers) <- getExerciseMetadata(mainRepository.value)(config)
+            ExercisesMetadata(_, exercises, _) <- getExerciseMetadata(mainRepository.value)(config)
             linearizedRootFolder = options.linearizeBaseDirectory.value / mainRepoName
 
-            _ = println(
-              s"Linearizing ${toConsoleGreen(mainRepoName)} to ${toConsoleGreen(options.linearizeBaseDirectory.value.getPath)}")
-
+            _ = {
+              println(s"Linearizing ${toConsoleGreen(mainRepoName)} to ${toConsoleGreen(linearizedRootFolder.getPath)}")
+            }
             _ <- checkpreExistingAndCreateArtifactRepo(
               options.linearizeBaseDirectory.value,
               linearizedRootFolder,

diff --git a/cmta/src/main/scala/com/lunatech/cmt/admin/command/Studentify.scala b/cmta/src/main/scala/com/lunatech/cmt/admin/command/Studentify.scala
@@ -83,8 +83,10 @@ object Studentify:
             studentifiedRootFolder = options.studentifyBaseDirectory.value / mainRepoName
             solutionsFolder = studentifiedRootFolder / config.studentifiedRepoSolutionsFolder
 
-            _ = println(
-              s"Studentifying ${toConsoleGreen(mainRepoName)} to ${toConsoleGreen(options.studentifyBaseDirectory.value.getPath)}")
+            _ = {
+              val destinationPath = (options.studentifyBaseDirectory.value / mainRepoName).getPath
+              println(s"Studentifying ${toConsoleGreen(mainRepoName)} to ${toConsoleGreen(destinationPath)}")
+            }
 
             _ <- checkpreExistingAndCreateArtifactRepo(
               options.studentifyBaseDirectory.value,