gocheese.go | 28 ++++++++++++++--------------
diff --git a/gocheese.go b/gocheese.go
index 807b4e8317f8617462be4328819b4cbec8e0d5a054d1e5ac2f66ad0a77716ff8..7febba210f4ea7912f05276062f4d84030157df0f4f14887b1ae96b382f0bd99 100644
--- a/gocheese.go
+++ b/gocheese.go
@@ -60,15 +60,15 @@ along with this program. If not, see .`
)
var (
- root = flag.String("root", "./packages", "Path to packages directory")
- bind = flag.String("bind", "[::]:8080", "Address to bind to")
- simpleURLPath = flag.String("simple", "/simple/", "/simple/ URL path")
- refreshURLPath = flag.String("refresh", "/refresh/", "Auto-refreshing URL path")
- pypiURL = flag.String("pypi", "https://pypi.org/simple/", "Upstream PyPI URL")
- auth = flag.String("auth", "spam:foo", "login:password,...")
- fsck = flag.Bool("fsck", false, "Check integrity of all packages")
- version = flag.Bool("version", false, "Print version information")
- warranty = flag.Bool("warranty", false, "Print warranty information")
+ root = flag.String("root", "./packages", "Path to packages directory")
+ bind = flag.String("bind", "[::]:8080", "Address to bind to")
+ norefreshURLPath = flag.String("norefresh", "/norefresh/", "Non-refreshing URL path")
+ refreshURLPath = flag.String("refresh", "/simple/", "Auto-refreshing URL path")
+ pypiURL = flag.String("pypi", "https://pypi.org/simple/", "Upstream PyPI URL")
+ auth = flag.String("auth", "spam:foo", "login:password,...")
+ fsck = flag.Bool("fsck", false, "Check integrity of all packages")
+ version = flag.Bool("version", false, "Print version information")
+ warranty = flag.Bool("warranty", false, "Print warranty information")
pkgPyPI = regexp.MustCompile(`^.*]*>(.+)
.*$`)
Version string = "UNKNOWN"
@@ -202,7 +202,7 @@ for _, file := range files {
if file.Mode().IsDir() {
w.Write([]byte(fmt.Sprintf(
HTMLElement,
- *simpleURLPath+file.Name()+"/",
+ *refreshURLPath+file.Name()+"/",
file.Name(),
)))
}
@@ -241,7 +241,7 @@ filenameClean = strings.TrimSuffix(file.Name(), SHA256Ext)
w.Write([]byte(fmt.Sprintf(
HTMLElement,
strings.Join([]string{
- *simpleURLPath, dir, "/",
+ *refreshURLPath, dir, "/",
filenameClean, "#", SHA256Prefix, string(data),
}, ""),
filenameClean,
@@ -341,8 +341,8 @@ func handler(w http.ResponseWriter, r *http.Request) {
if r.Method == "GET" {
var path string
var autorefresh bool
- if strings.HasPrefix(r.URL.Path, *simpleURLPath) {
- path = strings.TrimPrefix(r.URL.Path, *simpleURLPath)
+ if strings.HasPrefix(r.URL.Path, *norefreshURLPath) {
+ path = strings.TrimPrefix(r.URL.Path, *norefreshURLPath)
autorefresh = false
} else {
path = strings.TrimPrefix(r.URL.Path, *refreshURLPath)
@@ -435,7 +435,7 @@ }
passwords[splitted[0]] = splitted[1]
}
log.Println("root:", *root, "bind:", *bind)
- http.HandleFunc(*simpleURLPath, handler)
+ http.HandleFunc(*norefreshURLPath, handler)
http.HandleFunc(*refreshURLPath, handler)
log.Fatal(http.ListenAndServe(*bind, nil))
}