diff --git a/main.go b/main.go index 4ec9782..0c541af 100644 --- a/main.go +++ b/main.go @@ -69,7 +69,7 @@ go get {{.GopkgPath}} type Repo struct { User string - PackageName string + Name string SubPath string OldFormat bool MajorVersion Version @@ -79,9 +79,9 @@ type Repo struct { // GitHubRoot returns the repository root at GitHub, without a schema. func (repo *Repo) GitHubRoot() string { if repo.User == "" { - return "github.com/go-" + repo.PackageName + "/" + repo.PackageName + return "github.com/go-" + repo.Name + "/" + repo.Name } else { - return "github.com/" + repo.User + "/" + repo.PackageName + return "github.com/" + repo.User + "/" + repo.Name } } @@ -103,15 +103,15 @@ func (repo *Repo) GopkgVersionRoot(version Version) string { v := version.String() if repo.OldFormat { if repo.User == "" { - return "gopkg.in/" + v + "/" + repo.PackageName + return "gopkg.in/" + v + "/" + repo.Name } else { - return "gopkg.in/" + repo.User + "/" + v + "/" + repo.PackageName + return "gopkg.in/" + repo.User + "/" + v + "/" + repo.Name } } else { if repo.User == "" { - return "gopkg.in/" + repo.PackageName + "." + v + return "gopkg.in/" + repo.Name + "." + v } else { - return "gopkg.in/" + repo.User + "/" + repo.PackageName + "." + v + return "gopkg.in/" + repo.User + "/" + repo.Name + "." + v } } } @@ -152,10 +152,10 @@ func handler(resp http.ResponseWriter, req *http.Request) { } repo := &Repo{ - User: m[1], - PackageName: m[2], - SubPath: m[4], - OldFormat: oldFormat, + User: m[1], + Name: m[2], + SubPath: m[4], + OldFormat: oldFormat, } var ok bool diff --git a/page.go b/page.go index e150d28..c05b952 100644 --- a/page.go +++ b/page.go @@ -14,7 +14,7 @@ const packageTemplateString = ` - {{.Repo.PackageName}}.{{.Repo.MajorVersion}}{{.Repo.SubPath}} - {{.Repo.GopkgPath}} + {{.Repo.Name}}.{{.Repo.MajorVersion}}{{.Repo.SubPath}} - {{.Repo.GopkgPath}} @@ -129,7 +129,7 @@ const packageTemplateString = `

To import this package, add the following line to your code:

import "{{.Repo.GopkgPath}}"
- {{if .CleanPackageName}}

Refer to it as {{.CleanPackageName}}.{{end}} + {{if .CleanName}}

Refer to it as {{.CleanName}}.{{end}}

For more details, see the API documentation.

@@ -193,10 +193,10 @@ func init() { } type packageData struct { - Repo *Repo - LatestVersions VersionList // Contains only the latest version for each major - FullVersion Version // Version that the major requested resolves to - CleanPackageName string + Repo *Repo + LatestVersions VersionList // Contains only the latest version for each major + FullVersion Version // Version that the major requested resolves to + CleanName string } func renderPackagePage(resp http.ResponseWriter, req *http.Request, repo *Repo) { @@ -217,21 +217,21 @@ func renderPackagePage(resp http.ResponseWriter, req *http.Request, repo *Repo) } sort.Sort(sort.Reverse(data.LatestVersions)) - data.CleanPackageName = repo.PackageName - if strings.HasPrefix(data.CleanPackageName, "go-") || strings.HasPrefix(data.CleanPackageName, "go.") { - data.CleanPackageName = data.CleanPackageName[3:] + data.CleanName = repo.Name + if strings.HasPrefix(data.CleanName, "go-") || strings.HasPrefix(data.CleanName, "go.") { + data.CleanName = data.CleanName[3:] } - if strings.HasSuffix(data.CleanPackageName, "-go") { - data.CleanPackageName = data.CleanPackageName[:len(data.CleanPackageName)-3] + if strings.HasSuffix(data.CleanName, "-go") { + data.CleanName = data.CleanName[:len(data.CleanName)-3] } - for i, c := range data.CleanPackageName { + for i, c := range data.CleanName { if c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' { continue } if i > 0 && (c == '_' || c >= '0' && c <= '9') { continue } - data.CleanPackageName = "" + data.CleanName = "" break }