Merge pull request #31 from MrLYC/fix-downloader

fix download search
MrLYC · Sep 11, 2024 · 94873c5 · 94873c5
2 parents a688705 + 0f23545
commit 94873c5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -4,7 +4,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.19.x]
+        go-version: [1.22.x]
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,13 +16,13 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19.x
+          go-version: 1.22.x
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
         with:
           # either 'goreleaser' (default) or 'goreleaser-pro'
           distribution: goreleaser
           version: latest
-          args: release --rm-dist --timeout 2h
+          args: release --timeout 2h
         env:
           GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
@@ -4,7 +4,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.19.x]
+        go-version: [1.22.x]
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/core/manager/download.go b/core/manager/download.go
@@ -26,7 +26,8 @@ func (m *DownloadManager) SetReplacements(replacements utils.Replacements) {
 
 func (m *DownloadManager) search(name, output string) (string, error) {
 	files := utils.NewSortedHeap(1)
-	nameLength := float64(len(name))
+	nameLower := strings.ToLower(name)
+	nameLength := float64(len(nameLower))
 
 	err := filepath.Walk(output, func(path string, info fs.FileInfo, err error) error {
 		if err != nil {
@@ -39,11 +40,11 @@ func (m *DownloadManager) search(name, output string) (string, error) {
 
 		score := 0.0
 		if info.Mode()&0111 != 0 {
-			score = 0.1 / nameLength // perfer to choose executable file
+			score = 0.1 / nameLength // prefer to choose executable file
 		}
 
 		file := filepath.Base(path)
-		if strings.Contains(file, name) {
+		if strings.Contains(strings.ToLower(file), nameLower) {
 			score += nameLength / float64(len(file))
 		}
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/mrlyc/cmdr
 
-go 1.19
+go 1.22
 
 require (
 	github.com/ahmetb/go-linq/v3 v3.2.0