diff --git a/src/bpm/go.mod b/src/bpm/go.mod index 0f5bb34..3745cfb 100644 --- a/src/bpm/go.mod +++ b/src/bpm/go.mod @@ -6,6 +6,7 @@ toolchain go1.23.7 require ( git.enumerated.dev/bubble-package-manager/bpm/src/bpmlib v0.5.0 + github.com/adrg/strutil v0.3.1 github.com/spf13/pflag v1.0.10 ) diff --git a/src/bpm/go.sum b/src/bpm/go.sum index abb56e5..54ebdea 100644 --- a/src/bpm/go.sum +++ b/src/bpm/go.sum @@ -1,12 +1,27 @@ +github.com/adrg/strutil v0.3.1 h1:OLvSS7CSJO8lBii4YmBt8jiK9QOtB9CzCzwl4Ic/Fz4= +github.com/adrg/strutil v0.3.1/go.mod h1:8h90y18QLrs11IBffcGX3NW/GFBXCMcNg4M7H6MspPA= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/drone/envsubst v1.0.3 h1:PCIBwNDYjs50AsLZPYdfhSATKaRg/FJmDc2D6+C2x8g= github.com/drone/envsubst v1.0.3/go.mod h1:N2jZmlMufstn1KEqvbHjw40h1KyTmnVzHcSc9bFiJ2g= github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/knqyf263/go-rpm-version v0.0.0-20240918084003-2afd7dc6a38f h1:xt29M2T6STgldg+WEP51gGePQCsQvklmP2eIhPIBK3g= github.com/knqyf263/go-rpm-version v0.0.0-20240918084003-2afd7dc6a38f/go.mod h1:i4sF0l1fFnY1aiw08QQSwVAFxHEm311Me3WsU/X7nL0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/src/bpm/main.go b/src/bpm/main.go index 09787ff..af40a99 100644 --- a/src/bpm/main.go +++ b/src/bpm/main.go @@ -5,15 +5,19 @@ import ( "errors" "fmt" "log" + "maps" "os" "os/exec" "path" "path/filepath" "slices" + "sort" "strings" "git.enumerated.dev/bubble-package-manager/bpm/src/bpmlib" + "github.com/adrg/strutil" + "github.com/adrg/strutil/metrics" flag "github.com/spf13/pflag" ) @@ -294,28 +298,42 @@ func searchForPackages() { } for i, term := range searchTerms { - nameResults := make([]*bpmlib.PackageInfo, 0) - descResults := make([]*bpmlib.PackageInfo, 0) + resultsMap := make(map[*bpmlib.PackageInfo]float64, 0) + + // Loop through all packages for _, db := range bpmlib.BPMDatabases { for _, entry := range db.Entries { - if strings.Contains(entry.Info.Name, term) { - nameResults = append(nameResults, entry.Info) - } else if strings.Contains(entry.Info.Description, term) { - descResults = append(descResults, entry.Info) + // Calculate string similarity and add to map + similarity := strutil.Similarity(entry.Info.Name, term, metrics.NewSmithWatermanGotoh()) + if similarity > 0.8 { + resultsMap[entry.Info] = similarity + continue + } + similarity = strutil.Similarity(entry.Info.Description, term, metrics.NewSmithWatermanGotoh()) + if similarity > 0.8 { + resultsMap[entry.Info] = similarity } } } - results := append(nameResults, descResults...) - if len(results) == 0 { + if len(resultsMap) == 0 { log.Printf("Error: no results for term (%s) were found\n", term) exitCode = 1 return } + + // Sort results + results := slices.Collect(maps.Keys(resultsMap)) + sort.Slice(results, func(i, j int) bool { + return resultsMap[results[i]] > resultsMap[results[j]] + }) + + // Print results if i > 0 { fmt.Println() } fmt.Printf("Results for term (%s)\n", term) - for j, result := range results { + for j := 0; j < 10 && j < len(results); j++ { + result := results[j] fmt.Printf("%d) %s: %s (%s)\n", j+1, result.Name, result.Description, result.GetFullVersion()) } }