envs
/
gopherproxy
mirror of https://git.envs.net/envs/gopherproxy.git
1
0
Fork 0
Code Releases Activity

Minor refactor/cleanup

This commit is contained in:
James Mills 2017-10-15 13:16:23 -07:00
parent 1a396a0e6e
commit 74783dccd7
No known key found for this signature in database
GPG Key ID: AC4C014F1440EBD6
3 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/gopherproxy/main.go
View File

@ -8,7 +8,7 @@ import (
)
var (
bind = flag.String("bind", "0.0.0.0:80", "[int]:port to bind to")
bind = flag.String("bind", "0.0.0.0:8000", "[int]:port to bind to")
uri = flag.String("uri", "floodgap.com", "<host>:[port] to proxy to")
)

17
gopherproxy.go
View File

@ -13,19 +13,16 @@ import (
"github.com/prologic/go-gopher"
)
type tplRow struct {
type Item struct {
Link template.URL
Type string
Text string
}
// Handler is an aliased type for the standard HTTP handler functions
type Handler func(w http.ResponseWriter, req *http.Request)
func renderDirectory(w http.ResponseWriter, tpl *template.Template, hostport string, d gopher.Directory) error {
var title string
out := make([]tplRow, len(d.Items))
out := make([]Item, len(d.Items))
for i, x := range d.Items {
if x.Type == gopher.INFO && x.Selector == "TITLE" {
@ -33,7 +30,7 @@ func renderDirectory(w http.ResponseWriter, tpl *template.Template, hostport str
continue
}
tr := tplRow{
tr := Item{
Text: x.Description,
Type: x.Type.String(),
}
@ -73,14 +70,14 @@ func renderDirectory(w http.ResponseWriter, tpl *template.Template, hostport str
return tpl.Execute(w, struct {
Title string
Lines []tplRow
Lines []Item
}{title, out})
}
// MakeGopherProxyHandler returns a Handler that proxies requests
// Handler returns a Handler that proxies requests
// to the specified Gopher server as denoated by the first argument
// to the request path and renders the content using the provided template.
func MakeGopherProxyHandler(tpl *template.Template, uri string) Handler {
func Handler(tpl *template.Template, uri string) http.HandlerFunc {
return func(w http.ResponseWriter, req *http.Request) {
parts := strings.Split(strings.TrimPrefix(req.URL.Path, "/"), "/")
hostport := parts[0]
@ -147,6 +144,6 @@ func ListenAndServe(bind, uri string) error {
log.Fatal(err)
}
http.HandleFunc("/", MakeGopherProxyHandler(tpl, uri))
http.HandleFunc("/", Handler(tpl, uri))
return http.ListenAndServe(bind, nil)
}

18
template.go
View File

@ -6,24 +6,6 @@ var tpltext = `<!doctype html>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>{{.Title}}</title>
<style>
body {
background: #FFFFFF;
}
section {
margin: auto;
width: 50%;
font-family:Courier;
color: #CCCCCC;
background: #000000;
border: 3px double #CCCCCC;
color: #FFFFFF;
border-radius: 1em;
padding: 1em;
overflow-x: auto;
}
</style>
</head>
<body>
<section>