Merge branch 'master' into readme-update

Author: me-no-dev

Diff for: README.md

@@ -11,8 +11,8 @@ Tested with the following Arduino IDE versions: 1.6.5-r2,
 ## Installation
 - Make sure you use one of the supported versions of Arduino IDE and have ESP8266 core installed.
 - Download the tool archive from [releases page](https://github.com/esp8266/arduino-esp8266fs-plugin/releases/latest).
-- In your Arduino sketchbook directory, create tools directory if it doesn't exist yet.
-- Unpack the tool into tools directory (the path will look like `<home_dir>/Arduino/tools/ESP8266FS/tool/esp8266fs.jar)`.
+- In your Arduino sketchbook directory, create `tools` directory if it doesn't exist yet. You can find the location of your sketchbook directory in the Arduino IDE at **File > Preferences > Sketchbook location**.
+- Unpack the tool into `tools` directory (the path will look like `<sketchbook directory>/tools/ESP8266FS/tool/esp8266fs.jar)`.
 - Restart Arduino IDE. 
 
 On OS X and Linux based OSs create the tools directory in ~/Documents/Arduino/ and unpack the files there

Diff for: src/ESP8266FS.java

@@ -208,6 +208,8 @@ private void createAndUpload(){
     File espota = new File(platform.getFolder()+"/tools");
     File esptool = new File(platform.getFolder()+"/tools");
     String serialPort = PreferencesData.get("serial.port");
+    String pythonCmd = PreferencesData.get("runtime.os").contentEquals("windows") ? "python3.exe" : "python3";
+    String uploadCmd = "";
 
     //make sure the serial port or IP is defined
     if (serialPort == null || serialPort.isEmpty()) {
@@ -216,6 +218,22 @@ private void createAndUpload(){
       return;
     }
 
+    // Find upload.py, don't fail if not present for backwards compat
+    File uploadPyFile = new File(platform.getFolder()+"/tools", "upload.py");
+    if (uploadPyFile.exists() && uploadPyFile.isFile()) {
+      uploadCmd = uploadPyFile.getAbsolutePath();
+    }
+    // Find python.exe if present, don't fail if not found for backwards compat
+    String[] paths = { platform.getFolder()+"/tools", platform.getFolder()+"/tools/python3", PreferencesData.get("runtime.tools.python3.path") };
+    for (String s: paths) {
+      File toolPyFile = new File(s, pythonCmd);
+      if (toolPyFile.exists() && toolPyFile.isFile() && toolPyFile.canExecute()) {
+        pythonCmd = toolPyFile.getAbsolutePath();
+        break;
+      }
+    }
+    // pythonCmd now points to either an installed exe with full path or just plain "python3(.exe)"
+
     //find espota if IP else find esptool
     if(serialPort.split("\\.").length == 4){
       isNetwork = true;
@@ -233,7 +251,7 @@ private void createAndUpload(){
         esptool = new File(platform.getFolder()+"/tools/esptool", esptoolCmd);
         if(!esptool.exists()){
           esptool = new File(PreferencesData.get("runtime.tools.esptool.path"), esptoolCmd);
-          if (!esptool.exists()) {
+          if (!esptool.exists() && uploadCmd.isEmpty()) {
               System.err.println();
               editor.statusError("SPIFFS Error: esptool not found!");
               return;
@@ -278,10 +296,10 @@ private void createAndUpload(){
     }
 
     editor.statusNotice("SPIFFS Creating Image...");
-    System.out.println("[SPIFFS] data   : "+dataPath);
-    System.out.println("[SPIFFS] size   : "+((spiEnd - spiStart)/1024));
-    System.out.println("[SPIFFS] page   : "+spiPage);
-    System.out.println("[SPIFFS] block  : "+spiBlock);
+    System.out.println("[SPIFFS] data    : "+dataPath);
+    System.out.println("[SPIFFS] size    : "+((spiEnd - spiStart)/1024));
+    System.out.println("[SPIFFS] page    : "+spiPage);
+    System.out.println("[SPIFFS] block   : "+spiBlock);
 
     try {
       if(listenOnProcess(new String[]{toolPath, "-c", dataPath, "-p", spiPage+"", "-b", spiBlock+"", "-s", (spiEnd - spiStart)+"", imagePath}) != 0){
@@ -296,25 +314,27 @@ private void createAndUpload(){
     }
 
     editor.statusNotice("SPIFFS Uploading Image...");
-    System.out.println("[SPIFFS] upload : "+imagePath);
+    System.out.println("[SPIFFS] upload  : "+imagePath);
 
     if(isNetwork){
-      String pythonCmd;
-      if(PreferencesData.get("runtime.os").contentEquals("windows"))
-          pythonCmd = "python.exe";
-      else
-          pythonCmd = "python";
-      
-      System.out.println("[SPIFFS] IP     : "+serialPort);
+      System.out.println("[SPIFFS] IP       : "+serialPort);
       System.out.println();
       sysExec(new String[]{pythonCmd, espota.getAbsolutePath(), "-i", serialPort, "-s", "-f", imagePath});
     } else {
-      System.out.println("[SPIFFS] address: "+uploadAddress);
-      System.out.println("[SPIFFS] reset  : "+resetMethod);
-      System.out.println("[SPIFFS] port   : "+serialPort);
-      System.out.println("[SPIFFS] speed  : "+uploadSpeed);
+      System.out.println("[SPIFFS] address  : "+uploadAddress);
+      System.out.println("[SPIFFS] reset    : "+resetMethod);
+      System.out.println("[SPIFFS] port     : "+serialPort);
+      System.out.println("[SPIFFS] speed    : "+uploadSpeed);
+      if (!uploadCmd.isEmpty()) {
+        System.out.println("[SPIFFS] python   : "+pythonCmd);
+        System.out.println("[SPIFFS] uploader : "+uploadCmd);
+      }
       System.out.println();
-      sysExec(new String[]{esptool.getAbsolutePath(), "-cd", resetMethod, "-cb", uploadSpeed, "-cp", serialPort, "-ca", uploadAddress, "-cf", imagePath});
+      if (!uploadCmd.isEmpty()) {
+        sysExec(new String[]{pythonCmd, uploadCmd, "--chip", "esp8266", "--port", serialPort, "--baud", uploadSpeed, "write_flash", uploadAddress, imagePath});
+      } else {
+        sysExec(new String[]{esptool.getAbsolutePath(), "-cd", resetMethod, "-cb", uploadSpeed, "-cp", serialPort, "-ca", uploadAddress, "-cf", imagePath});
+      }
     }
   }