rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-14 11:29:26 +01:00
Code Issues Releases Activity

Merge pull request #3404 from ffissore/windows-appdata

Browse Source 
Windows: new Arduino15 location and automatic migration
This commit is contained in:
Federico Fissore 2015-06-25 11:36:55 +02:00
commit 039edca39b
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; String preferencesFile = null;
// Do a first pass over the commandline arguments, the rest of them // 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 process = Runtime.getRuntime().exec(new String[]{"chmod", Integer.toOctalString(mode), file.getAbsolutePath()}, null, null);
process.waitFor(); 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 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) { if (file != null) {
preferencesFile = file; preferencesFile = file;
} else { } 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.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.io.IOException; 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.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -54,7 +57,7 @@ public class Platform extends processing.app.Platform {
} }
private void recoverSettingsFolderPath() 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"); 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 { 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());
}
} }