Skip to content
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.

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

feat: 支持搜索的版本号排序能力 #1

Merged
merged 3 commits into from
Mar 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cmd/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ func (c *Cli) initiate() {
Aliases: []string{"L"},
GroupID: GroupID,
Short: "Shows installed versions for an app.",
Long: "Example: vm l go.",
Long: "Example: vm L go.",
Run: func(cmd *cobra.Command, args []string) {
if len(args) == 0 {
cmd.Help()
Expand Down
4 changes: 4 additions & 0 deletions pkgs/installer/search.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

"github.com/gvcgo/goutils/pkgs/gtea/gprint"
"github.com/gvcgo/goutils/pkgs/gtea/gtable"
"github.com/gvcgo/version-manager/pkgs/utils"
"github.com/gvcgo/version-manager/pkgs/versions"
)

Expand Down Expand Up @@ -42,6 +43,9 @@ func (s *Searcher) Search(appName string) {
return
}

// Sort versions.
utils.SortVersions(vl)

columns := []gtable.Column{
{Title: fmt.Sprintf("%v available versions", appName), Width: 150},
}
Expand Down
55 changes: 55 additions & 0 deletions pkgs/utils/sort.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
package utils

import (
"errors"
"sort"
"strconv"
"strings"
)

// Version represents a version number.
type Version struct {
Major, Minor, Patch int
}

// ParseVersion parses a version string into a Version struct.
func ParseVersion(version string) (Version, error) {
parts := strings.Split(version, ".")
if len(parts) != 3 {
return Version{}, errors.New("invalid version format")
}
major, err := strconv.Atoi(parts[0])
if err != nil {
return Version{}, err
}
minor, err := strconv.Atoi(parts[1])
if err != nil {
return Version{}, err
}
patch, err := strconv.Atoi(parts[2])
if err != nil {
return Version{}, err
}
return Version{Major: major, Minor: minor, Patch: patch}, nil
}

// SortVersions sorts a slice of version strings in descending order.
func SortVersions(versions []string) {
sort.Slice(versions, func(i, j int) bool {
v1, err := ParseVersion(versions[i])
if err != nil {
return false
}
v2, err := ParseVersion(versions[j])
if err != nil {
return false
}
if v1.Major != v2.Major {
return v1.Major > v2.Major
}
if v1.Minor != v2.Minor {
return v1.Minor > v2.Minor
}
return v1.Patch > v2.Patch
})
}
5 changes: 2 additions & 3 deletions scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ main() {
local os_arch="$(uname -m)"
local version="v0.1.1"
local download_url="https://gvc.1710717.xyz/proxy/https://github.com/gvcgo/version-manager/releases/download/"

local osType="linux"
if [ "$os_type" = "Darwin" ]; then
osType="darwin"
Expand All @@ -68,8 +67,8 @@ main() {

curl -o "$filename" "$url"

ehco "Installing..."
echo "Installing..."

if [ -s "./$filename" ]; then
unzip "./$filename"
chmod +x "./vm"
Expand Down