Browse Source

re-added base code directory validation to submission set builder

Jan Wittler 4 years ago
parent
commit
ccd24cf7d7
1 changed files with 9 additions and 0 deletions
  1. 9 0
      core/src/main/java/de/jplag/SubmissionSetBuilder.java

+ 9 - 0
core/src/main/java/de/jplag/SubmissionSetBuilder.java

@@ -17,6 +17,7 @@ import java.util.function.Function;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
+import de.jplag.exceptions.BasecodeException;
 import de.jplag.exceptions.ExitException;
 import de.jplag.exceptions.ExitException;
 import de.jplag.exceptions.RootDirectoryException;
 import de.jplag.exceptions.RootDirectoryException;
 import de.jplag.exceptions.SubmissionException;
 import de.jplag.exceptions.SubmissionException;
@@ -133,6 +134,14 @@ public class SubmissionSetBuilder {
         }
         }
 
 
         File baseCodeSubmissionDirectory = options.baseCodeSubmissionDirectory();
         File baseCodeSubmissionDirectory = options.baseCodeSubmissionDirectory();
+        if (!baseCodeSubmissionDirectory.exists()) {
+            throw new BasecodeException("Basecode directory \"{}\" does not exist".formatted(baseCodeSubmissionDirectory));
+        }
+        String errorMessage = isExcludedEntry(baseCodeSubmissionDirectory);
+        if (errorMessage != null) {
+            throw new BasecodeException(errorMessage); // Stating an excluded path as basecode isn't very useful.
+        }
+
         Submission baseCodeSubmission = processSubmission(baseCodeSubmissionDirectory.getName(), baseCodeSubmissionDirectory, false);
         Submission baseCodeSubmission = processSubmission(baseCodeSubmissionDirectory.getName(), baseCodeSubmissionDirectory, false);
 
 
         if (baseCodeSubmission != null) {
         if (baseCodeSubmission != null) {