yakumo.izuru/toyohime
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add index flag

Browse Source 
git-svn-id: file:///srv/svn/repo/toyohime/trunk@91 922d331f-388e-da47-97a9-ad700dc0b8b9
This commit is contained in:
jonbetti 2018-06-06 04:57:36 +00:00
parent 43bb62fe5b
commit 3c8aff3310
2 changed files with 65 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/vanityserver/README.md
View File

@ -5,9 +5,12 @@ Runs a barebones vanity server over HTTP.
## Usage ## Usage
``` ```
./vanityserver fqdn [repo file] ./vanityserver [-index] fqdn [repo file]
``` ```
The "-index" flag enables an index page at "/" that lists all repos hosted on
this server.
If repo file is not given, "./repos" is used. The file has the following format: If repo file is not given, "./repos" is used. The file has the following format:
``` ```

65
cmd/vanityserver/main.go
View File

@ -5,7 +5,10 @@ package main // go.jonnrb.io/vanity
import ( import (
"bufio" "bufio"
"bytes"
"flag"
"fmt" "fmt"
"html/template"
"io" "io"
"log" "log"
"net/http" "net/http"
@ -17,6 +20,10 @@ import (
"go.jonnrb.io/vanity" "go.jonnrb.io/vanity"
) )
var (
showIndex = flag.Bool("index", false, "Show a list of repos at /")
)
var host string var host string
func serveRepo(mux *http.ServeMux, root string, u *url.URL) { func serveRepo(mux *http.ServeMux, root string, u *url.URL) {
@ -41,6 +48,8 @@ func serveRepo(mux *http.ServeMux, root string, u *url.URL) {
} }
func buildMux(mux *http.ServeMux, r io.Reader) { func buildMux(mux *http.ServeMux, r io.Reader) {
indexMap := map[string]string{}
sc := bufio.NewScanner(r) sc := bufio.NewScanner(r)
for sc.Scan() { for sc.Scan() {
fields := strings.Fields(sc.Text()) fields := strings.Fields(sc.Text())
@ -53,6 +62,10 @@ func buildMux(mux *http.ServeMux, r io.Reader) {
log.Fatalf("Expected line of form \"path vcsScheme://vcsHost/user/repo\" but got %q", sc.Text()) log.Fatalf("Expected line of form \"path vcsScheme://vcsHost/user/repo\" but got %q", sc.Text())
} }
if *showIndex {
indexMap[fields[0]] = fields[1]
}
path := fields[0] path := fields[0]
u, err := url.Parse(fields[1]) u, err := url.Parse(fields[1])
if err != nil { if err != nil {
@ -61,18 +74,62 @@ func buildMux(mux *http.ServeMux, r io.Reader) {
serveRepo(mux, path, u) serveRepo(mux, path, u)
} }
if !*showIndex {
return
}
var b bytes.Buffer
err := template.Must(template.New("").Parse(`<!DOCTYPE html>
<table>
{{ $host := .Host }}
<h1>{{ html $host }}</h1>
{{ range $root, $repo := .IndexMap }}
<tr>
<td><a href="https://{{ html $host }}/{{ html $root }}">{{ html $root }}</a></td>
<td><a href="{{ html $repo }}">{{ html $repo }}</a></td>
{{ else }}
Nothing here.
{{ end }}
</table>
`)).Execute(&b, struct {
IndexMap map[string]string
Host string
}{
IndexMap: indexMap,
Host: host,
})
if err != nil {
log.Fatalf("Couldn't create index page: %v", err)
}
buf := b.Bytes()
mux.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.URL.Path != "/" {
http.NotFound(w, r)
return
}
io.Copy(w, bytes.NewReader(buf))
}))
} }
func main() { func main() {
if len(os.Args) < 2 { flag.Usage = func() {
fmt.Fprintf(os.Stderr, "usage: %s fqdn [repos file]", os.Args[0]) fmt.Fprintf(os.Stderr, "usage: %s fqdn [repos file]", os.Args[0])
flag.PrintDefaults()
}
flag.Parse()
host = flag.Arg(0)
if host == "" {
flag.Usage()
os.Exit(-1) os.Exit(-1)
} }
host = os.Args[1]
reposPath := "repos" reposPath := "repos"
if len(os.Args) > 2 { if override := flag.Arg(1); override != "" {
reposPath = os.Args[2] reposPath = override
} }
mux := http.NewServeMux() mux := http.NewServeMux()