зеркало из https://github.com/golang/tools.git
go.tools/godoc: move redirect helpers to new package
Update golang/go#6512 R=golang-dev, dsymonds CC=golang-dev https://golang.org/cl/14193043
This commit is contained in:
Andrew Gerrand
Родитель
35e395da09
Коммит
d20f86cc8e
|
|
@ -15,12 +15,12 @@ import (
|
|||
"sync"
|
||||
|
||||
"code.google.com/p/go.tools/blog"
|
||||
"code.google.com/p/go.tools/godoc/redirect"
|
||||
)
|
||||
|
||||
const (
|
||||
blogRedirect = false
|
||||
blogRepo = "code.google.com/p/go.blog"
|
||||
blogURL = "http://blog.golang.org/"
|
||||
blogRepo = "code.google.com/p/go.blog"
|
||||
blogURL = "http://blog.golang.org/"
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
@ -49,7 +49,7 @@ func blogInit() {
|
|||
if fi, err := os.Stat(root); err != nil || !fi.IsDir() {
|
||||
fmt.Fprintf(os.Stderr, "Blog content not available locally. "+
|
||||
"To install, run \n\tgo get %v\n", blogRepo)
|
||||
blogServer = makePrefixRedirectHandler("/blog/", blogURL)
|
||||
blogServer = redirect.PrefixHandler("/blog/", blogURL)
|
||||
return
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ func codewalk(w http.ResponseWriter, r *http.Request) {
|
|||
}
|
||||
|
||||
// Canonicalize the path and redirect if changed
|
||||
if redirect(w, r) {
|
||||
if redir(w, r) {
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -82,7 +82,7 @@ func codewalk(w http.ResponseWriter, r *http.Request) {
|
|||
})
|
||||
}
|
||||
|
||||
func redirect(w http.ResponseWriter, r *http.Request) (redirected bool) {
|
||||
func redir(w http.ResponseWriter, r *http.Request) (redirected bool) {
|
||||
canonical := pathpkg.Clean(r.URL.Path)
|
||||
if !strings.HasSuffix(canonical, "/") {
|
||||
canonical += "/"
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@ package main
|
|||
import (
|
||||
"log"
|
||||
"net/http"
|
||||
"regexp"
|
||||
"text/template"
|
||||
|
||||
"code.google.com/p/go.tools/godoc"
|
||||
_ "code.google.com/p/go.tools/godoc/redirect"
|
||||
"code.google.com/p/go.tools/godoc/vfs"
|
||||
)
|
||||
|
||||
|
|
@ -35,17 +35,6 @@ func registerHandlers(pres *godoc.Presentation) {
|
|||
http.Handle("/doc/play/", pres.FileServer())
|
||||
http.Handle("/robots.txt", pres.FileServer())
|
||||
http.Handle("/", pres)
|
||||
handlePathRedirects(pkgRedirects, "/pkg/")
|
||||
handlePathRedirects(cmdRedirects, "/cmd/")
|
||||
for prefix, redirect := range prefixHelpers {
|
||||
p := "/" + prefix + "/"
|
||||
h := makePrefixRedirectHandler(p, redirect)
|
||||
http.HandleFunc(p, h)
|
||||
}
|
||||
for path, redirect := range redirects {
|
||||
h := makeRedirectHandler(redirect)
|
||||
http.HandleFunc(path, h)
|
||||
}
|
||||
}
|
||||
|
||||
func readTemplate(name string) *template.Template {
|
||||
|
|
@ -84,123 +73,3 @@ func readTemplates(p *godoc.Presentation, html bool) {
|
|||
p.SearchDescXML = readTemplate("opensearch.xml")
|
||||
}
|
||||
}
|
||||
|
||||
// Packages that were renamed between r60 and go1.
|
||||
var pkgRedirects = map[string]string{
|
||||
"asn1": "encoding/asn1",
|
||||
"big": "math/big",
|
||||
"cmath": "math/cmplx",
|
||||
"csv": "encoding/csv",
|
||||
"exec": "os/exec",
|
||||
"exp/template/html": "html/template",
|
||||
"gob": "encoding/gob",
|
||||
"http": "net/http",
|
||||
"http/cgi": "net/http/cgi",
|
||||
"http/fcgi": "net/http/fcgi",
|
||||
"http/httptest": "net/http/httptest",
|
||||
"http/pprof": "net/http/pprof",
|
||||
"json": "encoding/json",
|
||||
"mail": "net/mail",
|
||||
"rand": "math/rand",
|
||||
"rpc": "net/rpc",
|
||||
"rpc/jsonrpc": "net/rpc/jsonrpc",
|
||||
"scanner": "text/scanner",
|
||||
"smtp": "net/smtp",
|
||||
"tabwriter": "text/tabwriter",
|
||||
"template": "text/template",
|
||||
"template/parse": "text/template/parse",
|
||||
"url": "net/url",
|
||||
"utf16": "unicode/utf16",
|
||||
"utf8": "unicode/utf8",
|
||||
"xml": "encoding/xml",
|
||||
}
|
||||
|
||||
// Commands that were renamed between r60 and go1.
|
||||
var cmdRedirects = map[string]string{
|
||||
"gofix": "fix",
|
||||
"goinstall": "go",
|
||||
"gopack": "pack",
|
||||
"gotest": "go",
|
||||
"govet": "vet",
|
||||
"goyacc": "yacc",
|
||||
}
|
||||
|
||||
var redirects = map[string]string{
|
||||
"/blog": "/blog/",
|
||||
"/build": "http://build.golang.org",
|
||||
"/change": "https://code.google.com/p/go/source/list",
|
||||
"/cl": "https://gocodereview.appspot.com/",
|
||||
"/cmd/godoc/": "http://godoc.org/code.google.com/p/go.tools/cmd/godoc/",
|
||||
"/cmd/vet/": "http://godoc.org/code.google.com/p/go.tools/cmd/vet/",
|
||||
"/issue": "https://code.google.com/p/go/issues",
|
||||
"/issue/new": "https://code.google.com/p/go/issues/entry",
|
||||
"/issues": "https://code.google.com/p/go/issues",
|
||||
"/play": "http://play.golang.org",
|
||||
"/ref": "/doc/#references",
|
||||
"/ref/": "/doc/#references",
|
||||
"/ref/mem": "/doc/mem",
|
||||
"/ref/spec": "/doc/spec",
|
||||
"/talks": "http://talks.golang.org",
|
||||
"/tour": "http://tour.golang.org",
|
||||
"/wiki": "https://code.google.com/p/go-wiki/w/list",
|
||||
|
||||
"/doc/articles/c_go_cgo.html": "/blog/c-go-cgo",
|
||||
"/doc/articles/concurrency_patterns.html": "/blog/go-concurrency-patterns-timing-out-and",
|
||||
"/doc/articles/defer_panic_recover.html": "/blog/defer-panic-and-recover",
|
||||
"/doc/articles/error_handling.html": "/blog/error-handling-and-go",
|
||||
"/doc/articles/gobs_of_data.html": "/blog/gobs-of-data",
|
||||
"/doc/articles/godoc_documenting_go_code.html": "/blog/godoc-documenting-go-code",
|
||||
"/doc/articles/gos_declaration_syntax.html": "/blog/gos-declaration-syntax",
|
||||
"/doc/articles/image_draw.html": "/blog/go-imagedraw-package",
|
||||
"/doc/articles/image_package.html": "/blog/go-image-package",
|
||||
"/doc/articles/json_and_go.html": "/blog/json-and-go",
|
||||
"/doc/articles/json_rpc_tale_of_interfaces.html": "/blog/json-rpc-tale-of-interfaces",
|
||||
"/doc/articles/laws_of_reflection.html": "/blog/laws-of-reflection",
|
||||
"/doc/articles/race_detector.html": "/blog/race-detector",
|
||||
"/doc/articles/slices_usage_and_internals.html": "/blog/go-slices-usage-and-internals",
|
||||
"/doc/go_for_cpp_programmers.html": "https://code.google.com/p/go-wiki/wiki/GoForCPPProgrammers",
|
||||
"/doc/go_tutorial.html": "http://tour.golang.org/",
|
||||
}
|
||||
|
||||
var prefixHelpers = map[string]string{
|
||||
"change": "https://code.google.com/p/go/source/detail?r=",
|
||||
"cl": "https://codereview.appspot.com/",
|
||||
"issue": "https://code.google.com/p/go/issues/detail?id=",
|
||||
"play": "http://play.golang.org/",
|
||||
"talks": "http://talks.golang.org/",
|
||||
"wiki": "https://code.google.com/p/go-wiki/wiki/",
|
||||
}
|
||||
|
||||
func handlePathRedirects(redirects map[string]string, prefix string) {
|
||||
for source, target := range pkgRedirects {
|
||||
h := makeRedirectHandler(prefix + target + "/")
|
||||
p := prefix + source
|
||||
http.HandleFunc(p, h)
|
||||
http.HandleFunc(p+"/", h)
|
||||
}
|
||||
}
|
||||
|
||||
func makeRedirectHandler(target string) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
http.Redirect(w, r, target, http.StatusMovedPermanently)
|
||||
}
|
||||
}
|
||||
|
||||
var validId = regexp.MustCompile(`^[A-Za-z0-9-]*$`)
|
||||
|
||||
func makePrefixRedirectHandler(prefix, baseURL string) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
if p := r.URL.Path; p == prefix {
|
||||
// redirect /prefix/ to /prefix
|
||||
http.Redirect(w, r, p[:len(p)-1], http.StatusFound)
|
||||
return
|
||||
}
|
||||
id := r.URL.Path[len(prefix):]
|
||||
if !validId.MatchString(id) {
|
||||
http.Error(w, "Not found", http.StatusNotFound)
|
||||
return
|
||||
}
|
||||
target := baseURL + id
|
||||
http.Redirect(w, r, target, http.StatusFound)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,147 @@
|
|||
// Copyright 2013 The Go Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
// Package redirect registers HTTP handlers that redirect old godoc paths to
|
||||
// their new equivalents and assist in accessing the issue tracker, wiki, code
|
||||
// review system, etc.
|
||||
package redirect
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"regexp"
|
||||
)
|
||||
|
||||
func init() {
|
||||
handlePathRedirects(pkgRedirects, "/pkg/")
|
||||
handlePathRedirects(cmdRedirects, "/cmd/")
|
||||
for prefix, redirect := range prefixHelpers {
|
||||
p := "/" + prefix + "/"
|
||||
h := PrefixHandler(p, redirect)
|
||||
http.HandleFunc(p, h)
|
||||
}
|
||||
for path, redirect := range redirects {
|
||||
h := Handler(redirect)
|
||||
http.HandleFunc(path, h)
|
||||
}
|
||||
}
|
||||
|
||||
// Packages that were renamed between r60 and go1.
|
||||
var pkgRedirects = map[string]string{
|
||||
"asn1": "encoding/asn1",
|
||||
"big": "math/big",
|
||||
"cmath": "math/cmplx",
|
||||
"csv": "encoding/csv",
|
||||
"exec": "os/exec",
|
||||
"exp/template/html": "html/template",
|
||||
"gob": "encoding/gob",
|
||||
"http": "net/http",
|
||||
"http/cgi": "net/http/cgi",
|
||||
"http/fcgi": "net/http/fcgi",
|
||||
"http/httptest": "net/http/httptest",
|
||||
"http/pprof": "net/http/pprof",
|
||||
"json": "encoding/json",
|
||||
"mail": "net/mail",
|
||||
"rand": "math/rand",
|
||||
"rpc": "net/rpc",
|
||||
"rpc/jsonrpc": "net/rpc/jsonrpc",
|
||||
"scanner": "text/scanner",
|
||||
"smtp": "net/smtp",
|
||||
"tabwriter": "text/tabwriter",
|
||||
"template": "text/template",
|
||||
"template/parse": "text/template/parse",
|
||||
"url": "net/url",
|
||||
"utf16": "unicode/utf16",
|
||||
"utf8": "unicode/utf8",
|
||||
"xml": "encoding/xml",
|
||||
}
|
||||
|
||||
// Commands that were renamed between r60 and go1.
|
||||
var cmdRedirects = map[string]string{
|
||||
"gofix": "fix",
|
||||
"goinstall": "go",
|
||||
"gopack": "pack",
|
||||
"gotest": "go",
|
||||
"govet": "vet",
|
||||
"goyacc": "yacc",
|
||||
}
|
||||
|
||||
var redirects = map[string]string{
|
||||
"/blog": "/blog/",
|
||||
"/build": "http://build.golang.org",
|
||||
"/change": "https://code.google.com/p/go/source/list",
|
||||
"/cl": "https://gocodereview.appspot.com/",
|
||||
"/cmd/godoc/": "http://godoc.org/code.google.com/p/go.tools/cmd/godoc/",
|
||||
"/cmd/vet/": "http://godoc.org/code.google.com/p/go.tools/cmd/vet/",
|
||||
"/issue": "https://code.google.com/p/go/issues",
|
||||
"/issue/new": "https://code.google.com/p/go/issues/entry",
|
||||
"/issues": "https://code.google.com/p/go/issues",
|
||||
"/play": "http://play.golang.org",
|
||||
"/ref": "/doc/#references",
|
||||
"/ref/": "/doc/#references",
|
||||
"/ref/mem": "/doc/mem",
|
||||
"/ref/spec": "/doc/spec",
|
||||
"/talks": "http://talks.golang.org",
|
||||
"/tour": "http://tour.golang.org",
|
||||
"/wiki": "https://code.google.com/p/go-wiki/w/list",
|
||||
|
||||
"/doc/articles/c_go_cgo.html": "/blog/c-go-cgo",
|
||||
"/doc/articles/concurrency_patterns.html": "/blog/go-concurrency-patterns-timing-out-and",
|
||||
"/doc/articles/defer_panic_recover.html": "/blog/defer-panic-and-recover",
|
||||
"/doc/articles/error_handling.html": "/blog/error-handling-and-go",
|
||||
"/doc/articles/gobs_of_data.html": "/blog/gobs-of-data",
|
||||
"/doc/articles/godoc_documenting_go_code.html": "/blog/godoc-documenting-go-code",
|
||||
"/doc/articles/gos_declaration_syntax.html": "/blog/gos-declaration-syntax",
|
||||
"/doc/articles/image_draw.html": "/blog/go-imagedraw-package",
|
||||
"/doc/articles/image_package.html": "/blog/go-image-package",
|
||||
"/doc/articles/json_and_go.html": "/blog/json-and-go",
|
||||
"/doc/articles/json_rpc_tale_of_interfaces.html": "/blog/json-rpc-tale-of-interfaces",
|
||||
"/doc/articles/laws_of_reflection.html": "/blog/laws-of-reflection",
|
||||
"/doc/articles/race_detector.html": "/blog/race-detector",
|
||||
"/doc/articles/slices_usage_and_internals.html": "/blog/go-slices-usage-and-internals",
|
||||
"/doc/go_for_cpp_programmers.html": "https://code.google.com/p/go-wiki/wiki/GoForCPPProgrammers",
|
||||
"/doc/go_tutorial.html": "http://tour.golang.org/",
|
||||
}
|
||||
|
||||
var prefixHelpers = map[string]string{
|
||||
"change": "https://code.google.com/p/go/source/detail?r=",
|
||||
"cl": "https://codereview.appspot.com/",
|
||||
"issue": "https://code.google.com/p/go/issues/detail?id=",
|
||||
"play": "http://play.golang.org/",
|
||||
"talks": "http://talks.golang.org/",
|
||||
"wiki": "https://code.google.com/p/go-wiki/wiki/",
|
||||
}
|
||||
|
||||
func handlePathRedirects(redirects map[string]string, prefix string) {
|
||||
for source, target := range pkgRedirects {
|
||||
h := Handler(prefix + target + "/")
|
||||
p := prefix + source
|
||||
http.HandleFunc(p, h)
|
||||
http.HandleFunc(p+"/", h)
|
||||
}
|
||||
}
|
||||
|
||||
func Handler(target string) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
http.Redirect(w, r, target, http.StatusMovedPermanently)
|
||||
}
|
||||
}
|
||||
|
||||
var validId = regexp.MustCompile(`^[A-Za-z0-9-]*$`)
|
||||
|
||||
func PrefixHandler(prefix, baseURL string) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
if p := r.URL.Path; p == prefix {
|
||||
// redirect /prefix/ to /prefix
|
||||
http.Redirect(w, r, p[:len(p)-1], http.StatusFound)
|
||||
return
|
||||
}
|
||||
id := r.URL.Path[len(prefix):]
|
||||
if !validId.MatchString(id) {
|
||||
http.Error(w, "Not found", http.StatusNotFound)
|
||||
return
|
||||
}
|
||||
target := baseURL + id
|
||||
http.Redirect(w, r, target, http.StatusFound)
|
||||
}
|
||||
}
|
||||
Загрузка…
Ссылка в новой задаче