Skip to content

Commit

Permalink
Libraries (un)installation name inconcistency
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
howjmay committed Oct 20, 2019
1 parent 1ceab8b commit cdcd726
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion arduino/libraries/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func makeNewLibrary(libraryDir *paths.Path, location LibraryLocation) (*Library,
library.Version = v
}

library.Name = libraryDir.Base()
library.Name = strings.ReplaceAll(libraryDir.Base(), "_", " ")
library.RealName = strings.TrimSpace(libProperties.Get("name"))
library.Author = strings.TrimSpace(libProperties.Get("author"))
library.Maintainer = strings.TrimSpace(libProperties.Get("maintainer"))
Expand Down
4 changes: 2 additions & 2 deletions legacy/builder/test/libraries_loader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func TestLoadLibrariesAVR(t *testing.T) {
require.Equal(t, "ANewLibrary-master", libs[idx].Name)

idx++
require.Equal(t, "Adafruit_PN532", libs[idx].Name)
require.Equal(t, "Adafruit PN532", libs[idx].Name)
require.True(t, Abs(t, paths.New("downloaded_libraries/Adafruit_PN532")).EquivalentTo(libs[idx].InstallDir))
require.True(t, Abs(t, paths.New("downloaded_libraries/Adafruit_PN532")).EquivalentTo(libs[idx].SourceDir))
require.Equal(t, 1, len(libs[idx].Architectures))
Expand Down Expand Up @@ -197,7 +197,7 @@ func TestLoadLibrariesSAM(t *testing.T) {
idx := 0
require.Equal(t, "ANewLibrary-master", libraries[idx].Name)
idx++
require.Equal(t, "Adafruit_PN532", libraries[idx].Name)
require.Equal(t, "Adafruit PN532", libraries[idx].Name)
idx++
require.Equal(t, "Audio", libraries[idx].Name)
idx++
Expand Down

0 comments on commit cdcd726

Please sign in to comment.