bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-07-04 21:03:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve gstr.CompareVersion

Browse Source
This commit is contained in:
John
2020-05-15 23:42:17 +08:00
parent 74c65439fc
commit 750e5df962
2 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
text/gstr/gstr.go
View File

@ -687,7 +687,17 @@ func InArray(a []string, s string) bool {
}
// CompareVersion compares <a> and <b> as standard golang version.
// Golang standard version is as: 1.0.0, v1.0.1, v2.10.8, 10.2.0 etc.
// It returns 1 if <a> > <b>.
// It returns -1 if <a> < <b>.
// It returns 0 if <a> = <b>.
// Golang standard version is like:
// 1.0.0
// v1.0.1
// v2.10.8
// 10.2.0
// v0.0.0-20190626092158-b2ccc519800e
// v4.20.0+incompatible
// etc.
func CompareVersion(a, b string) int {
if a[0] == 'v' {
a = a[1:]
@ -695,6 +705,24 @@ func CompareVersion(a, b string) int {
if b[0] == 'v' {
b = b[1:]
}
if Count(a, "-") > 1 {
if i := PosR(a, "-"); i > 0 {
a = a[:i]
}
}
if Count(b, "-") > 1 {
if i := PosR(b, "-"); i > 0 {
b = b[:i]
}
}
if i := Pos(a, "+"); i > 0 {
a = a[:i]
}
if i := Pos(b, "+"); i > 0 {
b = b[:i]
}
a = Replace(a, "-", ".")
b = Replace(b, "-", ".")
array1 := strings.Split(a, ".")
array2 := strings.Split(b, ".")
for i := 0; i < len(array2)-len(array1); i++ {

13
text/gstr/gstr_z_unit_basic_test.go
View File

@ -458,3 +458,16 @@ func Test_InArray(t *testing.T) {
t.AssertEQ(gstr.InArray(a, "d"), false)
})
}
func Test_CompareVersion(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
t.AssertEQ(gstr.CompareVersion("v1.0.1", "v1.1.0"), -1)
t.AssertEQ(gstr.CompareVersion("1.0.1", "v1.1.0"), -1)
t.AssertEQ(gstr.CompareVersion("1.0.0", "v0.1.0"), 1)
t.AssertEQ(gstr.CompareVersion("1.0.0", "v1.0.0"), 0)
t.AssertEQ(gstr.CompareVersion("v0.0.0-20190626092158-b2ccc519800e", "0.0.0-20190626092158"), 0)
t.AssertEQ(gstr.CompareVersion("v0.0.0-20190626092159-b2ccc519800e", "0.0.0-20190626092158"), 1)
t.AssertEQ(gstr.CompareVersion("v4.20.0+incompatible", "4.20.0"), 0)
t.AssertEQ(gstr.CompareVersion("v4.20.0+incompatible", "4.20.1"), -1)
})
}