Merge branch 'master' of https://github.com/TMC-C/tmc-langs

Author: Tubaias

tmc-langs-csharp/src/main/java/fi/helsinki/cs/tmc/langs/csharp/CSharpPlugin.java

@@ -22,6 +22,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 
+import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -57,6 +58,10 @@ public class CSharpPlugin extends AbstractLanguagePlugin {
     private static final String CANNOT_SCAN_PROJECT_TYPE_MESSAGE = 
             "Failed to scan project files.";
     private static final String COMPILATION_FAILED_MESSAGE = "Failed to compile excercise.";
+    private static final String CANNOT_CLEANUP =
+            "Failed to run cleanup task.";
+    private static final String CANNOT_CLEANUP_DIR =
+            "Failed to run cleanup task on a directory.";
 
     private static Logger log = LoggerFactory.getLogger(CSharpPlugin.class);
 
@@ -154,6 +159,24 @@ public Map<File, List<ValidationError>> getValidationErrors() {
 
     @Override
     public void clean(Path path) {
+        try {
+            Files.walk(path).filter(Files::isDirectory).forEach(dir -> {
+                Path fileName = dir.getFileName();
+
+                if (!fileName.equals(Paths.get("bin"))
+                        && !fileName.equals(Paths.get("obj"))) {
+                    return;
+                }
+
+                try {
+                    FileUtils.deleteDirectory(dir.toFile());
+                } catch (IOException e) {
+                    log.error(CANNOT_CLEANUP_DIR, e);
+                }
+            });
+        } catch (IOException e) {
+            log.error(CANNOT_CLEANUP, e);
+        }
     }
 
     private void deleteOldResults(Path path) {
@@ -178,13 +201,9 @@ private String getBootstrapPath() {
             return envVarPath;
         }
 
-        try {
-            Scanner in = new Scanner(new FileReader("tmc-langs-csharp/bootstrapPath.txt"));
-            return in.nextLine();
-        } catch (Exception e) {
-            log.error(CANNOT_LOCATE_RUNNER_MESSAGE, e);
-            return null;
-        }
+        log.error(CANNOT_LOCATE_RUNNER_MESSAGE);
+
+        return null;
     }
 
     private boolean doesProjectContainCSharpFiles(Path path) {

tmc-langs-csharp/src/main/java/fi/helsinki/cs/tmc/langs/csharp/CSharpStudentFilePolicy.java

@@ -13,7 +13,23 @@ public CSharpStudentFilePolicy(Path configFileParent) {
 
     @Override
     public boolean isStudentSourceFile(Path path, Path projectRootPath) {
+        if (this.isChildOfBinaryDir(path)) {
+            return false;
+        }
+
         return path.startsWith(Paths.get("src"));
     }
-    
+
+    private boolean isChildOfBinaryDir(Path path) {
+        for (Path testPath : path) {
+            Path fileName = testPath.getFileName();
+
+            if (fileName.equals(Paths.get("bin"))
+                    || fileName.equals(Paths.get("obj"))) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }