Skip to content

Improved lib detection: check for matching name in library.properties #1276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 4, 2021
Merged

Improved lib detection: check for matching name in library.properties #1276

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f2b07b
Improved lib detection: check for matching name in library.properties
cmaglie May 4, 2021
efef8b9
Added test for lib resolve improvement
cmaglie May 4, 2021
6f4b992
Lib discovery: always prefer libraries with the correct directory name
cmaglie May 4, 2021
1826478
[skip changelog] Add integration test
silvanocerza May 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions arduino/libraries/librariesresolver/cpp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ func computePriority(lib *libraries.Library, header, arch string) int {
header = strings.TrimSuffix(header, filepath.Ext(header))
header = simplify(header)
name := simplify(lib.Name)
realName := simplify(lib.RealName)

priority := 0

Expand All @@ -137,15 +138,17 @@ func computePriority(lib *libraries.Library, header, arch string) int {
priority += 0
}

if name == header {
if realName == header && name == header {
priority += 600
} else if realName == header || name == header {
priority += 500
} else if name == header+"-master" {
} else if realName == header+"-master" || name == header+"-master" {
priority += 400
} else if strings.HasPrefix(name, header) {
} else if strings.HasPrefix(realName, header) || strings.HasPrefix(name, header) {
priority += 300
} else if strings.HasSuffix(name, header) {
} else if strings.HasSuffix(realName, header) || strings.HasSuffix(name, header) {
priority += 200
} else if strings.Contains(name, header) {
} else if strings.Contains(realName, header) || strings.Contains(name, header) {
priority += 100
}

Expand Down
15 changes: 15 additions & 0 deletions arduino/libraries/librariesresolver/cpp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,3 +143,18 @@ func TestCppHeaderResolver(t *testing.T) {
require.Equal(t, "Calculus Unified Lib", resolve("calculus_lib.h", l6, l7))
require.Equal(t, "Calculus Unified Lib", resolve("calculus_lib.h", l7, l6))
}

func TestCppHeaderResolverWithLibrariesInStrangeDirectoryNames(t *testing.T) {
resolver := NewCppResolver()
librarylist := libraries.List{}
librarylist.Add(&libraries.Library{Name: "onewire_2_3_4", RealName: "OneWire", Architectures: []string{"*"}})
librarylist.Add(&libraries.Library{Name: "onewireng_2_3_4", RealName: "OneWireNg", Architectures: []string{"avr"}})
resolver.headers["OneWire.h"] = librarylist
require.Equal(t, "onewire_2_3_4", resolver.ResolveFor("OneWire.h", "avr").Name)

librarylist2 := libraries.List{}
librarylist2.Add(&libraries.Library{Name: "OneWire", RealName: "OneWire", Architectures: []string{"*"}})
librarylist2.Add(&libraries.Library{Name: "onewire_2_3_4", RealName: "OneWire", Architectures: []string{"avr"}})
resolver.headers["OneWire.h"] = librarylist2
require.Equal(t, "OneWire", resolver.ResolveFor("OneWire.h", "avr").Name)
}