Implement tools.List

Author: matteosuppo

Gopkg.lock

@@ -27,7 +27,7 @@
 required = ["goa.design/goa/codegen/generator"]
 
 [[constraint]]
-  name = "github.com/Sirupsen/logrus"
+  name = "github.com/sirupsen/logrus"
   version = "1.2.0"
 
 [[constraint]]

Gopkg.toml

@@ -1,7 +1,7 @@
 package main
 
 import (
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 )
 
 type BufferflowDefault struct {

bufferflow_default.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 )
 
 type BufferflowTimed struct {

bufferflow_timed.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 )
 
 type BufferflowTimedRaw struct {

bufferflow_timedraw.go

@@ -24,8 +24,8 @@ import (
 	"text/template"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"
+	log "github.com/sirupsen/logrus"
 )
 
 var (

certificates.go

@@ -18,11 +18,11 @@ import (
 	"os"
 	"path/filepath"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/arduino/arduino-create-agent/upload"
 	"github.com/arduino/arduino-create-agent/utilities"
 	"github.com/gin-gonic/gin"
 	socketio "github.com/googollee/go-socket.io"
+	log "github.com/sirupsen/logrus"
 )
 
 type connection struct {

conn.go

@@ -33,8 +33,8 @@ import (
 	"strings"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/oleksandr/bonjour"
+	log "github.com/sirupsen/logrus"
 )
 
 const timeoutConst = 2

discovery.go

@@ -12,9 +12,9 @@ import (
 	"strconv"
 	"strings"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/arduino/arduino-create-agent/upload"
 	"github.com/kardianos/osext"
+	log "github.com/sirupsen/logrus"
 )
 
 type hub struct {

hub.go

@@ -15,14 +15,14 @@ import (
 	"text/template"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/arduino/arduino-create-agent/tools"
 	"github.com/arduino/arduino-create-agent/utilities"
 	"github.com/arduino/arduino-create-agent/v2"
 	"github.com/gin-gonic/gin"
 	"github.com/go-ini/ini"
 	cors "github.com/itsjamie/gin-cors"
 	"github.com/kardianos/osext"
+	log "github.com/sirupsen/logrus"
 	//"github.com/sanbornm/go-selfupdate/selfupdate" #included in update.go to change heavily
 )
 

main.go

@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"strings"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"go.bug.st/serial.v1/enumerator"
 )
 

seriallist.go

@@ -8,7 +8,7 @@ import (
 	"time"
 	"unicode/utf8"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	serial "go.bug.st/serial.v1"
 )
 

serialport.go

@@ -35,11 +35,11 @@ import (
 	"path/filepath"
 	"runtime"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/arduino/arduino-create-agent/icon"
 	"github.com/facchinm/systray"
 	"github.com/go-ini/ini"
 	"github.com/kardianos/osext"
+	log "github.com/sirupsen/logrus"
 	"github.com/skratchdot/open-golang/open"
 	"go.bug.st/serial.v1"
 )

trayicon.go

@@ -14,9 +14,9 @@ import (
 	"runtime"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
-	"gopkg.in/inconshreveable/go-update.v0"
 	"github.com/kr/binarydist"
+	log "github.com/sirupsen/logrus"
+	"gopkg.in/inconshreveable/go-update.v0"
 
 	"github.com/kardianos/osext"
 )

updater/updater.go

@@ -5,9 +5,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/arduino/arduino-create-agent/upload"
 	homedir "github.com/mitchellh/go-homedir"
+	"github.com/sirupsen/logrus"
 )
 
 type mockTools struct{}

upload/upload_test.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/Sirupsen/logrus"
 	toolssvr "github.com/arduino/arduino-create-agent/gen/http/tools/server"
 	toolssvc "github.com/arduino/arduino-create-agent/gen/tools"
 	"github.com/arduino/arduino-create-agent/v2/tools"
+	"github.com/sirupsen/logrus"
 	goahttp "goa.design/goa/http"
 	"goa.design/goa/http/middleware"
 )
@@ -17,10 +17,13 @@ func Server() http.Handler {
 
 	// Instantiate logger
 	logger := logrus.New()
+	logger.SetLevel(logrus.DebugLevel)
 	logAdapter := LogAdapter{Logger: logger}
 
 	// Mount tools
-	toolsSvc := tools.Tools{}
+	toolsSvc := tools.Tools{
+		Log: logger,
+	}
 	toolsEndpoints := toolssvc.NewEndpoints(&toolsSvc)
 
 	toolsServer := toolssvr.New(toolsEndpoints, mux, goahttp.RequestDecoder, goahttp.ResponseEncoder, errorHandler(logger))

v2/http.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 )
 
 type LogAdapter struct {

v2/log.go

@@ -2,13 +2,54 @@ package tools
 
 import (
 	"context"
+	"io/ioutil"
+	"os/user"
+	"path/filepath"
 
 	"github.com/arduino/arduino-create-agent/gen/tools"
+	"github.com/sirupsen/logrus"
 )
 
 type Tools struct {
+	Log *logrus.Logger
 }
 
 func (c *Tools) List(ctx context.Context) (tools.ToolCollection, error) {
-	return tools.ToolCollection{}, nil
+	res := tools.ToolCollection{}
+
+	// Find packagers
+	usr, _ := user.Current()
+	path := filepath.Join(usr.HomeDir, ".arduino-create")
+	packagers, err := ioutil.ReadDir(path)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, packager := range packagers {
+		if !packager.IsDir() {
+			continue
+		}
+		// Find tools
+		toolss, err := ioutil.ReadDir(filepath.Join(path, packager.Name()))
+		if err != nil {
+			return nil, err
+		}
+		for _, tool := range toolss {
+			// Find versions
+			versions, err := ioutil.ReadDir(filepath.Join(path, packager.Name(), tool.Name()))
+			if err != nil {
+				return nil, err
+			}
+
+			for _, version := range versions {
+				res = append(res, &tools.Tool{
+					Packager: packager.Name(),
+					Name:     tool.Name(),
+					Version:  version.Name(),
+				})
+			}
+		}
+	}
+
+	return res, nil
 }