bugfix

gvcgo · Jun 25, 2024 · d9e9ebe · d9e9ebe
1 parent f8bf6c6
commit d9e9ebe
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/internal/cnf/common.go b/internal/cnf/common.go
@@ -82,7 +82,7 @@ func LoadCustomedMirror() map[string]string {
 	fPath := filepath.Join(GetVMRWorkDir(), "customed_mirrors.toml")
 	if ok, _ := gutils.PathIsExist(fPath); !ok {
 		ff := request.NewFetcher()
-		ff.SetUrl(DefaultReverseProxy + DefaultHostUrl + "/mirrors/customed_mirrors.toml")
+		ff.SetUrl(DefaultReverseProxy + strings.TrimSuffix(DefaultHostUrl, "/") + "/mirrors/customed_mirrors.toml")
 		s, _ := ff.GetString()
 		os.WriteFile(fPath, []byte(s), os.ModePerm)
 	}
@@ -103,7 +103,7 @@ func UseCustomedMirrorUrl(dUrl string) string {
 				if err != nil {
 					return dUrl
 				}
-				version := uu.Query().Get("version=")
+				version := uu.Query().Get("version")
 				if version == "" {
 					return dUrl
 				}
@@ -119,21 +119,23 @@ func UseCustomedMirrorUrl(dUrl string) string {
 // Prepares request.Fetcher for URL.
 func GetFetcher(dUrl string) (fetcher *request.Fetcher) {
 	// use customed mirror
+	oldDUrl := dUrl
 	dUrl = UseCustomedMirrorUrl(dUrl)
 
 	localProxy := os.Getenv(VMRLocalProxyEnv)
 	reverseProxy := strings.Trim(GetReverseProxyUri(dUrl, localProxy), "/")
-	if reverseProxy != "" {
-		dUrl = reverseProxy + dUrl
+	if reverseProxy != "" && oldDUrl == dUrl {
+		dUrl = reverseProxy + "/" + dUrl
 	}
 	fetcher = request.NewFetcher()
 
 	// multi-threads only for large files.
 	if !strings.HasSuffix(dUrl, ".json") && !strings.HasSuffix(dUrl, ".toml") {
 		fetcher.SetThreadNum(GetDownloadThreadNum())
 	}
+
 	fetcher.SetUrl(strings.Trim(dUrl, "/"))
-	if !strings.Contains(dUrl, "gitee.com") {
+	if !strings.Contains(dUrl, "gitee.com") && oldDUrl == dUrl {
 		// do not use proxy for gitee.
 		fetcher.Proxy = localProxy
 	}

diff --git a/internal/cnf/conf.go b/internal/cnf/conf.go
@@ -3,6 +3,7 @@ package cnf
 import (
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/gogf/gf/v2/util/gconv"
 	toml "github.com/pelletier/go-toml/v2"
@@ -128,7 +129,7 @@ func NewVMRConf() (v *VMRConf) {
 		os.Setenv(VMRSdkInstallationDirEnv, v.SDKIntallationDir)
 	}
 	if v.VersionHostUrl != "" {
-		os.Setenv(VMRHostUrlEnv, v.VersionHostUrl)
+		os.Setenv(VMRHostUrlEnv, strings.TrimSuffix(v.VersionHostUrl, "/"))
 	}
 	if v.ProxyUri != "" {
 		os.Setenv(VMRLocalProxyEnv, v.ProxyUri)
@@ -141,6 +142,9 @@ func NewVMRConf() (v *VMRConf) {
 	} else {
 		os.Setenv(VMRUseCustomedMirrorEnv, "false")
 	}
+	if v.ReverseProxy != "" {
+		os.Setenv(VMRReverseProxyEnv, v.ReverseProxy)
+	}
 	return v
 }
 

diff --git a/internal/download/sdk_file.go b/internal/download/sdk_file.go
@@ -1,8 +1,10 @@
 package download
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 	"time"
 
 	"github.com/gvcgo/goutils/pkgs/gutils"
@@ -31,6 +33,10 @@ func NewDownloader() (d *Downloader) {
 func (d *Downloader) getLocalFilePath() string {
 	cacheDir := cnf.GetCacheDir()
 	filename := filepath.Base(d.Version.Url)
+	// gradle: https://raw.githubusercontent.com/gvcgo/vsources/main/gradle.version.json
+	if d.SDKName == "gradle" && strings.Contains(filename, "?") {
+		filename = fmt.Sprintf("gradle-%s-all.zip", d.VersionName)
+	}
 	dd := filepath.Join(cacheDir, d.SDKName, d.VersionName)
 	os.MkdirAll(dd, os.ModePerm)
 	return filepath.Join(dd, filename)