Commit a58d5ad

authored

fix: scan libraries on install (#2037)

1 parent 1897368 commit a58d5adCopy full SHA for a58d5ad

File tree

+73

-0

lines changed

+73

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ func (lm LibrariesManager) InstallPrerequisiteCheck(name string, version semve`
`64`	`64`	`return nil, err`
`65`	`65`	`}`
`66`	`66`
	`67`	`+ lm.RescanLibraries()`
`67`	`68`	`libs := lm.FindByReference(&librariesindex.Reference{Name: name}, installLocation)`
`68`	`69`
`69`	`70`	`if len(libs) > 1 {`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,7 @@ func (lm LibrariesManager) AddPlatformReleaseLibrariesDir(plaftormRelease core`
`132`	`132`
`133`	`133`	`// RescanLibraries reload all installed libraries in the system.`
`134`	`134`	`func (lm LibrariesManager) RescanLibraries() []status.Status {`
	`135`	`+ lm.clearLibraries()`
`135`	`136`	`statuses := []*status.Status{}`
`136`	`137`	`for _, dir := range lm.LibrariesDir {`
`137`	`138`	`if errs := lm.LoadLibrariesFromDir(dir); len(errs) > 0 {`
`@@ -217,3 +218,9 @@ func (lm LibrariesManager) FindByReference(libRef librariesindex.Reference, in`
`217`	`218`	`}`
`218`	`219`	`return alternatives.FilterByVersionAndInstallLocation(libRef.Version, installLocation)`
`219`	`220`	`}`
	`221`	`+`
	`222`	`+func (lm *LibrariesManager) clearLibraries() {`
	`223`	`+ for k := range lm.Libraries {`
	`224`	`+ delete(lm.Libraries, k)`
	`225`	`+ }`
	`226`	`+}`

Lines changed: 32 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,32 @@`
	`1`	`+// This file is part of arduino-cli.`
	`2`	`+//`
	`3`	`+// Copyright 2020 ARDUINO SA (http://www.arduino.cc/)`
	`4`	`+//`
	`5`	`+// This software is released under the GNU General Public License version 3,`
	`6`	`+// which covers the main part of arduino-cli.`
	`7`	`+// The terms of this license can be found at:`
	`8`	`+// https://www.gnu.org/licenses/gpl-3.0.en.html`
	`9`	`+//`
	`10`	`+// You can be released from the requirements of the above licenses by purchasing`
	`11`	`+// a commercial license. Buying such a license is mandatory if you want to`
	`12`	`+// modify or otherwise use the software for commercial activities involving the`
	`13`	`+// Arduino software without disclosing the source code of your own applications.`
	`14`	`+// To purchase a commercial license, send an email to license@arduino.cc.`
	`15`	`+package librariesmanager`
	`16`	`+`
	`17`	`+import (`
	`18`	`+ "testing"`
	`19`	`+`
	`20`	`+ "github.com/arduino/arduino-cli/arduino/libraries"`
	`21`	`+ "github.com/arduino/go-paths-helper"`
	`22`	`+ "github.com/stretchr/testify/require"`
	`23`	`+)`
	`24`	`+`
	`25`	`+func Test_RescanLibrariesCallClear(t *testing.T) {`
	`26`	`+ baseDir := paths.New(t.TempDir())`
	`27`	`+ lm := NewLibraryManager(baseDir.Join("index_dir"), baseDir.Join("downloads_dir"))`
	`28`	`+ lm.Libraries["testLibA"] = libraries.List{}`
	`29`	`+ lm.Libraries["testLibB"] = libraries.List{}`
	`30`	`+ lm.RescanLibraries()`
	`31`	`+ require.Len(t, lm.Libraries, 0)`
	`32`	`+}`

Lines changed: 33 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -382,3 +382,36 @@ func TestDaemonBundleLibInstall(t *testing.T) {`
`382`	`382`	`}`
`383`	`383`	`}`
`384`	`384`	`}`
	`385`	`+`
	`386`	`+func TestDaemonLibrariesRescanOnInstall(t *testing.T) {`
	`387`	`+ /*`
	`388`	`+ Ensures that the libraries are rescanned prior to installing a new one,`
	`389`	`+ to avoid clashes with libraries installed after the daemon initialization.`
	`390`	`+ To perform the check:`
	`391`	`+ - the daemon is run and a gprc instance initialized`
	`392`	`+ - a library is installed through the cli`
	`393`	`+ - an attempt to install a new version of the library is done`
	`394`	`+ with the gprc instance`
	`395`	`+ The last attempt is expected to not raise an error`
	`396`	`+ */`
	`397`	`+ env, cli := createEnvForDaemon(t)`
	`398`	`+ defer env.CleanUp()`
	`399`	`+`
	`400`	`+ grpcInst := cli.Create()`
	`401`	`+ require.NoError(t, grpcInst.Init("", "", func(ir *commands.InitResponse) {`
	`402`	`+ fmt.Printf("INIT> %v\n", ir.GetMessage())`
	`403`	`+ }))`
	`404`	`+ cli.Run("lib", "install", "SD@1.2.3")`
	`405`	`+`
	`406`	`+ instCl, err := grpcInst.LibraryInstall(context.Background(), "SD", "1.2.4", false, false, true)`
	`407`	`+`
	`408`	`+ require.NoError(t, err)`
	`409`	`+ for {`
	`410`	`+ _, err := instCl.Recv()`
	`411`	`+ if err == io.EOF {`
	`412`	`+ break`
	`413`	`+ }`
	`414`	`+ require.NoError(t, err)`
	`415`	`+ }`
	`416`	`+`
	`417`	`+}`

Comments

(0)