From: Sergey Matveev <stargrave@stargrave.org>
Date: Fri, 6 Dec 2019 14:44:37 +0000 (+0300)
Subject: Some PyPIs do not include schema and domain name
X-Git-Tag: v2.1.0~7
X-Git-Url: http://www.git.cypherpunks.ru/?p=gocheese.git;a=commitdiff_plain;h=15353b151b36a839511a112a437716b41dbe8ffd

Some PyPIs do not include schema and domain name
---

diff --git a/gocheese.go b/gocheese.go
index 655908d..fcc353e 100644
--- a/gocheese.go
+++ b/gocheese.go
@@ -162,6 +162,10 @@ func refreshDir(
 			return false
 		}
 		pkgURL.Fragment = ""
+		uri = pkgURL.String()
+		if pkgURL.Host == "" {
+			uri = *pypiURL + strings.TrimPrefix(uri, "/")
+		}
 		path = filepath.Join(dirPath, filename)
 		if filename == filenameGet {
 			if killed {
@@ -170,7 +174,7 @@ func refreshDir(
 				return false
 			}
 			log.Println(r.RemoteAddr, "pypi download", filename)
-			resp, err = http.Get(pkgURL.String())
+			resp, err = http.Get(uri)
 			if err != nil {
 				http.Error(w, err.Error(), http.StatusBadGateway)
 				return false
@@ -216,7 +220,7 @@ func refreshDir(
 			if _, err = os.Stat(path); err != nil {
 				goto GPGSigSkip
 			}
-			resp, err := http.Get(pkgURL.String() + GPGSigExt)
+			resp, err := http.Get(uri + GPGSigExt)
 			if err != nil {
 				goto GPGSigSkip
 			}