rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-20 14:54:31 +01:00
Code Issues Releases Activity

Windows: migrating from AppData\Roaming\Arduino15 to AppData\Local\Arduino15.

Browse Source 
Migration occurs when NO preferences file location is provided (CLI only), when new location does not exist and when there is something to migrate. Fixes #2902
This commit is contained in:
Federico Fissore 2015-06-23 15:58:11 +02:00
parent 62e5e0186f
commit ea55a2edc3
4 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arduino-core/src/processing/app/BaseNoGui.java
View File

@ -962,7 +962,7 @@ public class BaseNoGui {
}
}
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

4
arduino-core/src/processing/app/Platform.java
View File

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

5
arduino-core/src/processing/app/PreferencesData.java
View File

@ -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 {

24
arduino-core/src/processing/app/windows/Platform.java
View File

@ -35,6 +35,9 @@ import processing.app.legacy.PConstants;
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 class Platform extends processing.app.Platform {
}
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 class Platform extends processing.app.Platform {
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());
}
}