FileUtils.copy now filters out source control folders. Also, dir is checked for existence before creating it. Fixes #4034

Federico Fissore · Federico Fissore · commit 67e32ff8faf8 · 2015-11-02T12:29:12.000+01:00
diff --git a/arduino-core/src/processing/app/helpers/FileUtils.java b/arduino-core/src/processing/app/helpers/FileUtils.java
@@ -58,12 +58,12 @@ public static void copyFile(File source, File dest) throws IOException {
   public static void copy(File sourceFolder, File destFolder) throws IOException {
     for (File file : sourceFolder.listFiles()) {
       File destFile = new File(destFolder, file.getName());
-      if (file.isDirectory()) {
-        if (!destFile.mkdir()) {
+      if (file.isDirectory() && !SOURCE_CONTROL_FOLDERS.contains(file.getName())) {
+        if (!destFile.exists() && !destFile.mkdir()) {
           throw new IOException("Unable to create folder: " + destFile);
         }
         copy(file, destFile);
-      } else {
+      } else if (!file.isDirectory()) {
         copyFile(file, destFile);
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -58,12 +58,12 @@ public static void copyFile(File source, File dest) throws IOException {`
`58`	`58`	`public static void copy(File sourceFolder, File destFolder) throws IOException {`
`59`	`59`	`for (File file : sourceFolder.listFiles()) {`
`60`	`60`	`File destFile = new File(destFolder, file.getName());`
`61`		`- if (file.isDirectory()) {`
`62`		`- if (!destFile.mkdir()) {`
	`61`	`+ if (file.isDirectory() && !SOURCE_CONTROL_FOLDERS.contains(file.getName())) {`
	`62`	`+ if (!destFile.exists() && !destFile.mkdir()) {`
`63`	`63`	`throw new IOException("Unable to create folder: " + destFile);`
`64`	`64`	`}`
`65`	`65`	`copy(file, destFile);`
`66`		`- } else {`
	`66`	`+ } else if (!file.isDirectory()) {`
`67`	`67`	`copyFile(file, destFile);`
`68`	`68`	`}`
`69`	`69`	`}`