diff options
| -rw-r--r-- | pkg/context/api.go | 7 | ||||
| -rw-r--r-- | routes/api/v1/api.go | 5 | ||||
| -rw-r--r-- | routes/api/v1/repo/commits.go | 91 |
3 files changed, 102 insertions, 1 deletions
diff --git a/pkg/context/api.go b/pkg/context/api.go index 439fb5df..7dc4472b 100644 --- a/pkg/context/api.go +++ b/pkg/context/api.go @@ -17,7 +17,11 @@ import ( ) type APIContext struct { - *Context + *Context // TODO: Reduce to only needed fields instead of full shadow + + // Base URL for the version of API endpoints, e.g. https://try.gogs.io/api/v1 + BaseURL string + Org *APIOrganization } @@ -96,6 +100,7 @@ func APIContexter() macaron.Handler { return func(ctx *Context) { c := &APIContext{ Context: ctx, + BaseURL: setting.AppURL + "api/v1", } ctx.Map(c) } diff --git a/routes/api/v1/api.go b/routes/api/v1/api.go index 2fb2ebb0..ccecc6a7 100644 --- a/routes/api/v1/api.go +++ b/routes/api/v1/api.go @@ -249,6 +249,11 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("", repo.ListBranches) m.Get("/*", repo.GetBranch) }) + + m.Group("/commits", func() { + m.Get("/:sha", repo.GetSingleCommit) + }) + m.Group("/keys", func() { m.Combo("").Get(repo.ListDeployKeys). Post(bind(api.CreateKeyOption{}), repo.CreateDeployKey) diff --git a/routes/api/v1/repo/commits.go b/routes/api/v1/repo/commits.go new file mode 100644 index 00000000..a856d37f --- /dev/null +++ b/routes/api/v1/repo/commits.go @@ -0,0 +1,91 @@ +// Copyright 2018 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package repo + +import ( + "time" + + "github.com/gogs/git-module" + api "github.com/gogs/go-gogs-client" + + "github.com/gogs/gogs/models" + "github.com/gogs/gogs/models/errors" + "github.com/gogs/gogs/pkg/context" + "github.com/gogs/gogs/pkg/setting" +) + +func GetSingleCommit(c *context.APIContext) { + gitRepo, err := git.OpenRepository(c.Repo.Repository.RepoPath()) + if err != nil { + c.ServerError("OpenRepository", err) + return + } + commit, err := gitRepo.GetCommit(c.Params(":sha")) + if err != nil { + c.NotFoundOrServerError("GetCommit", git.IsErrNotExist, err) + return + } + + // Retrieve author and committer information + var apiAuthor, apiCommitter *api.User + author, err := models.GetUserByEmail(commit.Author.Email) + if err != nil && !errors.IsUserNotExist(err) { + c.ServerError("Get user by author email", err) + return + } else if err == nil { + apiAuthor = author.APIFormat() + } + // Save one query if the author is also the committer + if commit.Committer.Email == commit.Author.Email { + apiCommitter = apiAuthor + } else { + committer, err := models.GetUserByEmail(commit.Committer.Email) + if err != nil && !errors.IsUserNotExist(err) { + c.ServerError("Get user by committer email", err) + return + } else if err == nil { + apiCommitter = committer.APIFormat() + } + } + + // Retrieve parent(s) of the commit + apiParents := make([]*api.CommitMeta, commit.ParentCount()) + for i := 0; i < commit.ParentCount(); i++ { + sha, _ := commit.ParentID(i) + apiParents[i] = &api.CommitMeta{ + URL: c.BaseURL + "/repos/" + c.Repo.Repository.FullName() + "/commits/" + sha.String(), + SHA: sha.String(), + } + } + + c.JSONSuccess(&api.Commit{ + CommitMeta: &api.CommitMeta{ + URL: setting.AppURL + c.Link[1:], + SHA: commit.ID.String(), + }, + HTMLURL: c.Repo.Repository.HTMLURL() + "/commits/" + commit.ID.String(), + RepoCommit: &api.RepoCommit{ + URL: setting.AppURL + c.Link[1:], + Author: &api.CommitUser{ + Name: commit.Author.Name, + Email: commit.Author.Email, + Date: commit.Author.When.Format(time.RFC3339), + }, + Committer: &api.CommitUser{ + Name: commit.Committer.Name, + Email: commit.Committer.Email, + Date: commit.Committer.When.Format(time.RFC3339), + }, + Message: commit.Summary(), + Tree: &api.CommitMeta{ + URL: c.BaseURL + "/repos/" + c.Repo.Repository.FullName() + "/tree/" + commit.ID.String(), + SHA: commit.ID.String(), + }, + }, + Author: apiAuthor, + Committer: apiCommitter, + Parents: apiParents, + }) +} |