Move initialization of tools in package tools

Author: matteosuppo

hub.go

@@ -2,7 +2,9 @@ package main
 
 import (
 	"fmt"
+
 	log "github.com/Sirupsen/logrus"
+	"github.com/arduino/arduino-create-agent/tools"
 	"github.com/kardianos/osext"
 	//"os"
 	"os/exec"
@@ -191,7 +193,7 @@ func checkCmd(m []byte) {
 	} else if strings.HasPrefix(sl, "downloadtool") {
 		args := strings.Split(s, " ")
 		if len(args) > 2 {
-			go spDownloadTool(args[1], args[2])
+			go tools.Download(args[1], args[2])
 		}
 	} else if strings.HasPrefix(sl, "bufferalgorithm") {
 		go spBufferAlgorithms()

main.go

@@ -6,14 +6,18 @@ package main
 import (
 	"flag"
 	"os"
-	"os/user"
 	"path/filepath"
 	"runtime/debug"
 	"strconv"
 	"text/template"
 	"time"
 
 	log "github.com/Sirupsen/logrus"
+<<<<<<< e73846650fde9b0955aa35e237100ec552af47fb
+=======
+	"github.com/arduino/arduino-create-agent/tools"
+	"github.com/carlescere/scheduler"
+>>>>>>> Move initialization of tools in package tools
 	"github.com/gin-gonic/gin"
 	"github.com/itsjamie/gin-cors"
 	"github.com/kardianos/osext"
@@ -39,7 +43,6 @@ var (
 	appName        = flag.String("appName", "", "")
 	genCert        = flag.Bool("generateCert", false, "")
 	globalToolsMap = make(map[string]string)
-	tempToolsPath  = createToolsDir()
 	port           string
 	portSSL        string
 	origins        = flag.String("origins", "", "Allowed origin list for CORS")
@@ -60,11 +63,6 @@ func (u *logWriter) Write(p []byte) (n int, err error) {
 
 var logger_ws logWriter
 
-func createToolsDir() string {
-	usr, _ := user.Current()
-	return usr.HomeDir + "/.arduino-create"
-}
-
 func homeHandler(c *gin.Context) {
 	homeTemplate.Execute(c.Writer, c.Request.Host)
 }
@@ -92,8 +90,7 @@ func main() {
 			src, _ := osext.Executable()
 			dest := filepath.Dir(src)
 
-			os.Mkdir(tempToolsPath, 0777)
-			hideFile(tempToolsPath)
+			tools.CreateDir()
 
 			if embedded_autoextract {
 				// save the config.ini (if it exists)

seriallist_darwin.go

@@ -63,8 +63,5 @@ func associateVidPidWithPort(ports []OsSerialPort) []OsSerialPort {
 	return ports
 }
 
-func hideFile(path string) {
-}
-
 func tellCommandNotToSpawnShell(_ *exec.Cmd) {
 }

seriallist_linux.go

@@ -35,8 +35,5 @@ func associateVidPidWithPort(ports []OsSerialPort) []OsSerialPort {
 	return ports
 }
 
-func hideFile(path string) {
-}
-
 func tellCommandNotToSpawnShell(_ *exec.Cmd) {
 }

seriallist_windows.go

@@ -1,15 +1,16 @@
 package main
 
 import (
-	log "github.com/Sirupsen/logrus"
-	"github.com/mattn/go-ole"
-	"github.com/mattn/go-ole/oleutil"
 	"os"
 	"os/exec"
 	"regexp"
 	"strings"
 	"sync"
 	"syscall"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/mattn/go-ole"
+	"github.com/mattn/go-ole/oleutil"
 )
 
 var (
@@ -62,13 +63,6 @@ func getListSynchronously() {
 
 }
 
-func hideFile(path string) {
-	cpath, cpathErr := syscall.UTF16PtrFromString(path)
-	if cpathErr != nil {
-	}
-	syscall.SetFileAttributes(cpath, syscall.FILE_ATTRIBUTE_HIDDEN)
-}
-
 func getListViaWmiPnpEntity() ([]OsSerialPort, os.SyscallError) {
 
 	//log.Println("Doing getListViaWmiPnpEntity()")

tools/hidefile_darwin.go

@@ -0,0 +1,5 @@
+package tools
+
+func hideFile(path string) {
+
+}

tools/hidefile_linux.go

@@ -0,0 +1,5 @@
+package tools
+
+func hideFile(path string) {
+
+}

tools/hidefile_windows.go

@@ -0,0 +1,10 @@
+package tools
+
+import "syscall"
+
+func hideFile(path string) {
+	cpath, cpathErr := syscall.UTF16PtrFromString(path)
+	if cpathErr != nil {
+	}
+	syscall.SetFileAttributes(cpath, syscall.FILE_ATTRIBUTE_HIDDEN)
+}

tools/tools.go

@@ -0,0 +1,24 @@
+package tools
+
+import (
+	"os"
+	"os/user"
+)
+
+func dir() string {
+	usr, _ := user.Current()
+	return usr.HomeDir + "/.arduino-create"
+}
+
+// CreateDir creates the directory where the tools will be stored
+func CreateDir() {
+	directory := dir()
+	os.Mkdir(directory, 0777)
+	hideFile(directory)
+}
+
+// Download will parse the index at the indexURL for the tool to download
+func Download(name, indexURL string) {
+	if _, err := os.Stat(dir() + "/" + name); err != nil {
+	}
+}