fix lib search output

Author: Rocketct

cli/lib/search.go

@@ -19,7 +19,9 @@ package lib
 
 import (
 	"context"
+	"fmt"
 	"os"
+	"sort"
 
 	"strings"
 
@@ -29,6 +31,7 @@ import (
 	"github.com/arduino/arduino-cli/rpc"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	semver "go.bug.st/relaxed-semver"
 )
 
 func initSearchCommand() *cobra.Command {
@@ -51,15 +54,56 @@ var searchFlags struct {
 func runSearchCommand(cmd *cobra.Command, args []string) {
 	instance := cli.CreateInstance()
 	logrus.Info("Executing `arduino lib search`")
-	arguments := strings.ToLower(strings.Join(args, " "))
-	_, err := lib.LibrarySearch(context.Background(), &rpc.LibrarySearchReq{
+	//arguments :=
+	searchResp, err := lib.LibrarySearch(context.Background(), &rpc.LibrarySearchReq{
 		Instance: instance,
 		Names:    searchFlags.names,
-		Query:    arguments,
+		Query:    (strings.Join(args, " ")),
 	})
 	if err != nil {
 		formatter.PrintError(err, "Error saerching for Library")
 		os.Exit(cli.ErrGeneric)
 	}
+
+	results := searchResp.GetSearchOutput()
+	if cli.OutputJSONOrElse(results) {
+		if len(results) > 0 {
+			for _, out := range results {
+				fmt.Println(SearchOutputToString(out, searchFlags.names))
+			}
+		} else {
+			formatter.Print("No libraries matching your search.")
+		}
+	}
 	logrus.Info("Done")
 }
+
+func SearchOutputToString(lsr *rpc.SearchLibraryOutput, names bool) string {
+	ret := ""
+
+	ret += fmt.Sprintf("Name: \"%s\"\n", lsr.Name)
+	if !names {
+		ret += fmt.Sprintln("  Author: ", lsr.GetLatest().Author) +
+			fmt.Sprintln("  Maintainer: ", lsr.GetLatest().Maintainer) +
+			fmt.Sprintln("  Sentence: ", lsr.GetLatest().Sentence) +
+			fmt.Sprintln("  Paragraph: ", lsr.GetLatest().Paragraph) +
+			fmt.Sprintln("  Website: ", lsr.GetLatest().Website) +
+			fmt.Sprintln("  Category: ", lsr.GetLatest().Category) +
+			fmt.Sprintln("  Architecture: ", strings.Join(lsr.GetLatest().Architectures, ", ")) +
+			fmt.Sprintln("  Types: ", strings.Join(lsr.GetLatest().Types, ", ")) +
+			fmt.Sprintln("  Versions: ", strings.Replace(fmt.Sprint(Versions(lsr.GetLatest(), lsr)), " ", ", ", -1))
+	}
+	return strings.TrimSpace(ret)
+}
+
+func Versions(l *rpc.LibraryRelease, library *rpc.SearchLibraryOutput) []*semver.Version {
+	res := []*semver.Version{}
+	for str, _ := range library.Releases {
+		v, err := semver.Parse(str)
+		if err == nil {
+			res = append(res, v)
+		}
+	}
+	sort.Sort(semver.List(res))
+	return res
+}

commands/lib/search.go

@@ -19,50 +19,75 @@ package lib
 
 import (
 	"context"
-	"fmt"
+	"errors"
 	"strings"
 
+	"github.com/arduino/arduino-cli/arduino/libraries/librariesindex"
 	"github.com/arduino/arduino-cli/commands"
-	"github.com/arduino/arduino-cli/common/formatter"
 	"github.com/arduino/arduino-cli/rpc"
 )
 
 func LibrarySearch(ctx context.Context, req *rpc.LibrarySearchReq) (*rpc.LibrarySearchResp, error) {
 
 	lm := commands.GetLibraryManager(req)
+	if lm == nil {
+		return nil, errors.New("invalid instance")
+	}
 
 	res := []*rpc.SearchLibraryOutput{}
-	release, index string
 
 	for _, lib := range lm.Index.Libraries {
-		if strings.Contains(strings.ToLower(lib.Name), req.GetQuery()) {
-			for rel := range lib.Releases {
-				release += rel;
+		if strings.Contains(strings.ToLower(lib.Name), strings.ToLower(req.GetQuery())) {
+			releases := map[string]*rpc.LibraryRelease{}
+			for str, rel := range lib.Releases {
+				releases[str] = GetLibraryParameters(rel)
 			}
+			latest := GetLibraryParameters(lib.Latest)
 
-			for idx := range &lib.Libraries {
-				index = 
-			}
-			res = append(res, &rpc.SearchLibraryOutput{
+			searchedlib := &rpc.SearchLibraryOutput{
 				Name:     lib.Name,
-				Releases: release,
-				Latest:   lib.Latest.String(),
-				Index:    index,
-			})
+				Releases: releases,
+				Latest:   latest,
+			}
+			res = append(res, searchedlib)
 		}
 	}
 
 	if req.GetNames() {
-		for _, lib := range res.Libraries {
-			formatter.Print(lib.Name)
+		restmp := []*rpc.SearchLibraryOutput{}
+		for _, lib := range res {
+			searchedlib := &rpc.SearchLibraryOutput{
+				Name: lib.Name,
+			}
+			restmp = append(restmp, searchedlib)
 		}
+		res = restmp
 	} else {
-		if len(res.Libraries) == 0 {
-			formatter.Print(fmt.Sprintf("No library found matching `%s` search query", req.GetQuery()))
-		} else {
-			formatter.Print(res)
+		if len(res) == 0 {
+			return &rpc.LibrarySearchResp{}, nil
 		}
 	}
 
-	return &rpc.LibrarySearchResp{}, nil
+	return &rpc.LibrarySearchResp{SearchOutput: res}, nil
+}
+func GetLibraryParameters(rel *librariesindex.Release) *rpc.LibraryRelease {
+
+	return &rpc.LibraryRelease{
+		Author:        rel.Author,
+		Version:       rel.Version.String(),
+		Maintainer:    rel.Maintainer,
+		Sentence:      rel.Sentence,
+		Paragraph:     rel.Paragraph,
+		Website:       rel.Website,
+		Category:      rel.Category,
+		Architectures: rel.Architectures,
+		Types:         rel.Types,
+		Resources: &rpc.DownloadResource{
+			Url:             rel.Resource.URL,
+			Archivefilename: rel.Resource.ArchiveFileName,
+			Checksum:        rel.Resource.Checksum,
+			Size:            rel.Resource.Size,
+			Cachepath:       rel.Resource.CachePath,
+		},
+	}
 }

daemon/client/client.go

@@ -23,6 +23,7 @@ import (
 	"io"
 	"os"
 
+	"github.com/arduino/arduino-cli/common/formatter"
 	"github.com/arduino/arduino-cli/rpc"
 	"google.golang.org/grpc"
 )
@@ -381,6 +382,20 @@ func main() {
 		}
 	}
 
+	// LIB SEARCH
+	fmt.Println("=== calling LibrarySearch(audio)")
+	outputsrc, err := client.LibrarySearch(context.Background(), &rpc.LibrarySearchReq{
+		Instance: instance,
+		Names:    true,
+		Query:    "audio",
+	})
+	if err != nil {
+		formatter.PrintError(err, "Error saerching for Library")
+		os.Exit(1)
+	}
+
+	fmt.Println(outputsrc)
+
 	// LIB UNINSTALL
 	fmt.Println("=== calling LibraryUninstall(WiFi101)")
 	libUninstallRespStream, err := client.LibraryUninstall(context.Background(), &rpc.LibraryUninstallReq{