Skip to content

Commit 07c646b

Browse files
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 07c646b

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

arduino/libraries/loader.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func makeNewLibrary(libraryDir *paths.Path, location LibraryLocation) (*Library,
9696
library.Version = v
9797
}
9898

99-
library.Name = libraryDir.Base()
99+
library.Name = strings.ReplaceAll(libraryDir.Base(), "_", " ")
100100
library.RealName = strings.TrimSpace(libProperties.Get("name"))
101101
library.Author = strings.TrimSpace(libProperties.Get("author"))
102102
library.Maintainer = strings.TrimSpace(libProperties.Get("maintainer"))

legacy/builder/test/libraries_loader_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func TestLoadLibrariesAVR(t *testing.T) {
8989
require.Equal(t, "ANewLibrary-master", libs[idx].Name)
9090

9191
idx++
92-
require.Equal(t, "Adafruit_PN532", libs[idx].Name)
92+
require.Equal(t, "Adafruit PN532", libs[idx].Name)
9393
require.True(t, Abs(t, paths.New("downloaded_libraries/Adafruit_PN532")).EquivalentTo(libs[idx].InstallDir))
9494
require.True(t, Abs(t, paths.New("downloaded_libraries/Adafruit_PN532")).EquivalentTo(libs[idx].SourceDir))
9595
require.Equal(t, 1, len(libs[idx].Architectures))
@@ -128,7 +128,7 @@ func TestLoadLibrariesAVR(t *testing.T) {
128128
idx++
129129
require.Equal(t, "IRremote", libs[idx].Name)
130130
idx++
131-
require.Equal(t, "Robot_IR_Remote", libs[idx].Name)
131+
require.Equal(t, "Robot IR Remote", libs[idx].Name)
132132
idx++
133133
require.Equal(t, "SPI", libs[idx].Name)
134134
idx++
@@ -154,7 +154,7 @@ func TestLoadLibrariesAVR(t *testing.T) {
154154

155155
libs = ctx.LibrariesResolver.AlternativesFor("Adafruit_PN532.h")
156156
require.Len(t, libs, 1)
157-
require.Equal(t, "Adafruit_PN532", libs[0].Name)
157+
require.Equal(t, "Adafruit PN532", libs[0].Name)
158158

159159
libs = ctx.LibrariesResolver.AlternativesFor("IRremote.h")
160160
require.Len(t, libs, 1)
@@ -197,7 +197,7 @@ func TestLoadLibrariesSAM(t *testing.T) {
197197
idx := 0
198198
require.Equal(t, "ANewLibrary-master", libraries[idx].Name)
199199
idx++
200-
require.Equal(t, "Adafruit_PN532", libraries[idx].Name)
200+
require.Equal(t, "Adafruit PN532", libraries[idx].Name)
201201
idx++
202202
require.Equal(t, "Audio", libraries[idx].Name)
203203
idx++
@@ -217,7 +217,7 @@ func TestLoadLibrariesSAM(t *testing.T) {
217217
idx++
218218
require.Equal(t, "IRremote", libraries[idx].Name)
219219
idx++
220-
require.Equal(t, "Robot_IR_Remote", libraries[idx].Name)
220+
require.Equal(t, "Robot IR Remote", libraries[idx].Name)
221221
idx++
222222
require.Equal(t, "SPI", libraries[idx].Name)
223223
idx++

0 commit comments

Comments
 (0)