Files weren't deleted from temp unsaved sketch folder. Fixes #4233

Federico Fissore · Federico Fissore · commit e224698ecf43 · 2015-11-30T10:17:29.000+01:00
diff --git a/app/src/processing/app/Sketch.java b/app/src/processing/app/Sketch.java
@@ -463,7 +463,7 @@ public void handleDeleteCode() throws IOException {
 
       } else {
         // delete the file
-        if (!current.getCode().deleteFile(BaseNoGui.getBuildFolder(data))) {
+        if (!current.getCode().deleteFile(BaseNoGui.getBuildFolder(data).toPath(), Paths.get(System.getProperty("java.io.tmpdir"), "arduino_" + DigestUtils.md5Hex(getMainFilePath())))) {
           Base.showMessage(tr("Couldn't do it"),
                            I18n.format(tr("Could not delete \"{0}\"."), current.getCode().getFileName()));
           return;
diff --git a/arduino-core/src/processing/app/SketchCode.java b/arduino-core/src/processing/app/SketchCode.java
@@ -91,12 +91,12 @@ protected boolean fileReadOnly() {
   }
 
 
-  protected boolean deleteFile(File tempBuildFolder) throws IOException {
+  protected boolean deleteFile(Path tempBuildFolder, Path tempUnsavedSketchPath) throws IOException {
     if (!file.delete()) {
       return false;
     }
 
-    List<Path> tempBuildFolders = Stream.of(tempBuildFolder.toPath(), Paths.get(tempBuildFolder.getAbsolutePath(), "sketch"))
+    List<Path> tempBuildFolders = Stream.of(tempBuildFolder, tempBuildFolder.resolve("sketch"), tempUnsavedSketchPath)
       .filter(path -> Files.exists(path))
       .collect(Collectors.toList());
 

Original file line number	Diff line number	Diff line change
`@@ -91,12 +91,12 @@ protected boolean fileReadOnly() {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`
`94`		`- protected boolean deleteFile(File tempBuildFolder) throws IOException {`
	`94`	`+ protected boolean deleteFile(Path tempBuildFolder, Path tempUnsavedSketchPath) throws IOException {`
`95`	`95`	`if (!file.delete()) {`
`96`	`96`	`return false;`
`97`	`97`	`}`
`98`	`98`
`99`		`- List<Path> tempBuildFolders = Stream.of(tempBuildFolder.toPath(), Paths.get(tempBuildFolder.getAbsolutePath(), "sketch"))`
	`99`	`+ List<Path> tempBuildFolders = Stream.of(tempBuildFolder, tempBuildFolder.resolve("sketch"), tempUnsavedSketchPath)`
`100`	`100`	`.filter(path -> Files.exists(path))`
`101`	`101`	`.collect(Collectors.toList());`
`102`	`102`