Skip to content

copy of the SPIFFS image in project folder #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

copy of the SPIFFS image in project folder #30

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aa9d2a0
Change / to \\
Onno-Dirkzwager Feb 22, 2017
6bebb08
Add a copy of the SPIFFS in the project folder
Onno-Dirkzwager Feb 22, 2017
86bc1a2
Update ESP8266FS.java
Onno-Dirkzwager Feb 22, 2017
218ed16
Update ESP8266FS.java
Onno-Dirkzwager Feb 22, 2017
ee74245
Update ESP8266FS.java
Onno-Dirkzwager Feb 22, 2017
890366b
Update ESP8266FS.java
Onno-Dirkzwager Feb 22, 2017
8a114c8
Merge pull request #1 from Onno-Dirkzwager/test
Onno-Dirkzwager Feb 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion src/ESP8266FS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
import java.io.InputStreamReader;
import java.io.IOException;

import java.nio.file.Files;
import java.nio.file.StandardCopyOption;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.lang.reflect.Field;
Expand Down Expand Up @@ -260,7 +263,7 @@ private void createAndUpload(){
String dataPath = dataFolder.getAbsolutePath();
String toolPath = tool.getAbsolutePath();
String sketchName = editor.getSketch().getName();
String imagePath = getBuildFolderPath(editor.getSketch()) + "/" + sketchName + ".spiffs.bin";
String imagePath = getBuildFolderPath(editor.getSketch()) + "\\" + sketchName + ".spiffs.bin";
String resetMethod = BaseNoGui.getBoardPreferences().get("upload.resetmethod");
String uploadSpeed = BaseNoGui.getBoardPreferences().get("upload.speed");
String uploadAddress = BaseNoGui.getBoardPreferences().get("build.spiffs_start");
Expand Down Expand Up @@ -294,6 +297,21 @@ private void createAndUpload(){
editor.statusError("SPIFFS Create Failed!");
return;
}

title = "SPIFFS Copy";
message = "Would you like a copy of the SPIFFS image in your project folder?";

if(JOptionPane.showOptionDialog(editor, message, title, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[0]) == JOptionPane.YES_OPTION){
File source = new File(imagePath);
File dest = new File(editor.getSketch().getFolder(),"\\" + sketchName + ".spiffs.bin");
try {
Files.copy(source.toPath(), dest.toPath(), StandardCopyOption.REPLACE_EXISTING);
System.out.println("Copied SPIFFS image");
} catch (IOException e) {
System.out.println(e);
editor.statusError("Copy SPIFFS image failed");
}
}

editor.statusNotice("SPIFFS Uploading Image...");
System.out.println("[SPIFFS] upload : "+imagePath);
Expand Down