From 4cdc184cef1494318359782b7d1a39f50414d82f Mon Sep 17 00:00:00 2001 From: 15128022404 <1421485150@qq.com> Date: Wed, 29 Mar 2023 00:20:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E9=9B=86open=20jdk=20=E5=AE=98?= =?UTF-8?q?=E7=BD=91=E4=B8=8B=E8=BD=BD=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 3 + go.sum | 35 +++++++ internal/pkg/collector/collector_test.go | 112 +++++++++++++++++++++++ 3 files changed, 150 insertions(+) create mode 100644 internal/pkg/collector/collector_test.go diff --git a/go.mod b/go.mod index 208a203..f2c8281 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ go 1.20 require ( github.com/Masterminds/semver v1.5.0 + github.com/PuerkitoBio/goquery v1.8.1 github.com/fatih/color v1.15.0 github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213 github.com/schollz/progressbar/v3 v3.13.1 @@ -12,6 +13,7 @@ require ( ) require ( + github.com/andybalholm/cascadia v1.3.1 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.17 // indirect @@ -21,6 +23,7 @@ require ( github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/stretchr/testify v1.8.0 // indirect github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect + golang.org/x/net v0.7.0 // indirect golang.org/x/sys v0.6.0 // indirect golang.org/x/term v0.6.0 // indirect ) diff --git a/go.sum b/go.sum index 6e7b0c6..b11bbff 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,9 @@ github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/PuerkitoBio/goquery v1.8.1 h1:uQxhNlArOIdbrH1tr0UXwdVFgDcZDrZVdcpygAcwmWM= +github.com/PuerkitoBio/goquery v1.8.1/go.mod h1:Q8ICL1kNUJ2sXGoAhPGUdYDJvgQgHzJsnnd3H7Ho5jQ= +github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c= +github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -39,11 +43,42 @@ github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofm github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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= diff --git a/internal/pkg/collector/collector_test.go b/internal/pkg/collector/collector_test.go new file mode 100644 index 0000000..59bd276 --- /dev/null +++ b/internal/pkg/collector/collector_test.go @@ -0,0 +1,112 @@ +package collector + +import ( + "fmt" + "net/http" + "strings" + "testing" + + "github.com/PuerkitoBio/goquery" +) + +type Collector struct { + version string + Windows_X64 *Op_Item + Linux_X64 *Op_Item + Linux_AArch64 *Op_Item + Mac_X64 *Op_Item + Mac_AArch64 *Op_Item +} + +type Op_Item struct { + FileType string + Arch string + Url string + Sha256Url string + FileName string +} + +var Collectors []*Collector + +func Test_getGoVersion(t *testing.T) { + Collectors = make([]*Collector, 0) + resp, _ := http.Get("https://jdk.java.net/archive/") + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + fmt.Println("false") + } + c, _ := goquery.NewDocumentFromReader(resp.Body) + t.Run("", func(t *testing.T) { + s := c.Find(".builds").Find("tbody").Children() + /* s.Each(func(j int, tr *goquery.Selection) { + th := tr.Find("th") + if th.Length() == 1 { + val := th.Text() + if val != "Source" { + s2 := strings.Split(val, "(build ") + fmt.Println(strings.Trim(strings.Trim(s2[0], " "), " GA")) + } + } + }) */ + var collector_Item *Collector + //flag := false + s.Each(func(j int, tr *goquery.Selection) { + th := tr.Find("th") + if th.Length() == 1 { + val := th.Text() + if val != "Source" { + s2 := strings.Split(val, "(build ") + version_str := strings.Trim(strings.Trim(s2[0], " "), " GA") + fmt.Println("\n" + version_str) + collector_Item = &Collector{ + version: version_str, + } + Collectors = append(Collectors, collector_Item) + } + } + if th.Length() == 2 { + a_item := tr.Find("td").Find("a") + file_type := strings.Trim(a_item.First().Text(), "\n") + download_url := a_item.First().AttrOr("href", "") + downloads := strings.Split(download_url, "/") + file_name := downloads[len(downloads)-1] + sha256_url := a_item.Last().AttrOr("href", "") + releases := strings.Split(th.First().Text(), "/") + + switch releases[0] { + case "Windows": + collector_Item.Mac_X64 = Make_Op_Item(file_type, "x64", download_url, sha256_url, file_name) + case "Mac": + if len(releases) == 1 || releases[1] == "x64" { + collector_Item.Mac_X64 = Make_Op_Item(file_type, "x64", download_url, sha256_url, file_name) + } else { + collector_Item.Mac_AArch64 = Make_Op_Item(file_type, "x64", download_url, sha256_url, file_name) + } + case "Linux": + if len(releases) == 1 || releases[1] == "x64" { + collector_Item.Linux_X64 = Make_Op_Item(file_type, "x64", download_url, sha256_url, file_name) + } else { + collector_Item.Linux_X64 = Make_Op_Item(file_type, "x64", download_url, sha256_url, file_name) + } + } + //fmt.Printf("%v %v\n", strings.Trim(a_item.First().Text(), "\n"), a_item.Last().Text()) + //fmt.Printf("%v %v\n", th.First().Text(), th.Last().Text()) + //fmt.Printf("%v\n%v\n", a_item.First().AttrOr("href", ""), a_item.Last().AttrOr("href", "")) + //fmt.Printf("th.Text(): %v th.len:%v\n", th.Text(), thLen) + } + }) + }) + c2 := Collectors + fmt.Printf("len(c2): %v\n", len(c2)) + fmt.Println(c2) +} + +func Make_Op_Item(file_type, arch, download_url, sha256_url, file_name string) *Op_Item { + return &Op_Item{ + FileType: file_type, + Arch: "x64", + Url: download_url, + Sha256Url: sha256_url, + FileName: file_name, + } +}