Merge branch 'master' into feedback-jclc

Author: jclc

src/main/java/fi/helsinki/cs/tmc/cli/command/DownloadExercisesCommand.java

@@ -29,7 +29,7 @@ public void getOptions(Options options) {
         options.addOption("a", "all", false,
                 "Download all available exercises, including previously completed");
 
-        // Not implemented in tmc-core yet
+        // Download old submissions. Not implemented in tmc-core yet
         //options.addOption("c", "completed", false, "Download previously completed exercises");
     }
 
@@ -68,7 +68,13 @@ public void run(CommandLine args, Io io) {
         TmcCliProgressObserver progobs = new TmcCliProgressObserver(io, color1, color2);
 
         List<Exercise> exercises = TmcUtil.downloadExercises(core, filtered, progobs);
-        io.println(exercises.toString());
+        if (exercises.isEmpty()) {
+            io.println("Failed to download exercises");
+            return;
+        } else if (exercises.size() != filtered.size()) {
+            io.println(Color.colorString("Some exercises could not be downloaded",
+                    Color.AnsiColor.ANSI_RED));
+        }
 
         Path configFile = app.getWorkDir().getWorkingDirectory()
                 .resolve(stringArgs[0])
@@ -85,7 +91,9 @@ protected List<Exercise> getFilteredExercises(Course course, CommandLine args) {
 
         List<Exercise> filtered = new ArrayList<>();
         for (Exercise exercise : course.getExercises()) {
-            if (!exercise.isCompleted()) {
+            // Teachers may get a list of locked exercises but core still refuses to
+            // download them. Filter locked exercises out.
+            if (!exercise.isCompleted() && !exercise.isLocked()) {
                 filtered.add(exercise);
             }
         }

src/main/java/fi/helsinki/cs/tmc/cli/command/SubmitCommand.java

@@ -165,15 +165,15 @@ protected void updateCourseJson(TmcCore core, List<Exercise> submittedExercises,
 
         Course updatedCourse = TmcUtil.findCourse(core, courseInfo.getCourseName());
         if (updatedCourse == null) {
-            io.println("Failed to update .tmc.json file for course " + courseInfo.getCourseName());
+            io.println("Failed to update config file for course " + courseInfo.getCourseName());
             return;
         }
 
         for (Exercise submitted : submittedExercises) {
             Exercise updatedEx = TmcUtil.findExercise(updatedCourse, submitted.getName());
             if (updatedEx == null) {
                 // Does this reaaally ever happen?
-                io.println("Failed to update .tmc.json file for exercise " + submitted.getName()
+                io.println("Failed to update config file for exercise " + submitted.getName()
                         + ". The exercise doesn't exist in server anymore.");
                 continue;
             }

src/main/java/fi/helsinki/cs/tmc/cli/command/UpdateCommand.java

@@ -76,15 +76,20 @@ public void updateExercises(TmcCore core, CourseInfo info, Path configFile) {
         }
 
         if (!exerciseUpdater.updateCourseJson(info, configFile)) {
-            io.println("Failed to update course info");
+            io.println("Failed to update course config file");
         }
     }
 
     private void printExercises(List<Exercise> exercises, String message) {
         if (!exercises.isEmpty()) {
             io.println(message);
             for (Exercise exercise : exercises) {
-                io.println(" " + exercise.getName());
+                if (exercise.isCompleted()) {
+                    // already released and completed on another computer/folder
+                    io.println(" " + exercise.getName() + " (already completed)");
+                } else {
+                    io.println(" " + exercise.getName());
+                }
             }
         }
     }

src/main/java/fi/helsinki/cs/tmc/cli/tmcstuff/ExerciseUpdater.java

@@ -11,6 +11,7 @@
 
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 public class ExerciseUpdater {
@@ -88,7 +89,14 @@ public boolean updatesAvailable() {
     }
 
     public List<Exercise> downloadUpdates(TmcCliProgressObserver progobs) {
-        return TmcUtil.downloadExercises(core, getNewAndUpdatedExercises(), progobs);
+        List<Exercise> newAndUpdated = getNewAndUpdatedExercises();
+        for (Iterator<Exercise> iterator = newAndUpdated.iterator(); iterator.hasNext();) {
+            Exercise next = iterator.next();
+            if (next.isCompleted()) {
+                iterator.remove();
+            }
+        }
+        return TmcUtil.downloadExercises(core, newAndUpdated, progobs);
     }
 
     public boolean updateCourseJson(CourseInfo info, Path configFile) {

src/test/java/fi/helsinki/cs/tmc/cli/command/DownloadExercisesCommandTest.java

@@ -29,6 +29,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -138,7 +139,9 @@ public List<Exercise> call() throws Exception {
 
         String[] args = {"download", "course1"};
         app.run(args);
-        assertTrue(testIo.out().contains("exerciseName"));
+
+        File courseJson = tempDir.resolve("course1").resolve(".tmc.json").toFile();
+        assertTrue(courseJson.exists());
     }
 
     @Test