xsteadfastx/govanityurls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make meta refresh go directly to the subpackage. (#11)

Browse Source 
Fixes #10
This commit is contained in:
Robert Iannucci 2017-09-26 19:30:09 -07:00 committed by JBD
parent 560593c788
commit e9dc433ca5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
handler.go
View File

@ -84,7 +84,7 @@ func newHandler(config []byte) (*handler, error) {
func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
current := r.URL.Path current := r.URL.Path
pc, _ := h.paths.find(current) pc, subpath := h.paths.find(current)
if pc == nil && current == "/" { if pc == nil && current == "/" {
h.serveIndex(w, r) h.serveIndex(w, r)
return return
@ -96,11 +96,13 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if err := vanityTmpl.Execute(w, struct { if err := vanityTmpl.Execute(w, struct {
Import string Import string
Subpath string
Repo string Repo string
Display string Display string
VCS string VCS string
}{ }{
Import: h.Host(r) + pc.path, Import: h.Host(r) + pc.path,
Subpath: subpath,
Repo: pc.repo, Repo: pc.repo,
Display: pc.display, Display: pc.display,
VCS: pc.vcs, VCS: pc.vcs,
@ -149,10 +151,10 @@ var vanityTmpl = template.Must(template.New("vanity").Parse(`<!DOCTYPE html>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="go-import" content="{{.Import}} {{.VCS}} {{.Repo}}"> <meta name="go-import" content="{{.Import}} {{.VCS}} {{.Repo}}">
<meta name="go-source" content="{{.Import}} {{.Display}}"> <meta name="go-source" content="{{.Import}} {{.Display}}">
<meta http-equiv="refresh" content="0; url=https://godoc.org/{{.Import}}"> <meta http-equiv="refresh" content="0; url=https://godoc.org/{{.Import}}/{{.Subpath}}">
</head> </head>
<body> <body>
Nothing to see here; <a href="https://godoc.org/{{.Import}}">see the package on godoc</a>. Nothing to see here; <a href="https://godoc.org/{{.Import}}/{{.Subpath}}">see the package on godoc</a>.
</body> </body>
</html>`)) </html>`))