Added programfromurl command

Former-commit-id: 96dd1f336cbf0d3d430408b29da8015d162df072 [formerly 6e32f6a743e63c0edd103068279019bdad9aa683]
Former-commit-id: 2e5904cb3efae1712374372e654566297fdf0fe7

Author: johnlauer

download.go

@@ -0,0 +1,61 @@
+// download.go
+package main
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"strings"
+)
+
+func downloadFromUrl(url string) (filename string, err error) {
+
+	// clean up url
+	// remove newlines and space at end
+	url = strings.TrimSpace(url)
+
+	// create tmp dir
+	tmpdir, err := ioutil.TempDir("", "serial-port-json-server")
+	if err != nil {
+		return "", errors.New("Could not create temp directory to store downloaded file. Do you have permissions?")
+	}
+	tokens := strings.Split(url, "/")
+	filePrefix := tokens[len(tokens)-1]
+	fmt.Println("The filePrefix is", filePrefix)
+	tmpfile, err := ioutil.TempFile(tmpdir, filePrefix)
+	if err != nil {
+		fmt.Println("Error creating tempfile. ", err)
+		return "", errors.New(err.Error() + " Could not create temp file to store downloaded file. Do you have permissions? Are you out of storage space?")
+	}
+
+	fileName := tmpfile.Name()
+	fmt.Println("Downloading", url, "to", fileName)
+
+	// TODO: check file existence first with io.IsExist
+	output, err := os.Create(fileName)
+	if err != nil {
+		fmt.Println("Error while creating", fileName, "-", err)
+		return fileName, err
+	}
+	defer output.Close()
+
+	response, err := http.Get(url)
+	if err != nil {
+		fmt.Println("Error while downloading", url, "-", err)
+		return fileName, err
+	}
+	defer response.Body.Close()
+
+	n, err := io.Copy(output, response.Body)
+	if err != nil {
+		fmt.Println("Error while downloading", url, "-", err)
+		return fileName, err
+	}
+
+	fmt.Println(n, "bytes downloaded.")
+
+	return fileName, nil
+}

hub.go

@@ -53,7 +53,7 @@ func (h *hub) run() {
 			h.connections[c] = true
 			// send supported commands
 			c.send <- []byte("{\"Version\" : \"" + version + "\"} ")
-			c.send <- []byte("{\"Commands\" : [\"list\", \"open [portName] [baud] [bufferAlgorithm (optional)]\", \"send [portName] [cmd]\", \"sendnobuf [portName] [cmd]\", \"close [portName]\", \"bufferalgorithms\", \"baudrates\", \"restart\", \"exit\", \"program [portName] [board:name] [$path/to/filename/without/extension]\"]} ")
+			c.send <- []byte("{\"Commands\" : [\"list\", \"open [portName] [baud] [bufferAlgorithm (optional)]\", \"send [portName] [cmd]\", \"sendnobuf [portName] [cmd]\", \"close [portName]\", \"bufferalgorithms\", \"baudrates\", \"restart\", \"exit\", \"program [portName] [board:name] [$path/to/filename/without/extension]\", \"programfromurl [portName] [board:name] [urlToHexFile]\"]} ")
 			c.send <- []byte("{\"Hostname\" : \"" + *hostname + "\"} ")
 		case c := <-h.unregister:
 			delete(h.connections, c)
@@ -169,14 +169,23 @@ func checkCmd(m []byte) {
 			go spErr("You did not specify a port to close")
 		}
 
+	} else if strings.HasPrefix(sl, "programfromurl") {
+
+		args := strings.Split(s, " ")
+		if len(args) == 4 {
+			go spProgramFromUrl(args[1], args[2], args[3])
+		} else {
+			go spErr("You did not specify a port, a board to program and/or a URL")
+		}
+
 	} else if strings.HasPrefix(sl, "program") {
 
 		args := strings.Split(s, " ")
 		if len(args) > 3 {
 			var slice []string = args[3:len(args)]
 			go spProgram(args[1], args[2], strings.Join(slice, " "))
 		} else {
-			go spErr("You did not specify a port, a board to program and a filename")
+			go spErr("You did not specify a port, a board to program and/or a filename")
 		}
 
 	} else if strings.HasPrefix(sl, "sendjson") {

serial.go

@@ -540,6 +540,16 @@ func spClose(portname string) {
 	}
 }
 
+// Download the file from URL first, store in tmp folder, then pass to spProgram
+func spProgramFromUrl(portname string, boardname string, url string) {
+	filename, err := downloadFromUrl(url)
+	if err != nil {
+		spErr(err.Error())
+	} else {
+		spProgram(portname, boardname, filename)
+	}
+}
+
 func spProgram(portname string, boardname string, filePath string) {
 
 	isFound, flasher, mycmd := assembleCompilerCommand(boardname, portname, filePath)