Fix deletion policy

Author: nygrenh

build-tools/pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fi.helsinki.cs.tmc</groupId>
     <artifactId>build-tools</artifactId>
-    <version>0.7.4-SNAPSHOT</version>
+    <version>0.7.5-SNAPSHOT</version>
     <name>build-tools</name>
 
     <!-- Deploy to maven.testmycode.net/nexus -->

pom.xml

@@ -3,7 +3,7 @@
 
     <groupId>fi.helsinki.cs.tmc</groupId>
     <artifactId>tmc-langs</artifactId>
-    <version>0.7.4-SNAPSHOT</version>
+    <version>0.7.5-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>tmc-langs</name>
     <url>http://testmycode.net</url>

tmc-langs-cli/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>tmc-langs</artifactId>
         <groupId>fi.helsinki.cs.tmc</groupId>
-        <version>0.7.4-SNAPSHOT</version>
+        <version>0.7.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

tmc-langs-framework/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.4-SNAPSHOT</version>
+        <version>0.7.5-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <properties>

tmc-langs-framework/src/main/java/fi/helsinki/cs/tmc/langs/io/ConfigurableStudentFilePolicy.java

@@ -102,6 +102,6 @@ private void loadExtraStudentFileList() {
 
     @Override
     public boolean mayDelete(Path file, Path projectRoot) {
-        return false;
+        return !isStudentFile(file, projectRoot);
     }
 }

tmc-langs-framework/src/main/java/fi/helsinki/cs/tmc/langs/io/zip/StudentFileAwareUnzipper.java

@@ -22,7 +22,6 @@
 import java.nio.file.Path;
 import java.util.Enumeration;
 import java.util.Set;
-import java.util.zip.ZipEntry;
 
 public final class StudentFileAwareUnzipper implements Unzipper {
 
@@ -121,23 +120,23 @@ public UnzipResult unzip(Path zip, Path target) throws IOException {
         }
 
         log.debug("Done unzipping");
-        deleteFilesNotInZip(target, target, result, pathsInZip);
+        deleteFilesNotInZip(target, result, pathsInZip);
         return null;
     }
 
     // TODO: validate
     private void deleteFilesNotInZip(
-            Path projectDir, Path curDir, UnzipResult result, Set<Path> pathsInZip)
+            Path projectDir, UnzipResult result, Set<Path> pathsInZip)
             throws IOException {
 
-        for (File file : curDir.toFile().listFiles()) {
+        for (File file : projectDir.toFile().listFiles()) {
             Path filePath = file.toPath();
             if (file.isDirectory()) {
-                deleteFilesNotInZip(projectDir, file.toPath(), result, pathsInZip);
+                deleteFilesNotInZip(file.toPath(), result, pathsInZip);
             }
 
             if (!pathsInZip.contains(filePath)) {
-                if (mayDelete(filePath, null)) {
+                if (mayDelete(filePath, projectDir)) {
                     if (file.isDirectory() && file.listFiles().length > 0) {
                         // Won't delete directories if they still have contents
                         result.skippedDeletingFiles.add(filePath);

tmc-langs-framework/src/test/java/fi/helsinki/cs/tmc/langs/io/zip/StudentFileAwareUnzipperTest.java

@@ -134,7 +134,7 @@ public void testDeletion() throws Exception {
         Path bad = TestUtils.getPath(StudentFileAwareUnzipperTest.class, "zip")
                 .resolve("bad-test-class-name.zip");
         Path fixed = TestUtils.getPath(StudentFileAwareUnzipperTest.class, "zip")
-            .resolve("fixed-test-class-name.zip");
+                .resolve("fixed-test-class-name.zip");
 
         unzipper.unzip(bad, tmpDir);
 

tmc-langs-java/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.4-SNAPSHOT</version>
+        <version>0.7.5-SNAPSHOT</version>
     </parent>
 
     <properties>

tmc-langs-make/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.4-SNAPSHOT</version>
+        <version>0.7.5-SNAPSHOT</version>
     </parent>
 
     <properties>

tmc-langs-notests/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>fi.helsinki.cs.tmc</groupId>
         <artifactId>tmc-langs</artifactId>
-        <version>0.7.4-SNAPSHOT</version>
+        <version>0.7.5-SNAPSHOT</version>
     </parent>
 
     <properties>