Merge pull request #3404 from ffissore/windows-appdata

Windows: new Arduino15 location and automatic migration

Author: ffissore

arduino-core/src/processing/app/BaseNoGui.java

@@ -962,7 +962,7 @@ static public void populateImportToLibraryTable() {
     }
   }
 
-  static public void initParameters(String args[]) {
+  static public void initParameters(String args[]) throws IOException {
     String preferencesFile = null;
 
     // Do a first pass over the commandline arguments, the rest of them

arduino-core/src/processing/app/Platform.java

@@ -245,4 +245,8 @@ public void chmod(File file, int mode) throws IOException, InterruptedException
     Process process = Runtime.getRuntime().exec(new String[]{"chmod", Integer.toOctalString(mode), file.getAbsolutePath()}, null, null);
     process.waitFor();
   }
+
+  public void fixSettingsLocation() throws IOException {
+    //noop
+  }
 }

arduino-core/src/processing/app/PreferencesData.java

@@ -31,7 +31,10 @@ public class PreferencesData {
   static boolean doSave = true;
 
 
-  static public void init(File file) {
+  static public void init(File file) throws IOException {
+    if (file == null) {
+      BaseNoGui.getPlatform().fixSettingsLocation();
+    }
     if (file != null) {
       preferencesFile = file;
     } else {

arduino-core/src/processing/app/windows/Platform.java

@@ -35,6 +35,9 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -54,7 +57,7 @@ public void init() throws IOException {
   }
 
   private void recoverSettingsFolderPath() throws IOException {
-    String path = Advapi32Util.registryGetStringValue(WinReg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", "AppData");
+    String path = Advapi32Util.registryGetStringValue(WinReg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", "Local AppData");
     this.settingsFolder = new File(path, "Arduino15");
   }
 
@@ -220,4 +223,23 @@ public void link(File something, File somewhere) throws IOException, Interrupted
 
   public void chmod(File file, int mode) throws IOException, InterruptedException {
   }
+
+  @Override
+  public void fixSettingsLocation() throws IOException {
+    String path = Advapi32Util.registryGetStringValue(WinReg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", "AppData");
+    Path previousSettingsFolder = Paths.get(path, "Arduino15");
+    if (!Files.exists(previousSettingsFolder)) {
+      return;
+    }
+
+    if (!Files.exists(previousSettingsFolder.resolve(Paths.get("preferences.txt")))) {
+      return;
+    }
+
+    if (settingsFolder.exists()) {
+      return;
+    }
+
+    Files.move(previousSettingsFolder, settingsFolder.toPath());
+  }
 }