2626import java .io .File ;
2727import java .io .BufferedReader ;
2828import java .io .InputStreamReader ;
29+ import java .io .IOException ;
2930
3031import java .text .SimpleDateFormat ;
3132import java .util .Date ;
32-
33+ import java .lang .reflect .Field ;
34+ import java .lang .reflect .InvocationTargetException ;
3335import javax .swing .JOptionPane ;
3436
3537import processing .app .PreferencesData ;
3840import processing .app .BaseNoGui ;
3941import processing .app .Platform ;
4042import processing .app .Sketch ;
43+ import processing .app .SketchData ;
4144import processing .app .tools .Tool ;
4245import processing .app .helpers .ProcessUtils ;
4346import processing .app .debug .TargetPlatform ;
4447
48+ import org .apache .commons .codec .digest .DigestUtils ;
49+ import processing .app .helpers .FileUtils ;
50+
51+ import cc .arduino .files .DeleteFilesOnShutdown ;
4552
4653/**
4754 * Example Tools menu entry.
@@ -99,6 +106,36 @@ public void run() {
99106thread .start ();
100107 }
101108
109+ private String getBuildFolderPath (Sketch s ) {
110+ try {
111+ File buildFolder =FileUtils .createTempFolder ("build" ,DigestUtils .md5Hex (s .getMainFilePath ()) +".spiffs" );
112+ DeleteFilesOnShutdown .add (buildFolder );
113+ return buildFolder .getAbsolutePath ();
114+ }
115+ catch (IOException e ) {
116+ editor .statusError (e );
117+ }
118+ catch (NoSuchMethodError e ) {
119+ // Arduino 1.6.5 doesn't have FileUtils.createTempFolder
120+ // String buildPath = BaseNoGui.getBuildFolder().getAbsolutePath();
121+ java .lang .reflect .Method method ;
122+ try {
123+ method =BaseNoGui .class .getMethod ("getBuildFolder" );
124+ File f = (File )method .invoke (null );
125+ return f .getAbsolutePath ();
126+ }catch (SecurityException ex ) {
127+ editor .statusError (ex );
128+ }catch (IllegalAccessException ex ) {
129+ editor .statusError (ex );
130+ }catch (InvocationTargetException ex ) {
131+ editor .statusError (ex );
132+ }catch (NoSuchMethodException ex ) {
133+ editor .statusError (ex );
134+ }
135+ }
136+ return "" ;
137+ }
138+
102139
103140private long getIntPref (String name ){
104141String data =BaseNoGui .getBoardPreferences ().get (name );
@@ -150,7 +187,7 @@ private void createAndUpload(){
150187mkspiffsCmd ="mkspiffs.exe" ;
151188else
152189mkspiffsCmd ="mkspiffs" ;
153-
190+
154191File tool =new File (platform .getFolder () +"/tools" ,mkspiffsCmd );
155192if (!tool .exists ()) {
156193tool =new File (PreferencesData .get ("runtime.tools.mkspiffs.path" ),mkspiffsCmd );
@@ -162,7 +199,10 @@ private void createAndUpload(){
162199 }
163200
164201int fileCount =0 ;
165- File dataFolder =editor .getSketch ().prepareDataFolder ();
202+ File dataFolder =new File (editor .getSketch ().getFolder (),"data" );
203+ if (!dataFolder .exists ()) {
204+ dataFolder .mkdirs ();
205+ }
166206if (dataFolder .exists () &&dataFolder .isDirectory ()){
167207File []files =dataFolder .listFiles ();
168208if (files .length >0 ){
@@ -176,8 +216,7 @@ private void createAndUpload(){
176216String toolPath =tool .getAbsolutePath ();
177217String esptoolPath =esptool .getAbsolutePath ();
178218String sketchName =editor .getSketch ().getName ();
179- String buildPath =BaseNoGui .getBuildFolder ().getAbsolutePath ();
180- String imagePath =buildPath +"/" +sketchName +".spiffs.bin" ;
219+ String imagePath =getBuildFolderPath (editor .getSketch ()) +"/" +sketchName +".spiffs.bin" ;
181220String serialPort =PreferencesData .get ("serial.port" );
182221String resetMethod =BaseNoGui .getBoardPreferences ().get ("upload.resetmethod" );
183222String uploadSpeed =BaseNoGui .getBoardPreferences ().get ("upload.speed" );