Skip to content

Add an optional Home property to path configuration #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bmfs wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add an optional Home property to path configuration #44

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cea7a8
Add optional home property to be used as a redirect in template
bmfs Jun 29, 2021
c6d787e
Use home property in index template
bmfs Jun 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 36 additions & 16 deletions handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ type pathConfig struct {
path string
repo string
display string
home string
vcs string
}

Expand All @@ -46,6 +47,7 @@ func newHandler(config []byte) (*handler, error) {
Paths map[string]struct {
Repo string `yaml:"repo,omitempty"`
Display string `yaml:"display,omitempty"`
Home string `yaml:"home,omitempty"`
VCS string `yaml:"vcs,omitempty"`
} `yaml:"paths,omitempty"`
}
Expand All @@ -66,6 +68,7 @@ func newHandler(config []byte) (*handler, error) {
path: strings.TrimSuffix(path, "/"),
repo: e.Repo,
display: e.Display,
home: e.Home,
vcs: e.VCS,
}
switch {
Expand Down Expand Up @@ -106,32 +109,49 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}

w.Header().Set("Cache-Control", h.cacheControl)

importStr := h.Host(r) + pc.path
redirectURL := fmt.Sprintf("https://pkg.go.dev/%s/%s", importStr, subpath)
if pc.home != "" {
redirectURL = pc.home
}
if err := vanityTmpl.Execute(w, struct {
Import string
Subpath string
Repo string
Display string
VCS string
Import string
Subpath string
Repo string
Display string
VCS string
RedirectURL string
}{
Import: h.Host(r) + pc.path,
Subpath: subpath,
Repo: pc.repo,
Display: pc.display,
VCS: pc.vcs,
Import: importStr,
Subpath: subpath,
Repo: pc.repo,
Display: pc.display,
VCS: pc.vcs,
RedirectURL: redirectURL,
}); err != nil {
http.Error(w, "cannot render the page", http.StatusInternalServerError)
}
}

type indexDTO struct {
Import string
URL string
}

func (h *handler) serveIndex(w http.ResponseWriter, r *http.Request) {
host := h.Host(r)
handlers := make([]string, len(h.paths))
handlers := make([]indexDTO, len(h.paths))
for i, h := range h.paths {
handlers[i] = host + h.path
url := fmt.Sprintf("https://pkg.go.dev/%s", host+h.path)
if h.home != "" {
url = h.home
}
handlers[i] = indexDTO{Import: host + h.path, URL: url}
}
if err := indexTmpl.Execute(w, struct {
Host string
Handlers []string
Handlers []indexDTO
}{
Host: host,
Handlers: handlers,
Expand All @@ -152,7 +172,7 @@ var indexTmpl = template.Must(template.New("index").Parse(`<!DOCTYPE html>
<html>
<h1>{{.Host}}</h1>
<ul>
{{range .Handlers}}<li><a href="https://pkg.go.dev/{{.}}">{{.}}</a></li>{{end}}
{{range .Handlers}}<li><a href="{{.URL}}">{{.Import}}</a></li>{{end}}
</ul>
</html>
`))
Expand All @@ -163,10 +183,10 @@ var vanityTmpl = template.Must(template.New("vanity").Parse(`<!DOCTYPE html>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="go-import" content="{{.Import}} {{.VCS}} {{.Repo}}">
<meta name="go-source" content="{{.Import}} {{.Display}}">
<meta http-equiv="refresh" content="0; url=https://pkg.go.dev/{{.Import}}/{{.Subpath}}">
<meta http-equiv="refresh" content="0; url={{.RedirectURL}}">
</head>
<body>
Nothing to see here; <a href="https://pkg.go.dev/{{.Import}}/{{.Subpath}}">see the package on pkg.go.dev</a>.
Nothing to see here; <a href="{{.RedirectURL}}">see the package on {{.RedirectURL}}</a>.
</body>
</html>`))

Expand Down