abunchtell
/
gopkg
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Activity
Browse Source

Resolve conflicts from Geert-Johan's godot branch.

master
Gustavo Niemeyer 10 years ago
parent
5920fdae04 c5b57c5f48
commit
828a3107e2
2 changed files with 32 additions and 36 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +12
    -12
      main.go
  2. +20
    -24
      page.go

+ 12
- 12
main.go View File

@@ -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,21 +103,21 @@ 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
}
}
}

var patternOld = regexp.MustCompile(`^/(?:([a-z0-9][-a-z0-9]+)/)?((?:v0|v[1-9][0-9]*)(?:\.0|\.[1-9][0-9]*){0,2})/([a-zA-Z][-a-zA-Z0-9]*)(?:\.git)?((?:/[a-zA-Z][-a-zA-Z0-9]*)*)$`)
var patternNew = regexp.MustCompile(`^/(?:([a-zA-Z0-9][-a-zA-Z0-9]+)/)?([a-zA-Z][-a-zA-Z0-9]*)\.((?:v0|v[1-9][0-9]*)(?:\.0|\.[1-9][0-9]*){0,2})(?:\.git)?((?:/[a-zA-Z][-a-zA-Z0-9]*)*)$`)
var patternNew = regexp.MustCompile(`^/(?:([a-zA-Z0-9][-a-zA-Z0-9]+)/)?([a-zA-Z][-.a-zA-Z0-9]*)\.((?:v0|v[1-9][0-9]*)(?:\.0|\.[1-9][0-9]*){0,2})(?:\.git)?((?:/[a-zA-Z][-a-zA-Z0-9]*)*)$`)

func handler(resp http.ResponseWriter, req *http.Request) {
if req.URL.Path == "/health-check" {
@@ -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


+ 20
- 24
page.go View File

@@ -4,19 +4,20 @@ import (
"encoding/json"
"fmt"
"html/template"
"io/ioutil"
"log"
"net/http"
"net/url"
"os"
"regexp"
"sort"
"strings"
)

const packageTemplateString = `<!DOCTYPE html>
<html >
<head>
<meta charset="utf-8">
<title>{{.Repo.PackageName}}.{{.Repo.MajorVersion}}{{.Repo.SubPath}} - {{.Repo.GopkgPath}}</title>
<title>{{.Repo.Name}}.{{.Repo.MajorVersion}}{{.Repo.SubPath}} - {{.Repo.GopkgPath}}</title>
<link href='//fonts.googleapis.com/css?family=Ubuntu+Mono|Ubuntu' rel='stylesheet' >
<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet" >
<link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet" >
@@ -138,7 +139,7 @@ const packageTemplateString = `<!DOCTYPE html>
<div>
<p>To import this package, add the following line to your code:</p>
<pre>import "{{.Repo.GopkgPath}}"</pre>
{{if .CleanPackageName}}<p>Refer to it as <i>{{.CleanPackageName}}</i>.{{end}}
{{if .PackageName}}<p>Refer to it as <i>{{.PackageName}}</i>.{{end}}
</div>
<div>
<p>For more details, see the API documentation.</p>
@@ -202,11 +203,11 @@ 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
Synopsis string
Repo *Repo
LatestVersions VersionList // Contains only the latest version for each major
FullVersion Version // Version that the major requested resolves to
PackageName string // Actual package identifier as specified in http://golang.org/ref/spec#PackageClause
Synopsis string
}

// SearchResults is used with the godoc.org search API
@@ -217,6 +218,8 @@ type SearchResults struct {
} `json:"results"`
}

var regexpPackageName = regexp.MustCompile(`<h2 id="pkg-overview">package ([\p{L}_][\p{L}\p{Nd}_]*)</h2>`)

func renderPackagePage(resp http.ResponseWriter, req *http.Request, repo *Repo) {
data := &packageData{
Repo: repo,
@@ -237,23 +240,16 @@ func renderPackagePage(resp http.ResponseWriter, req *http.Request, repo *Repo)
}
sort.Sort(sort.Reverse(data.LatestVersions))

// find clean package name
data.CleanPackageName = repo.PackageName
if strings.HasPrefix(data.CleanPackageName, "go-") {
data.CleanPackageName = data.CleanPackageName[3:]
}
if strings.HasSuffix(data.CleanPackageName, "-go") {
data.CleanPackageName = data.CleanPackageName[:len(data.CleanPackageName)-3]
}
for i, c := range data.CleanPackageName {
if c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' {
continue
}
if i > 0 && (c == '_' || c >= '0' && c <= '9') {
continue
godocResp, err := http.Get("http://godoc.org/" + repo.GopkgPath())
if err == nil {
godocRespBytes, err := ioutil.ReadAll(godocResp.Body)
godocResp.Body.Close()
if err == nil {
matches := regexpPackageName.FindSubmatch(godocRespBytes)
if len(matches) == 2 {
data.PackageName = string(matches[1])
}
}
data.CleanPackageName = ""
break
}

// retrieve synopsis


Write Preview
Loading…
Cancel
Save