Commit 07c646b

committed

Libraries (un)installation name inconcistency

Now, the "_" is replaced with a blanket " ", to reslove the inconsistency problem. However, use the name of the installing library may be a better solution.

1 parent 1ceab8b commit 07c646bCopy full SHA for 07c646b

File tree

2 files changed

-6

lines changed

arduino/libraries
- loader.go
legacy/builder/test
- libraries_loader_test.go

2 files changed

-6

lines changed

`‎arduino/libraries/loader.go‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ func makeNewLibrary(libraryDir paths.Path, location LibraryLocation) (Library,`
`96`	`96`	`library.Version = v`
`97`	`97`	`}`
`98`	`98`
`99`		`- library.Name = libraryDir.Base()`
	`99`	`+ library.Name = strings.ReplaceAll(libraryDir.Base(), "_", " ")`
`100`	`100`	`library.RealName = strings.TrimSpace(libProperties.Get("name"))`
`101`	`101`	`library.Author = strings.TrimSpace(libProperties.Get("author"))`
`102`	`102`	`library.Maintainer = strings.TrimSpace(libProperties.Get("maintainer"))`

`‎legacy/builder/test/libraries_loader_test.go‎`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ func TestLoadLibrariesAVR(t *testing.T) {`
`89`	`89`	`require.Equal(t, "ANewLibrary-master", libs[idx].Name)`
`90`	`90`
`91`	`91`	`idx++`
`92`		`- require.Equal(t, "Adafruit_PN532", libs[idx].Name)`
	`92`	`+ require.Equal(t, "Adafruit PN532", libs[idx].Name)`
`93`	`93`	`require.True(t, Abs(t, paths.New("downloaded_libraries/Adafruit_PN532")).EquivalentTo(libs[idx].InstallDir))`
`94`	`94`	`require.True(t, Abs(t, paths.New("downloaded_libraries/Adafruit_PN532")).EquivalentTo(libs[idx].SourceDir))`
`95`	`95`	`require.Equal(t, 1, len(libs[idx].Architectures))`
`@@ -128,7 +128,7 @@ func TestLoadLibrariesAVR(t *testing.T) {`
`128`	`128`	`idx++`
`129`	`129`	`require.Equal(t, "IRremote", libs[idx].Name)`
`130`	`130`	`idx++`
`131`		`- require.Equal(t, "Robot_IR_Remote", libs[idx].Name)`
	`131`	`+ require.Equal(t, "Robot IR Remote", libs[idx].Name)`
`132`	`132`	`idx++`
`133`	`133`	`require.Equal(t, "SPI", libs[idx].Name)`
`134`	`134`	`idx++`
`@@ -154,7 +154,7 @@ func TestLoadLibrariesAVR(t *testing.T) {`
`154`	`154`
`155`	`155`	`libs = ctx.LibrariesResolver.AlternativesFor("Adafruit_PN532.h")`
`156`	`156`	`require.Len(t, libs, 1)`
`157`		`- require.Equal(t, "Adafruit_PN532", libs[0].Name)`
	`157`	`+ require.Equal(t, "Adafruit PN532", libs[0].Name)`
`158`	`158`
`159`	`159`	`libs = ctx.LibrariesResolver.AlternativesFor("IRremote.h")`
`160`	`160`	`require.Len(t, libs, 1)`
`@@ -197,7 +197,7 @@ func TestLoadLibrariesSAM(t *testing.T) {`
`197`	`197`	`idx := 0`
`198`	`198`	`require.Equal(t, "ANewLibrary-master", libraries[idx].Name)`
`199`	`199`	`idx++`
`200`		`- require.Equal(t, "Adafruit_PN532", libraries[idx].Name)`
	`200`	`+ require.Equal(t, "Adafruit PN532", libraries[idx].Name)`
`201`	`201`	`idx++`
`202`	`202`	`require.Equal(t, "Audio", libraries[idx].Name)`
`203`	`203`	`idx++`
`@@ -217,7 +217,7 @@ func TestLoadLibrariesSAM(t *testing.T) {`
`217`	`217`	`idx++`
`218`	`218`	`require.Equal(t, "IRremote", libraries[idx].Name)`
`219`	`219`	`idx++`
`220`		`- require.Equal(t, "Robot_IR_Remote", libraries[idx].Name)`
	`220`	`+ require.Equal(t, "Robot IR Remote", libraries[idx].Name)`
`221`	`221`	`idx++`
`222`	`222`	`require.Equal(t, "SPI", libraries[idx].Name)`
`223`	`223`	`idx++`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 07c646b

File tree

2 files changed

2 files changed

`‎arduino/libraries/loader.go‎`

`‎legacy/builder/test/libraries_loader_test.go‎`

0 commit comments