Only apply folder rename if the original colder contains proper file name

Author: facchinm

Diff for: app/src/processing/app/Editor.java

@@ -1753,6 +1753,7 @@ protected boolean handleOpenInternal(File sketchFile) {
 
       } else {
         String properParent = fileName.substring(0, fileName.length() - 4);
+        File properFolder;
 
         Object[] options = {tr("OK"), tr("Cancel")};
         String prompt = I18n.format(tr("The file \"{0}\" needs to be inside\n" +
@@ -1761,40 +1762,51 @@ protected boolean handleOpenInternal(File sketchFile) {
           fileName,
           properParent);
 
-        int result = JOptionPane.showOptionDialog(this, prompt, tr("Moving"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[0]);
+        properFolder = new File(sketchFile.getParent(), properParent);
 
-        if (result != JOptionPane.YES_OPTION) {
-          return false;
-        }
+        int result;
+        if (parentFolderContainsSketchName(sketchFile, properParent)) {
 
-        // create properly named folder
-        File properFolder;
-        if (onlyContainsSketchFiles(sketchFile.getParent())) {
-          // Move the whole folder, so properFolder needs to be created one level above
+          // properFolder needs to be created one level above
           properFolder = new File(new File(sketchFile.getParent()).getParent(), properParent);
+
+          // ask for different confirmation
+          prompt = I18n.format(tr("The file \"{0}\" needs to be inside\n" +
+              "a sketch folder named \"{1}\".\n" +
+              "Renaming folder \"{2}\" into \"{3}\"\n" +
+              "Continue?"),
+            fileName,
+            properParent,
+            sketchFile.getParent(),
+            properFolder);
+
+          result = JOptionPane.showOptionDialog(this, prompt, tr("Moving"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[0]);
         } else {
-          properFolder = new File(sketchFile.getParent(), properParent);
+          result = JOptionPane.showOptionDialog(this, prompt, tr("Moving"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[0]);
+        }
+
+        if (result != JOptionPane.YES_OPTION) {
+          return false;
         }
 
         if (properFolder.exists()) {
           Base.showWarning(tr("Error"), I18n.format(tr("A folder named \"{0}\" already exists. " +
             "Can't open sketch."), properParent), null);
           return false;
         }
-        if (!properFolder.mkdirs()) {
-          //throw new IOException("Couldn't create sketch folder");
-          Base.showWarning(tr("Error"), tr("Could not create the sketch folder."), null);
-          return false;
-        }
+
         // copy the sketch inside
         File properPdeFile = new File(properFolder, sketchFile.getName());
         try {
-          if (onlyContainsSketchFiles(sketchFile.getParent())) {
+          if (parentFolderContainsSketchName(sketchFile, properParent)) {
             File dir = new File(sketchFile.getParent());
-            FileUtils.copy(dir, properFolder);
-            // remove the original folder, so user doesn't get confused
-            FileUtils.recursiveDelete(dir);
+            dir.renameTo(properFolder);
           } else {
+            if (!properFolder.mkdirs()) {
+              //throw new IOException("Couldn't create sketch folder");
+              Base.showWarning(tr("Error"), tr("Could not create the sketch folder."), null);
+              return false;
+            }
             Base.copyFile(sketchFile, properPdeFile);
             // remove the original file, so user doesn't get confused
             sketchFile.delete();
@@ -1826,38 +1838,10 @@ protected boolean handleOpenInternal(File sketchFile) {
     return true;
   }
 
-  private boolean allowedExtension(String fileName, String[] validExtensions) {
-    int i = fileName.lastIndexOf('.');
-    if (i > 0) {
-        String ext = fileName.substring(i+1).toLowerCase();
-        if (!Arrays.asList(validExtensions).contains(ext)) {
-          return false;
-        }
-    }
-    // no extension or valid extension
-    return true;
-  }
-
-  private boolean onlyContainsSketchFiles(String path) {
-    File folder = new File(path);
-    File[] listOfFiles = folder.listFiles();
-
-    for (int i = 0; i < listOfFiles.length; i++) {
-      String name = listOfFiles[i].getName();
-      if (listOfFiles[i].isFile()) {
-        // allowed files extensions are only .ino, .h, .hpp, .c, .cpp (all cases)
-        String[] valid = {"ino", "h", "hpp" , "c" , "cpp", "pde"};
-        if (!allowedExtension(name, valid)) {
-          return false;
-        }
-      } else if (listOfFiles[i].isDirectory()) {
-        // allowed dir names are only src and extras , plus source control folders
-        if (name != "src" && name != "extras" && !FileUtils.SOURCE_CONTROL_FOLDERS.contains(name)) {
-          return false;
-        }
-      }
-    }
-    return true;
+  private boolean parentFolderContainsSketchName(File sketchFile, String sketchName) {
+    String dir = sketchFile.getParent().toLowerCase();
+    System.out.println(dir + " " + sketchName);
+    return dir.contains(sketchName.toLowerCase());
   }
 
   public void updateTitle() {