diff options
Diffstat (limited to 'routers/repo')
| -rw-r--r-- | routers/repo/branch.go | 4 | ||||
| -rw-r--r-- | routers/repo/commit.go | 43 | ||||
| -rw-r--r-- | routers/repo/download.go | 78 | ||||
| -rw-r--r-- | routers/repo/http.go | 55 | ||||
| -rw-r--r-- | routers/repo/issue.go | 210 | ||||
| -rw-r--r-- | routers/repo/pull.go | 4 | ||||
| -rw-r--r-- | routers/repo/release.go | 20 | ||||
| -rw-r--r-- | routers/repo/repo.go | 337 | ||||
| -rw-r--r-- | routers/repo/setting.go | 24 | ||||
| -rw-r--r-- | routers/repo/view.go | 203 |
10 files changed, 505 insertions, 473 deletions
diff --git a/routers/repo/branch.go b/routers/repo/branch.go index 9bad7289..c340b2bf 100644 --- a/routers/repo/branch.go +++ b/routers/repo/branch.go @@ -5,8 +5,6 @@ package repo import ( - "github.com/go-martini/martini" - "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/middleware" ) @@ -15,7 +13,7 @@ const ( BRANCH base.TplName = "repo/branch" ) -func Branches(ctx *middleware.Context, params martini.Params) { +func Branches(ctx *middleware.Context) { ctx.Data["Title"] = "Branches" ctx.Data["IsRepoToolbarBranches"] = true diff --git a/routers/repo/commit.go b/routers/repo/commit.go index aa5c22e4..6320123b 100644 --- a/routers/repo/commit.go +++ b/routers/repo/commit.go @@ -7,7 +7,7 @@ package repo import ( "path" - "github.com/go-martini/martini" + "github.com/Unknwon/com" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/base" @@ -19,7 +19,7 @@ const ( DIFF base.TplName = "repo/diff" ) -func Commits(ctx *middleware.Context, params martini.Params) { +func Commits(ctx *middleware.Context) { ctx.Data["IsRepoToolbarCommits"] = true userName := ctx.Repo.Owner.Name @@ -27,21 +27,21 @@ func Commits(ctx *middleware.Context, params martini.Params) { brs, err := ctx.Repo.GitRepo.GetBranches() if err != nil { - ctx.Handle(500, "repo.Commits(GetBranches)", err) + ctx.Handle(500, "GetBranches", err) return } else if len(brs) == 0 { - ctx.Handle(404, "repo.Commits(GetBranches)", nil) + ctx.Handle(404, "GetBranches", nil) return } commitsCount, err := ctx.Repo.Commit.CommitsCount() if err != nil { - ctx.Handle(500, "repo.Commits(GetCommitsCount)", err) + ctx.Handle(500, "GetCommitsCount", err) return } // Calculate and validate page number. - page, _ := base.StrTo(ctx.Query("p")).Int() + page, _ := com.StrTo(ctx.Query("p")).Int() if page < 1 { page = 1 } @@ -57,7 +57,7 @@ func Commits(ctx *middleware.Context, params martini.Params) { // Both `git log branchName` and `git log commitId` work. ctx.Data["Commits"], err = ctx.Repo.Commit.CommitsByRange(page) if err != nil { - ctx.Handle(500, "repo.Commits(CommitsByRange)", err) + ctx.Handle(500, "CommitsByRange", err) return } @@ -69,7 +69,7 @@ func Commits(ctx *middleware.Context, params martini.Params) { ctx.HTML(200, COMMITS) } -func SearchCommits(ctx *middleware.Context, params martini.Params) { +func SearchCommits(ctx *middleware.Context) { ctx.Data["IsSearchPage"] = true ctx.Data["IsRepoToolbarCommits"] = true @@ -79,15 +79,15 @@ func SearchCommits(ctx *middleware.Context, params martini.Params) { return } - userName := params["username"] - repoName := params["reponame"] + userName := ctx.Params(":username") + repoName := ctx.Params(":reponame") brs, err := ctx.Repo.GitRepo.GetBranches() if err != nil { - ctx.Handle(500, "repo.SearchCommits(GetBranches)", err) + ctx.Handle(500, "GetBranches", err) return } else if len(brs) == 0 { - ctx.Handle(404, "repo.SearchCommits(GetBranches)", nil) + ctx.Handle(404, "GetBranches", nil) return } @@ -105,7 +105,7 @@ func SearchCommits(ctx *middleware.Context, params martini.Params) { ctx.HTML(200, COMMITS) } -func Diff(ctx *middleware.Context, params martini.Params) { +func Diff(ctx *middleware.Context) { ctx.Data["IsRepoToolbarCommits"] = true userName := ctx.Repo.Owner.Name @@ -116,7 +116,7 @@ func Diff(ctx *middleware.Context, params martini.Params) { diff, err := models.GetDiff(models.RepoPath(userName, repoName), commitId) if err != nil { - ctx.Handle(404, "repo.Diff(GetDiff)", err) + ctx.Handle(404, "GetDiff", err) return } @@ -135,7 +135,6 @@ func Diff(ctx *middleware.Context, params martini.Params) { if n > 0 { buf = buf[:n] } - dataRc.Close() _, isImage := base.IsImageFile(buf) return isImage } @@ -163,25 +162,25 @@ func Diff(ctx *middleware.Context, params martini.Params) { ctx.HTML(200, DIFF) } -func FileHistory(ctx *middleware.Context, params martini.Params) { +func FileHistory(ctx *middleware.Context) { ctx.Data["IsRepoToolbarCommits"] = true - fileName := params["_1"] + fileName := ctx.Params("*") if len(fileName) == 0 { - Commits(ctx, params) + Commits(ctx) return } userName := ctx.Repo.Owner.Name repoName := ctx.Repo.Repository.Name - branchName := params["branchname"] + branchName := ctx.Params(":branchname") brs, err := ctx.Repo.GitRepo.GetBranches() if err != nil { - ctx.Handle(500, "repo.FileHistory", err) + ctx.Handle(500, "GetBranches", err) return } else if len(brs) == 0 { - ctx.Handle(404, "repo.FileHistory", nil) + ctx.Handle(404, "GetBranches", nil) return } @@ -195,7 +194,7 @@ func FileHistory(ctx *middleware.Context, params martini.Params) { } // Calculate and validate page number. - page, _ := base.StrTo(ctx.Query("p")).Int() + page := com.StrTo(ctx.Query("p")).MustInt() if page < 1 { page = 1 } diff --git a/routers/repo/download.go b/routers/repo/download.go index 7e20b0e0..abb9b062 100644 --- a/routers/repo/download.go +++ b/routers/repo/download.go @@ -6,24 +6,18 @@ package repo import ( "io" - "os" - "path/filepath" - - "github.com/Unknwon/com" - "github.com/go-martini/martini" - - "github.com/gogits/git" + "path" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/middleware" ) -func SingleDownload(ctx *middleware.Context, params martini.Params) { - treename := params["_1"] +func SingleDownload(ctx *middleware.Context) { + treename := ctx.Params("*") blob, err := ctx.Repo.Commit.GetBlobByPath(treename) if err != nil { - ctx.Handle(500, "repo.SingleDownload(GetBlobByPath)", err) + ctx.Handle(500, "GetBlobByPath", err) return } @@ -39,67 +33,13 @@ func SingleDownload(ctx *middleware.Context, params martini.Params) { buf = buf[:n] } - defer func() { - dataRc.Close() - }() - contentType, isTextFile := base.IsTextFile(buf) _, isImageFile := base.IsImageFile(buf) - ctx.Res.Header().Set("Content-Type", contentType) + ctx.Resp.Header().Set("Content-Type", contentType) if !isTextFile && !isImageFile { - ctx.Res.Header().Set("Content-Disposition", "attachment; filename="+filepath.Base(treename)) - ctx.Res.Header().Set("Content-Transfer-Encoding", "binary") - } - ctx.Res.Write(buf) - io.Copy(ctx.Res, dataRc) -} - -func ZipDownload(ctx *middleware.Context, params martini.Params) { - commitId := ctx.Repo.CommitId - archivesPath := filepath.Join(ctx.Repo.GitRepo.Path, "archives/zip") - if !com.IsDir(archivesPath) { - if err := os.MkdirAll(archivesPath, 0755); err != nil { - ctx.Handle(500, "ZipDownload -> os.Mkdir(archivesPath)", err) - return - } - } - - archivePath := filepath.Join(archivesPath, commitId+".zip") - - if com.IsFile(archivePath) { - ctx.ServeFile(archivePath, ctx.Repo.Repository.Name+".zip") - return - } - - if err := ctx.Repo.Commit.CreateArchive(archivePath, git.AT_ZIP); err != nil { - ctx.Handle(500, "ZipDownload -> CreateArchive "+archivePath, err) - return + ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+path.Base(treename)) + ctx.Resp.Header().Set("Content-Transfer-Encoding", "binary") } - - ctx.ServeFile(archivePath, ctx.Repo.Repository.Name+".zip") -} - -func TarGzDownload(ctx *middleware.Context, params martini.Params) { - commitId := ctx.Repo.CommitId - archivesPath := filepath.Join(ctx.Repo.GitRepo.Path, "archives/targz") - if !com.IsDir(archivesPath) { - if err := os.MkdirAll(archivesPath, 0755); err != nil { - ctx.Handle(500, "TarGzDownload -> os.Mkdir(archivesPath)", err) - return - } - } - - archivePath := filepath.Join(archivesPath, commitId+".tar.gz") - - if com.IsFile(archivePath) { - ctx.ServeFile(archivePath, ctx.Repo.Repository.Name+".tar.gz") - return - } - - if err := ctx.Repo.Commit.CreateArchive(archivePath, git.AT_TARGZ); err != nil { - ctx.Handle(500, "TarGzDownload -> CreateArchive "+archivePath, err) - return - } - - ctx.ServeFile(archivePath, ctx.Repo.Repository.Name+".tar.gz") + ctx.Resp.Write(buf) + io.Copy(ctx.Resp, dataRc) } diff --git a/routers/repo/http.go b/routers/repo/http.go index d22c0f87..4ffe5ec3 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -6,6 +6,8 @@ package repo import ( "bytes" + "encoding/base64" + "errors" "fmt" "io" "io/ioutil" @@ -19,16 +21,43 @@ import ( "strings" "time" - "github.com/go-martini/martini" "github.com/gogits/gogs/models" + "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/middleware" "github.com/gogits/gogs/modules/setting" ) -func Http(ctx *middleware.Context, params martini.Params) { - username := params["username"] - reponame := params["reponame"] +func basicEncode(username, password string) string { + auth := username + ":" + password + return base64.StdEncoding.EncodeToString([]byte(auth)) +} + +func basicDecode(encoded string) (user string, name string, err error) { + var s []byte + s, err = base64.StdEncoding.DecodeString(encoded) + if err != nil { + return user, name, err + } + + a := strings.Split(string(s), ":") + if len(a) == 2 { + user, name = a[0], a[1] + } else { + err = errors.New("decode failed") + } + return user, name, err +} + +func authRequired(ctx *middleware.Context) { + ctx.Resp.Header().Set("WWW-Authenticate", "Basic realm=\".\"") + ctx.Data["ErrorMsg"] = "no basic auth and digit auth" + ctx.HTML(401, base.TplName("status/401")) +} + +func Http(ctx *middleware.Context) { + username := ctx.Params(":username") + reponame := ctx.Params(":reponame") if strings.HasSuffix(reponame, ".git") { reponame = reponame[:len(reponame)-4] } @@ -50,7 +79,7 @@ func Http(ctx *middleware.Context, params martini.Params) { if err == models.ErrUserNotExist { ctx.Handle(404, "repo.Http(GetUserByName)", nil) } else { - ctx.Handle(500, "repo.Http(GetUserByName)", nil) + ctx.Handle(500, "repo.Http(GetUserByName)", err) } return } @@ -60,7 +89,7 @@ func Http(ctx *middleware.Context, params martini.Params) { if err == models.ErrRepoNotExist { ctx.Handle(404, "repo.Http(GetRepositoryByName)", nil) } else { - ctx.Handle(500, "repo.Http(GetRepositoryByName)", nil) + ctx.Handle(500, "repo.Http(GetRepositoryByName)", err) } return } @@ -75,7 +104,6 @@ func Http(ctx *middleware.Context, params martini.Params) { if askAuth { baHead := ctx.Req.Header.Get("Authorization") if baHead == "" { - // ask auth authRequired(ctx) return } @@ -142,7 +170,7 @@ func Http(ctx *middleware.Context, params martini.Params) { if head[0] == '0' && head[1] == '0' { size, err := strconv.ParseInt(string(input[lastLine+2:lastLine+4]), 16, 32) if err != nil { - log.Error("%v", err) + log.Error(4, "%v", err) return } @@ -166,7 +194,6 @@ func Http(ctx *middleware.Context, params martini.Params) { } lastLine = lastLine + size } else { - //fmt.Println("ddddddddddd") break } } @@ -176,7 +203,7 @@ func Http(ctx *middleware.Context, params martini.Params) { config := Config{setting.RepoRootPath, "git", true, true, f} handler := HttpBackend(&config) - handler(ctx.ResponseWriter, ctx.Req) + handler(ctx.Resp, ctx.Req) } type route struct { @@ -229,7 +256,7 @@ func HttpBackend(config *Config) http.HandlerFunc { dir, err := getGitDir(config, m[1]) if err != nil { - log.GitLogger.Error(err.Error()) + log.GitLogger.Error(4, err.Error()) renderNotFound(w) return } @@ -283,7 +310,7 @@ func serviceRpc(rpc string, hr handler) { err := cmd.Run() if err != nil { - log.GitLogger.Error(err.Error()) + log.GitLogger.Error(4, err.Error()) return } @@ -366,7 +393,7 @@ func getGitDir(config *Config, fPath string) (string, error) { cwd, err := os.Getwd() if err != nil { - log.GitLogger.Error(err.Error()) + log.GitLogger.Error(4, err.Error()) return "", err } @@ -443,7 +470,7 @@ func gitCommand(gitBinPath, dir string, args ...string) []byte { out, err := command.Output() if err != nil { - log.GitLogger.Error(err.Error()) + log.GitLogger.Error(4, err.Error()) } return out diff --git a/routers/repo/issue.go b/routers/repo/issue.go index c033e0f3..ab9b2b64 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -9,13 +9,12 @@ import ( "fmt" "io" "io/ioutil" - "mime" + "net/http" "net/url" "strings" "time" "github.com/Unknwon/com" - "github.com/go-martini/martini" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/auth" @@ -74,7 +73,7 @@ func Issues(ctx *middleware.Context) { } var mid int64 - midx, _ := base.StrTo(ctx.Query("milestone")).Int64() + midx, _ := com.StrTo(ctx.Query("milestone")).Int64() if midx > 0 { mile, err := models.GetMilestoneByIndex(ctx.Repo.Repository.Id, midx) if err != nil { @@ -95,7 +94,7 @@ func Issues(ctx *middleware.Context) { } ctx.Data["Labels"] = labels - page, _ := base.StrTo(ctx.Query("page")).Int() + page, _ := com.StrTo(ctx.Query("page")).Int() // Get issues. issues, err := models.GetIssues(assigneeId, ctx.Repo.Repository.Id, posterId, mid, page, @@ -115,7 +114,7 @@ func Issues(ctx *middleware.Context) { // Get posters. for i := range issues { if err = issues[i].GetLabels(); err != nil { - ctx.Handle(500, "issue.Issues(GetLabels)", fmt.Errorf("[#%d]%v", issues[i].Id, err)) + ctx.Handle(500, "GetLabels", fmt.Errorf("[#%d]%v", issues[i].Id, err)) return } @@ -143,7 +142,7 @@ func Issues(ctx *middleware.Context) { } issueStats := models.GetIssueStats(ctx.Repo.Repository.Id, uid, isShowClosed, filterMode) ctx.Data["IssueStats"] = issueStats - ctx.Data["SelectLabels"], _ = base.StrTo(selectLabels).Int64() + ctx.Data["SelectLabels"], _ = com.StrTo(selectLabels).Int64() ctx.Data["ViewType"] = viewType ctx.Data["Issues"] = issues ctx.Data["IsShowClosed"] = isShowClosed @@ -156,7 +155,7 @@ func Issues(ctx *middleware.Context) { ctx.HTML(200, ISSUES) } -func CreateIssue(ctx *middleware.Context, params martini.Params) { +func CreateIssue(ctx *middleware.Context) { ctx.Data["Title"] = "Create issue" ctx.Data["IsRepoToolbarIssues"] = true ctx.Data["IsRepoToolbarIssuesList"] = false @@ -187,34 +186,46 @@ func CreateIssue(ctx *middleware.Context, params martini.Params) { ctx.HTML(200, ISSUE_CREATE) } -func CreateIssuePost(ctx *middleware.Context, params martini.Params, form auth.CreateIssueForm) { - ctx.Data["Title"] = "Create issue" - ctx.Data["IsRepoToolbarIssues"] = true - ctx.Data["IsRepoToolbarIssuesList"] = false - ctx.Data["AttachmentsEnabled"] = setting.AttachmentEnabled +func CreateIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) { + send := func(status int, data interface{}, err error) { + if err != nil { + log.Error(4, "issue.CreateIssuePost(?): %s", err) + + ctx.JSON(status, map[string]interface{}{ + "ok": false, + "status": status, + "error": err.Error(), + }) + } else { + ctx.JSON(status, map[string]interface{}{ + "ok": true, + "status": status, + "data": data, + }) + } + } var err error // Get all milestones. - ctx.Data["OpenMilestones"], err = models.GetMilestones(ctx.Repo.Repository.Id, false) + _, err = models.GetMilestones(ctx.Repo.Repository.Id, false) if err != nil { - ctx.Handle(500, "issue.ViewIssue(GetMilestones.1): %v", err) + send(500, nil, err) return } - ctx.Data["ClosedMilestones"], err = models.GetMilestones(ctx.Repo.Repository.Id, true) + _, err = models.GetMilestones(ctx.Repo.Repository.Id, true) if err != nil { - ctx.Handle(500, "issue.ViewIssue(GetMilestones.2): %v", err) + send(500, nil, err) return } - us, err := models.GetCollaborators(strings.TrimPrefix(ctx.Repo.RepoLink, "/")) + _, err = models.GetCollaborators(strings.TrimPrefix(ctx.Repo.RepoLink, "/")) if err != nil { - ctx.Handle(500, "issue.CreateIssue(GetCollaborators)", err) + send(500, nil, err) return } - ctx.Data["Collaborators"] = us if ctx.HasError() { - ctx.HTML(200, ISSUE_CREATE) + send(400, nil, errors.New(ctx.Flash.ErrorMsg)) return } @@ -233,11 +244,11 @@ func CreateIssuePost(ctx *middleware.Context, params martini.Params, form auth.C Content: form.Content, } if err := models.NewIssue(issue); err != nil { - ctx.Handle(500, "issue.CreateIssue(NewIssue)", err) + send(500, nil, err) return } else if err := models.NewIssueUserPairs(issue.RepoId, issue.Id, ctx.Repo.Owner.Id, ctx.User.Id, form.AssigneeId, ctx.Repo.Repository.Name); err != nil { - ctx.Handle(500, "issue.CreateIssue(NewIssueUserPairs)", err) + send(500, nil, err) return } @@ -252,9 +263,8 @@ func CreateIssuePost(ctx *middleware.Context, params martini.Params, form auth.C ms[i] = ms[i][1:] } - ids := models.GetUserIdsByNames(ms) - if err := models.UpdateIssueUserPairsByMentions(ids, issue.Id); err != nil { - ctx.Handle(500, "issue.CreateIssue(UpdateIssueUserPairsByMentions)", err) + if err := models.UpdateMentions(ms, issue.Id); err != nil { + send(500, nil, err) return } } @@ -263,7 +273,7 @@ func CreateIssuePost(ctx *middleware.Context, params martini.Params, form auth.C ActUserId: ctx.User.Id, ActUserName: ctx.User.Name, ActEmail: ctx.User.Email, - OpType: models.OP_CREATE_ISSUE, + OpType: models.CREATE_ISSUE, Content: fmt.Sprintf("%d|%s", issue.Index, issue.Name), RepoId: ctx.Repo.Repository.Id, RepoUserName: ctx.Repo.Owner.Name, @@ -273,7 +283,7 @@ func CreateIssuePost(ctx *middleware.Context, params martini.Params, form auth.C } // Notify watchers. if err := models.NotifyWatchers(act); err != nil { - ctx.Handle(500, "issue.CreateIssue(NotifyWatchers)", err) + send(500, nil, err) return } @@ -281,7 +291,7 @@ func CreateIssuePost(ctx *middleware.Context, params martini.Params, form auth.C if setting.Service.EnableNotifyMail { tos, err := mailer.SendIssueNotifyMail(ctx.User, ctx.Repo.Owner, ctx.Repo.Repository, issue) if err != nil { - ctx.Handle(500, "issue.CreateIssue(SendIssueNotifyMail)", err) + send(500, nil, err) return } @@ -296,13 +306,13 @@ func CreateIssuePost(ctx *middleware.Context, params martini.Params, form auth.C } if err = mailer.SendIssueMentionMail(ctx.Render, ctx.User, ctx.Repo.Owner, ctx.Repo.Repository, issue, models.GetUserEmailsByNames(newTos)); err != nil { - ctx.Handle(500, "issue.CreateIssue(SendIssueMentionMail)", err) + send(500, nil, err) return } } log.Trace("%d Issue created: %d", ctx.Repo.Repository.Id, issue.Id) - ctx.Redirect(fmt.Sprintf("/%s/%s/issues/%d", params["username"], params["reponame"], issue.Index)) + send(200, fmt.Sprintf("/%s/%s/issues/%d", ctx.Params(":username"), ctx.Params(":reponame"), issue.Index), nil) } func checkLabels(labels, allLabels []*models.Label) { @@ -316,10 +326,10 @@ func checkLabels(labels, allLabels []*models.Label) { } } -func ViewIssue(ctx *middleware.Context, params martini.Params) { +func ViewIssue(ctx *middleware.Context) { ctx.Data["AttachmentsEnabled"] = setting.AttachmentEnabled - idx, _ := base.StrTo(params["index"]).Int64() + idx := com.StrTo(ctx.Params(":index")).MustInt64() if idx == 0 { ctx.Handle(404, "issue.ViewIssue", nil) return @@ -430,8 +440,8 @@ func ViewIssue(ctx *middleware.Context, params martini.Params) { ctx.HTML(200, ISSUE_VIEW) } -func UpdateIssue(ctx *middleware.Context, params martini.Params, form auth.CreateIssueForm) { - idx, _ := base.StrTo(params["index"]).Int64() +func UpdateIssue(ctx *middleware.Context, form auth.CreateIssueForm) { + idx := com.StrTo(ctx.Params(":index")).MustInt64() if idx <= 0 { ctx.Error(404) return @@ -473,13 +483,13 @@ func UpdateIssue(ctx *middleware.Context, params martini.Params, form auth.Creat }) } -func UpdateIssueLabel(ctx *middleware.Context, params martini.Params) { +func UpdateIssueLabel(ctx *middleware.Context) { if !ctx.Repo.IsOwner { ctx.Error(403) return } - idx, _ := base.StrTo(params["index"]).Int64() + idx := com.StrTo(ctx.Params(":index")).MustInt64() if idx <= 0 { ctx.Error(404) return @@ -497,7 +507,7 @@ func UpdateIssueLabel(ctx *middleware.Context, params martini.Params) { isAttach := ctx.Query("action") == "attach" labelStrId := ctx.Query("id") - labelId, _ := base.StrTo(labelStrId).Int64() + labelId := com.StrTo(labelStrId).MustInt64() label, err := models.GetLabelById(labelId) if err != nil { if err == models.ErrLabelNotExist { @@ -555,8 +565,8 @@ func UpdateIssueMilestone(ctx *middleware.Context) { return } - issueId, err := base.StrTo(ctx.Query("issue")).Int64() - if err != nil { + issueId := com.StrTo(ctx.Params(":issue")).MustInt64() + if issueId == 0 { ctx.Error(404) return } @@ -572,7 +582,7 @@ func UpdateIssueMilestone(ctx *middleware.Context) { } oldMid := issue.MilestoneId - mid, _ := base.StrTo(ctx.Query("milestone")).Int64() + mid := com.StrTo(ctx.Params(":milestone")).MustInt64() if oldMid == mid { ctx.JSON(200, map[string]interface{}{ "ok": true, @@ -601,8 +611,8 @@ func UpdateAssignee(ctx *middleware.Context) { return } - issueId, err := base.StrTo(ctx.Query("issue")).Int64() - if err != nil { + issueId := com.StrTo(ctx.Params(":index")).MustInt64() + if issueId == 0 { ctx.Error(404) return } @@ -610,21 +620,21 @@ func UpdateAssignee(ctx *middleware.Context) { issue, err := models.GetIssueById(issueId) if err != nil { if err == models.ErrIssueNotExist { - ctx.Handle(404, "issue.UpdateAssignee(GetIssueById)", err) + ctx.Handle(404, "GetIssueById", err) } else { - ctx.Handle(500, "issue.UpdateAssignee(GetIssueById)", err) + ctx.Handle(500, "GetIssueById", err) } return } - aid, _ := base.StrTo(ctx.Query("assigneeid")).Int64() + aid := com.StrTo(ctx.Params(":assigneeid")).MustInt64() // Not check for invalid assignne id and give responsibility to owners. issue.AssigneeId = aid if err = models.UpdateIssueUserPairByAssignee(aid, issue.Id); err != nil { - ctx.Handle(500, "issue.UpdateAssignee(UpdateIssueUserPairByAssignee): %v", err) + ctx.Handle(500, "UpdateIssueUserPairByAssignee: %v", err) return } else if err = models.UpdateIssue(issue); err != nil { - ctx.Handle(500, "issue.UpdateAssignee(UpdateIssue)", err) + ctx.Handle(500, "UpdateIssue", err) return } @@ -656,8 +666,15 @@ func uploadFiles(ctx *middleware.Context, issueId, commentId int64) { defer file.Close() + buf := make([]byte, 1024) + n, _ := file.Read(buf) + if n > 0 { + buf = buf[:n] + } + fileType := http.DetectContentType(buf) + fmt.Println(fileType) + allowed := false - fileType := mime.TypeByExtension(header.Filename) for _, t := range allowedTypes { t := strings.Trim(t, " ") @@ -676,42 +693,60 @@ func uploadFiles(ctx *middleware.Context, issueId, commentId int64) { out, err := ioutil.TempFile(setting.AttachmentPath, "attachment_") if err != nil { - ctx.Handle(500, "issue.Comment(ioutil.TempFile)", err) + ctx.Handle(500, "ioutil.TempFile", err) return } defer out.Close() + out.Write(buf) _, err = io.Copy(out, file) - if err != nil { - ctx.Handle(500, "issue.Comment(io.Copy)", err) + ctx.Handle(500, "io.Copy", err) return } _, err = models.CreateAttachment(issueId, commentId, header.Filename, out.Name()) - if err != nil { - ctx.Handle(500, "issue.Comment(io.Copy)", err) + ctx.Handle(500, "CreateAttachment", err) return } } } -func Comment(ctx *middleware.Context, params martini.Params) { - index, err := base.StrTo(ctx.Query("issueIndex")).Int64() - if err != nil { - ctx.Handle(404, "issue.Comment(get index)", err) +func Comment(ctx *middleware.Context) { + send := func(status int, data interface{}, err error) { + if err != nil { + log.Error(4, "issue.Comment(?): %s", err) + + ctx.JSON(status, map[string]interface{}{ + "ok": false, + "status": status, + "error": err.Error(), + }) + } else { + ctx.JSON(status, map[string]interface{}{ + "ok": true, + "status": status, + "data": data, + }) + } + } + + index := com.StrTo(ctx.Query("issueIndex")).MustInt64() + if index == 0 { + ctx.Error(404) return } issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, index) if err != nil { if err == models.ErrIssueNotExist { - ctx.Handle(404, "issue.Comment", err) + send(404, nil, err) } else { - ctx.Handle(200, "issue.Comment(get issue)", err) + send(200, nil, err) } + return } @@ -725,17 +760,17 @@ func Comment(ctx *middleware.Context, params martini.Params) { (strings.Contains(newStatus, "Close") && !issue.IsClosed) { issue.IsClosed = !issue.IsClosed if err = models.UpdateIssue(issue); err != nil { - ctx.Handle(500, "issue.Comment(UpdateIssue)", err) + send(500, nil, err) return } else if err = models.UpdateIssueUserPairsByStatus(issue.Id, issue.IsClosed); err != nil { - ctx.Handle(500, "issue.Comment(UpdateIssueUserPairsByStatus)", err) + send(500, nil, err) return } // Change open/closed issue counter for the associated milestone if issue.MilestoneId > 0 { if err = models.ChangeMilestoneIssueStats(issue); err != nil { - ctx.Handle(500, "issue.Comment(ChangeMilestoneIssueStats)", err) + send(500, nil, err) } } @@ -745,7 +780,7 @@ func Comment(ctx *middleware.Context, params martini.Params) { } if _, err = models.CreateComment(ctx.User.Id, ctx.Repo.Repository.Id, issue.Id, 0, 0, cmtType, "", nil); err != nil { - ctx.Handle(200, "issue.Comment(create status change comment)", err) + send(200, nil, err) return } log.Trace("%s Issue(%d) status changed: %v", ctx.Req.RequestURI, issue.Id, !issue.IsClosed) @@ -756,11 +791,12 @@ func Comment(ctx *middleware.Context, params martini.Params) { var ms []string content := ctx.Query("content") - if len(content) > 0 { - switch params["action"] { + // Fix #321. Allow empty comments, as long as we have attachments. + if len(content) > 0 || len(ctx.Req.MultipartForm.File["attachments"]) > 0 { + switch ctx.Params(":action") { case "new": if comment, err = models.CreateComment(ctx.User.Id, ctx.Repo.Repository.Id, issue.Id, 0, 0, models.COMMENT, content, nil); err != nil { - ctx.Handle(500, "issue.Comment(create comment)", err) + send(500, nil, err) return } @@ -771,9 +807,8 @@ func Comment(ctx *middleware.Context, params martini.Params) { ms[i] = ms[i][1:] } - ids := models.GetUserIdsByNames(ms) - if err := models.UpdateIssueUserPairsByMentions(ids, issue.Id); err != nil { - ctx.Handle(500, "issue.CreateIssue(UpdateIssueUserPairsByMentions)", err) + if err := models.UpdateMentions(ms, issue.Id); err != nil { + send(500, nil, err) return } } @@ -794,14 +829,14 @@ func Comment(ctx *middleware.Context, params martini.Params) { ActUserId: ctx.User.Id, ActUserName: ctx.User.LowerName, ActEmail: ctx.User.Email, - OpType: models.OP_COMMENT_ISSUE, + OpType: models.COMMENT_ISSUE, Content: fmt.Sprintf("%d|%s", issue.Index, strings.Split(content, "\n")[0]), RepoId: ctx.Repo.Repository.Id, RepoUserName: ctx.Repo.Owner.LowerName, RepoName: ctx.Repo.Repository.LowerName, } if err = models.NotifyWatchers(act); err != nil { - ctx.Handle(500, "issue.CreateIssue(NotifyWatchers)", err) + send(500, nil, err) return } @@ -810,7 +845,7 @@ func Comment(ctx *middleware.Context, params martini.Params) { issue.Content = content tos, err := mailer.SendIssueNotifyMail(ctx.User, ctx.Repo.Owner, ctx.Repo.Repository, issue) if err != nil { - ctx.Handle(500, "issue.Comment(SendIssueNotifyMail)", err) + send(500, nil, err) return } @@ -825,12 +860,12 @@ func Comment(ctx *middleware.Context, params martini.Params) { } if err = mailer.SendIssueMentionMail(ctx.Render, ctx.User, ctx.Repo.Owner, ctx.Repo.Repository, issue, models.GetUserEmailsByNames(newTos)); err != nil { - ctx.Handle(500, "issue.Comment(SendIssueMentionMail)", err) + send(500, nil, err) return } } - ctx.Redirect(fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, index)) + send(200, fmt.Sprintf("%s/issues/%d", ctx.Repo.RepoLink, index), nil) } func NewLabel(ctx *middleware.Context, form auth.CreateLabelForm) { @@ -851,8 +886,8 @@ func NewLabel(ctx *middleware.Context, form auth.CreateLabelForm) { ctx.Redirect(ctx.Repo.RepoLink + "/issues") } -func UpdateLabel(ctx *middleware.Context, params martini.Params, form auth.CreateLabelForm) { - id, _ := base.StrTo(ctx.Query("id")).Int64() +func UpdateLabel(ctx *middleware.Context, form auth.CreateLabelForm) { + id := com.StrTo(ctx.Query("id")).MustInt64() if id == 0 { ctx.Error(404) return @@ -961,12 +996,12 @@ func NewMilestonePost(ctx *middleware.Context, form auth.CreateMilestoneForm) { ctx.Redirect(ctx.Repo.RepoLink + "/issues/milestones") } -func UpdateMilestone(ctx *middleware.Context, params martini.Params) { +func UpdateMilestone(ctx *middleware.Context) { ctx.Data["Title"] = "Update Milestone" ctx.Data["IsRepoToolbarIssues"] = true ctx.Data["IsRepoToolbarIssuesList"] = true - idx, _ := base.StrTo(params["index"]).Int64() + idx := com.StrTo(ctx.Params(":index")).MustInt64() if idx == 0 { ctx.Handle(404, "issue.UpdateMilestone", nil) return @@ -982,7 +1017,7 @@ func UpdateMilestone(ctx *middleware.Context, params martini.Params) { return } - action := params["action"] + action := ctx.Params(":action") if len(action) > 0 { switch action { case "open": @@ -1019,12 +1054,12 @@ func UpdateMilestone(ctx *middleware.Context, params martini.Params) { ctx.HTML(200, MILESTONE_EDIT) } -func UpdateMilestonePost(ctx *middleware.Context, params martini.Params, form auth.CreateMilestoneForm) { +func UpdateMilestonePost(ctx *middleware.Context, form auth.CreateMilestoneForm) { ctx.Data["Title"] = "Update Milestone" ctx.Data["IsRepoToolbarIssues"] = true ctx.Data["IsRepoToolbarIssuesList"] = true - idx, _ := base.StrTo(params["index"]).Int64() + idx := com.StrTo(ctx.Params(":index")).MustInt64() if idx == 0 { ctx.Handle(404, "issue.UpdateMilestonePost", nil) return @@ -1066,11 +1101,10 @@ func UpdateMilestonePost(ctx *middleware.Context, params martini.Params, form au ctx.Redirect(ctx.Repo.RepoLink + "/issues/milestones") } -func IssueGetAttachment(ctx *middleware.Context, params martini.Params) { - id, err := base.StrTo(params["id"]).Int64() - - if err != nil { - ctx.Handle(400, "issue.IssueGetAttachment(base.StrTo.Int64)", err) +func IssueGetAttachment(ctx *middleware.Context) { + id := com.StrTo(ctx.Params(":id")).MustInt64() + if id == 0 { + ctx.Error(404) return } @@ -1081,5 +1115,7 @@ func IssueGetAttachment(ctx *middleware.Context, params martini.Params) { return } - ctx.ServeFile(attachment.Path, attachment.Name) + // Fix #312. Attachments with , in their name are not handled correctly by Google Chrome. + // We must put the name in " manually. + ctx.ServeFile(attachment.Path, "\""+attachment.Name+"\"") } diff --git a/routers/repo/pull.go b/routers/repo/pull.go index db208f9f..d379a54e 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -5,8 +5,6 @@ package repo import ( - "github.com/go-martini/martini" - "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/middleware" ) @@ -15,7 +13,7 @@ const ( PULLS base.TplName = "repo/pulls" ) -func Pulls(ctx *middleware.Context, params martini.Params) { +func Pulls(ctx *middleware.Context) { ctx.Data["IsRepoToolbarPulls"] = true ctx.HTML(200, PULLS) } diff --git a/routers/repo/release.go b/routers/repo/release.go index a901436f..addeb1ce 100644 --- a/routers/repo/release.go +++ b/routers/repo/release.go @@ -5,8 +5,6 @@ package repo import ( - "github.com/go-martini/martini" - "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/base" @@ -54,7 +52,7 @@ func Releases(ctx *middleware.Context) { if rel.TagName == rawTag { rel.Publisher, err = models.GetUserById(rel.PublisherId) if err != nil { - ctx.Handle(500, "release.Releases(GetUserById)", err) + ctx.Handle(500, "GetUserById", err) return } // Get corresponding target if it's not the current branch. @@ -63,12 +61,12 @@ func Releases(ctx *middleware.Context) { if _, ok := countCache[rel.Target]; !ok { commit, err := ctx.Repo.GitRepo.GetCommitOfTag(rel.TagName) if err != nil { - ctx.Handle(500, "release.Releases(GetCommitOfTag)", err) + ctx.Handle(500, "GetCommitOfTag", err) return } countCache[rel.Target], err = commit.CommitsCount() if err != nil { - ctx.Handle(500, "release.Releases(CommitsCount2)", err) + ctx.Handle(500, "CommitsCount2", err) return } } @@ -86,7 +84,7 @@ func Releases(ctx *middleware.Context) { if tags[i] == nil { commit, err := ctx.Repo.GitRepo.GetCommitOfTag(rawTag) if err != nil { - ctx.Handle(500, "release.Releases(GetCommitOfTag2)", err) + ctx.Handle(500, "GetCommitOfTag2", err) return } @@ -98,7 +96,7 @@ func Releases(ctx *middleware.Context) { tags[i].NumCommits, err = ctx.Repo.GitRepo.CommitsCount(commit.Id.String()) if err != nil { - ctx.Handle(500, "release.Releases(CommitsCount)", err) + ctx.Handle(500, "CommitsCount", err) return } tags[i].NumCommitsBehind = commitsCount - tags[i].NumCommits @@ -173,13 +171,13 @@ func NewReleasePost(ctx *middleware.Context, form auth.NewReleaseForm) { ctx.Redirect(ctx.Repo.RepoLink + "/releases") } -func EditRelease(ctx *middleware.Context, params martini.Params) { +func EditRelease(ctx *middleware.Context) { if !ctx.Repo.IsOwner { ctx.Handle(403, "release.ReleasesEdit", nil) return } - tagName := params["tagname"] + tagName := ctx.Params(":tagname") rel, err := models.GetRelease(ctx.Repo.Repository.Id, tagName) if err != nil { if err == models.ErrReleaseNotExist { @@ -196,13 +194,13 @@ func EditRelease(ctx *middleware.Context, params martini.Params) { ctx.HTML(200, RELEASE_EDIT) } -func EditReleasePost(ctx *middleware.Context, params martini.Params, form auth.EditReleaseForm) { +func EditReleasePost(ctx *middleware.Context, form auth.EditReleaseForm) { if !ctx.Repo.IsOwner { ctx.Handle(403, "release.EditReleasePost", nil) return } - tagName := params["tagname"] + tagName := ctx.Params(":tagname") rel, err := models.GetRelease(ctx.Repo.Repository.Id, tagName) if err != nil { if err == models.ErrReleaseNotExist { diff --git a/routers/repo/repo.go b/routers/repo/repo.go index 44a2b84f..8de1e093 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -5,22 +5,17 @@ package repo import ( - "bytes" - "encoding/base64" - "errors" "fmt" - "io/ioutil" + "os" "path" - "path/filepath" "strings" - "github.com/go-martini/martini" - - "github.com/gogits/git" + "github.com/Unknwon/com" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/base" + "github.com/gogits/gogs/modules/git" "github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/middleware" ) @@ -28,17 +23,20 @@ import ( const ( CREATE base.TplName = "repo/create" MIGRATE base.TplName = "repo/migrate" - SINGLE base.TplName = "repo/single" ) func Create(ctx *middleware.Context) { - ctx.Data["Title"] = "Create repository" - ctx.Data["PageIsNewRepo"] = true - ctx.Data["LanguageIgns"] = models.LanguageIgns + ctx.Data["Title"] = ctx.Tr("new_repo") + ctx.Data["PageIsRepoCreate"] = true + + // Give default value for template to render. + ctx.Data["gitignore"] = "0" + ctx.Data["license"] = "0" + ctx.Data["Gitignores"] = models.Gitignores ctx.Data["Licenses"] = models.Licenses ctxUser := ctx.User - orgId, _ := base.StrTo(ctx.Query("org")).Int64() + orgId := com.StrTo(ctx.Query("org")).MustInt64() if orgId > 0 { org, err := models.GetUserById(orgId) if err != nil && err != models.ErrUserNotExist { @@ -59,11 +57,24 @@ func Create(ctx *middleware.Context) { } func CreatePost(ctx *middleware.Context, form auth.CreateRepoForm) { - ctx.Data["Title"] = "Create repository" - ctx.Data["PageIsNewRepo"] = true - ctx.Data["LanguageIgns"] = models.LanguageIgns + ctx.Data["Title"] = ctx.Tr("new_repo") + ctx.Data["PageIsRepoCreate"] = true + + ctx.Data["Gitignores"] = models.Gitignores ctx.Data["Licenses"] = models.Licenses + ctxUser := ctx.User + orgId := com.StrTo(ctx.Query("org")).MustInt64() + if orgId > 0 { + org, err := models.GetUserById(orgId) + if err != nil && err != models.ErrUserNotExist { + ctx.Handle(500, "home.Dashboard(GetUserById)", err) + return + } + ctxUser = org + } + ctx.Data["ContextUser"] = ctxUser + if err := ctx.User.GetOrganizations(); err != nil { ctx.Handle(500, "home.CreatePost(GetOrganizations)", err) return @@ -97,25 +108,25 @@ func CreatePost(ctx *middleware.Context, form auth.CreateRepoForm) { } repo, err := models.CreateRepository(u, form.RepoName, form.Description, - form.Language, form.License, form.Private, false, form.InitReadme) + form.Gitignore, form.License, form.Private, false, form.InitReadme) if err == nil { - log.Trace("%s Repository created: %s/%s", ctx.Req.RequestURI, u.LowerName, form.RepoName) + log.Trace("Repository created: %s/%s", u.Name, form.RepoName) ctx.Redirect("/" + u.Name + "/" + form.RepoName) return } else if err == models.ErrRepoAlreadyExist { - ctx.RenderWithErr("Repository name has already been used", CREATE, &form) + ctx.RenderWithErr(ctx.Tr("form.repo_name_been_taken"), CREATE, &form) return } else if err == models.ErrRepoNameIllegal { - ctx.RenderWithErr(models.ErrRepoNameIllegal.Error(), CREATE, &form) + ctx.RenderWithErr(ctx.Tr("form.illegal_repo_name"), CREATE, &form) return } if repo != nil { if errDelete := models.DeleteRepository(u.Id, repo.Id, u.Name); errDelete != nil { - log.Error("repo.CreatePost(DeleteRepository): %v", errDelete) + log.Error(4, "DeleteRepository: %v", errDelete) } } - ctx.Handle(500, "repo.CreatePost(CreateRepository)", err) + ctx.Handle(500, "CreateRepository", err) } func Migrate(ctx *middleware.Context) { @@ -180,7 +191,7 @@ func MigratePost(ctx *middleware.Context, form auth.MigrateRepoForm) { if repo != nil { if errDelete := models.DeleteRepository(u.Id, repo.Id, u.Name); errDelete != nil { - log.Error("repo.MigratePost(DeleteRepository): %v", errDelete) + log.Error(4, "DeleteRepository: %v", errDelete) } } @@ -188,246 +199,68 @@ func MigratePost(ctx *middleware.Context, form auth.MigrateRepoForm) { ctx.RenderWithErr(err.Error(), MIGRATE, &form) return } - ctx.Handle(500, "repo.Migrate(MigrateRepository)", err) + ctx.Handle(500, "MigrateRepository", err) } -func Single(ctx *middleware.Context, params martini.Params) { - branchName := ctx.Repo.BranchName - userName := ctx.Repo.Owner.Name - repoName := ctx.Repo.Repository.Name - - repoLink := ctx.Repo.RepoLink - branchLink := ctx.Repo.RepoLink + "/src/" + branchName - rawLink := ctx.Repo.RepoLink + "/raw/" + branchName - - // Get tree path - treename := params["_1"] - - if len(treename) > 0 && treename[len(treename)-1] == '/' { - ctx.Redirect(repoLink + "/src/" + branchName + "/" + treename[:len(treename)-1]) +// func Action(ctx *middleware.Context, params martini.Params) { +// var err error +// switch params["action"] { +// case "watch": +// err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.Id, true) +// case "unwatch": +// err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.Id, false) +// case "desc": +// if !ctx.Repo.IsOwner { +// ctx.Error(404) +// return +// } + +// ctx.Repo.Repository.Description = ctx.Query("desc") +// ctx.Repo.Repository.Website = ctx.Query("site") +// err = models.UpdateRepository(ctx.Repo.Repository) +// } + +// if err != nil { +// log.Error("repo.Action(%s): %v", params["action"], err) +// ctx.JSON(200, map[string]interface{}{ +// "ok": false, +// "err": err.Error(), +// }) +// return +// } +// ctx.JSON(200, map[string]interface{}{ +// "ok": true, +// }) +// } + +func Download(ctx *middleware.Context) { + ext := "." + ctx.Params(":ext") + + var archivePath string + switch ext { + case ".zip": + archivePath = path.Join(ctx.Repo.GitRepo.Path, "archives/zip") + case ".tar.gz": + archivePath = path.Join(ctx.Repo.GitRepo.Path, "archives/targz") + default: + ctx.Error(404) return } - ctx.Data["IsRepoToolbarSource"] = true - - isViewBranch := ctx.Repo.IsBranch - ctx.Data["IsViewBranch"] = isViewBranch - - treePath := treename - if len(treePath) != 0 { - treePath = treePath + "/" - } - - entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treename) - if err != nil && err != git.ErrNotExist { - ctx.Handle(404, "repo.Single(GetTreeEntryByPath)", err) - return - } - - if len(treename) != 0 && entry == nil { - ctx.Handle(404, "repo.Single", nil) - return - } - - if entry != nil && !entry.IsDir() { - blob := entry.Blob() - - if dataRc, err := blob.Data(); err != nil { - ctx.Handle(404, "repo.Single(blob.Data)", err) - } else { - ctx.Data["FileSize"] = blob.Size() - ctx.Data["IsFile"] = true - ctx.Data["FileName"] = blob.Name() - ext := path.Ext(blob.Name()) - if len(ext) > 0 { - ext = ext[1:] - } - ctx.Data["FileExt"] = ext - ctx.Data["FileLink"] = rawLink + "/" + treename - - buf := make([]byte, 1024) - n, _ := dataRc.Read(buf) - if n > 0 { - buf = buf[:n] - } - - defer func() { - dataRc.Close() - }() - - _, isTextFile := base.IsTextFile(buf) - _, isImageFile := base.IsImageFile(buf) - ctx.Data["FileIsText"] = isTextFile - - switch { - case isImageFile: - ctx.Data["IsImageFile"] = true - case isTextFile: - d, _ := ioutil.ReadAll(dataRc) - buf = append(buf, d...) - readmeExist := base.IsMarkdownFile(blob.Name()) || base.IsReadmeFile(blob.Name()) - ctx.Data["ReadmeExist"] = readmeExist - if readmeExist { - ctx.Data["FileContent"] = string(base.RenderMarkdown(buf, "")) - } else { - ctx.Data["FileContent"] = string(buf) - } - } - } - - } else { - // Directory and file list. - tree, err := ctx.Repo.Commit.SubTree(treename) - if err != nil { - ctx.Handle(404, "repo.Single(SubTree)", err) + if !com.IsDir(archivePath) { + if err := os.MkdirAll(archivePath, os.ModePerm); err != nil { + ctx.Handle(500, "Download -> os.MkdirAll(archivePath)", err) return } - entries := tree.ListEntries() - entries.Sort() - - files := make([][]interface{}, 0, len(entries)) - - for _, te := range entries { - c, err := ctx.Repo.Commit.GetCommitOfRelPath(filepath.Join(treePath, te.Name())) - if err != nil { - ctx.Handle(404, "repo.Single(SubTree)", err) - return - } - - files = append(files, []interface{}{te, c}) - } - - ctx.Data["Files"] = files - - var readmeFile *git.Blob - - for _, f := range entries { - if f.IsDir() || !base.IsReadmeFile(f.Name()) { - continue - } else { - readmeFile = f.Blob() - break - } - } - - if readmeFile != nil { - ctx.Data["ReadmeInSingle"] = true - ctx.Data["ReadmeExist"] = true - if dataRc, err := readmeFile.Data(); err != nil { - ctx.Handle(404, "repo.Single(readmeFile.LookupBlob)", err) - return - } else { - - buf := make([]byte, 1024) - n, _ := dataRc.Read(buf) - if n > 0 { - buf = buf[:n] - } - defer func() { - dataRc.Close() - }() - - ctx.Data["FileSize"] = readmeFile.Size - ctx.Data["FileLink"] = rawLink + "/" + treename - _, isTextFile := base.IsTextFile(buf) - ctx.Data["FileIsText"] = isTextFile - ctx.Data["FileName"] = readmeFile.Name() - if isTextFile { - d, _ := ioutil.ReadAll(dataRc) - buf = append(buf, d...) - switch { - case base.IsMarkdownFile(readmeFile.Name()): - buf = base.RenderMarkdown(buf, branchLink) - default: - buf = bytes.Replace(buf, []byte("\n"), []byte(`<br>`), -1) - } - ctx.Data["FileContent"] = string(buf) - } - } - } } - ctx.Data["Username"] = userName - ctx.Data["Reponame"] = repoName - - var treenames []string - Paths := make([]string, 0) - - if len(treename) > 0 { - treenames = strings.Split(treename, "/") - for i, _ := range treenames { - Paths = append(Paths, strings.Join(treenames[0:i+1], "/")) - } - - ctx.Data["HasParentPath"] = true - if len(Paths)-2 >= 0 { - ctx.Data["ParentPath"] = "/" + Paths[len(Paths)-2] - } - } - - ctx.Data["LastCommit"] = ctx.Repo.Commit - ctx.Data["Paths"] = Paths - ctx.Data["TreeName"] = treename - ctx.Data["Treenames"] = treenames - ctx.Data["TreePath"] = treePath - ctx.Data["BranchLink"] = branchLink - ctx.HTML(200, SINGLE) -} - -func basicEncode(username, password string) string { - auth := username + ":" + password - return base64.StdEncoding.EncodeToString([]byte(auth)) -} - -func basicDecode(encoded string) (user string, name string, err error) { - var s []byte - s, err = base64.StdEncoding.DecodeString(encoded) - if err != nil { - return - } - - a := strings.Split(string(s), ":") - if len(a) == 2 { - user, name = a[0], a[1] - } else { - err = errors.New("decode failed") - } - return -} - -func authRequired(ctx *middleware.Context) { - ctx.ResponseWriter.Header().Set("WWW-Authenticate", "Basic realm=\".\"") - ctx.Data["ErrorMsg"] = "no basic auth and digit auth" - ctx.HTML(401, base.TplName("status/401")) -} - -func Action(ctx *middleware.Context, params martini.Params) { - var err error - switch params["action"] { - case "watch": - err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.Id, true) - case "unwatch": - err = models.WatchRepo(ctx.User.Id, ctx.Repo.Repository.Id, false) - case "desc": - if !ctx.Repo.IsOwner { - ctx.Error(404) + archivePath = path.Join(archivePath, ctx.Repo.CommitId+ext) + if !com.IsFile(archivePath) { + if err := ctx.Repo.Commit.CreateArchive(archivePath, git.ZIP); err != nil { + ctx.Handle(500, "Download -> CreateArchive "+archivePath, err) return } - - ctx.Repo.Repository.Description = ctx.Query("desc") - ctx.Repo.Repository.Website = ctx.Query("site") - err = models.UpdateRepository(ctx.Repo.Repository) } - if err != nil { - log.Error("repo.Action(%s): %v", params["action"], err) - ctx.JSON(200, map[string]interface{}{ - "ok": false, - "err": err.Error(), - }) - return - } - ctx.JSON(200, map[string]interface{}{ - "ok": true, - }) + ctx.ServeFile(archivePath, ctx.Repo.Repository.Name+"-"+base.ShortSha(ctx.Repo.CommitId)+ext) } diff --git a/routers/repo/setting.go b/routers/repo/setting.go index 5a57f760..26f39134 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/go-martini/martini" + "github.com/Unknwon/com" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/auth" @@ -74,7 +74,7 @@ func SettingPost(ctx *middleware.Context, form auth.RepoSettingForm) { ctx.Repo.Repository.IsPrivate = form.Private ctx.Repo.Repository.IsGoget = form.GoGet if err := models.UpdateRepository(ctx.Repo.Repository); err != nil { - ctx.Handle(404, "setting.SettingPost(update)", err) + ctx.Handle(404, "UpdateRepository", err) return } log.Trace("%s Repository updated: %s/%s", ctx.Req.RequestURI, ctx.Repo.Owner.Name, ctx.Repo.Repository.Name) @@ -84,7 +84,7 @@ func SettingPost(ctx *middleware.Context, form auth.RepoSettingForm) { ctx.Repo.Mirror.Interval = form.Interval ctx.Repo.Mirror.NextUpdate = time.Now().Add(time.Duration(form.Interval) * time.Hour) if err := models.UpdateMirror(ctx.Repo.Mirror); err != nil { - log.Error("setting.SettingPost(UpdateMirror): %v", err) + log.Error(4, "UpdateMirror: %v", err) } } } @@ -227,7 +227,7 @@ func WebHooks(ctx *middleware.Context) { ctx.Data["Title"] = strings.TrimPrefix(ctx.Repo.RepoLink, "/") + " - Webhooks" // Delete webhook. - remove, _ := base.StrTo(ctx.Query("remove")).Int64() + remove := com.StrTo(ctx.Query("remove")).MustInt64() if remove > 0 { if err := models.DeleteWebhook(remove); err != nil { ctx.Handle(500, "setting.WebHooks(DeleteWebhook)", err) @@ -290,11 +290,11 @@ func WebHooksAddPost(ctx *middleware.Context, form auth.NewWebhookForm) { ctx.Redirect(ctx.Repo.RepoLink + "/settings/hooks") } -func WebHooksEdit(ctx *middleware.Context, params martini.Params) { +func WebHooksEdit(ctx *middleware.Context) { ctx.Data["IsRepoToolbarWebHooks"] = true ctx.Data["Title"] = strings.TrimPrefix(ctx.Repo.RepoLink, "/") + " - Webhook" - hookId, _ := base.StrTo(params["id"]).Int64() + hookId := com.StrTo(ctx.Params(":id")).MustInt64() if hookId == 0 { ctx.Handle(404, "setting.WebHooksEdit", nil) return @@ -315,11 +315,11 @@ func WebHooksEdit(ctx *middleware.Context, params martini.Params) { ctx.HTML(200, HOOK_EDIT) } -func WebHooksEditPost(ctx *middleware.Context, params martini.Params, form auth.NewWebhookForm) { +func WebHooksEditPost(ctx *middleware.Context, form auth.NewWebhookForm) { ctx.Data["IsRepoToolbarWebHooks"] = true ctx.Data["Title"] = strings.TrimPrefix(ctx.Repo.RepoLink, "/") + " - Webhook" - hookId, _ := base.StrTo(params["id"]).Int64() + hookId := com.StrTo(ctx.Params(":id")).MustInt64() if hookId == 0 { ctx.Handle(404, "setting.WebHooksEditPost", nil) return @@ -328,9 +328,9 @@ func WebHooksEditPost(ctx *middleware.Context, params martini.Params, form auth. w, err := models.GetWebhookById(hookId) if err != nil { if err == models.ErrWebhookNotExist { - ctx.Handle(404, "setting.WebHooksEditPost(GetWebhookById)", nil) + ctx.Handle(404, "GetWebhookById", nil) } else { - ctx.Handle(500, "setting.WebHooksEditPost(GetWebhookById)", err) + ctx.Handle(500, "GetWebhookById", err) } return } @@ -353,10 +353,10 @@ func WebHooksEditPost(ctx *middleware.Context, params martini.Params, form auth. } w.IsActive = form.Active if err := w.UpdateEvent(); err != nil { - ctx.Handle(500, "setting.WebHooksEditPost(UpdateEvent)", err) + ctx.Handle(500, "UpdateEvent", err) return } else if err := models.UpdateWebhook(w); err != nil { - ctx.Handle(500, "setting.WebHooksEditPost(WebHooksEditPost)", err) + ctx.Handle(500, "WebHooksEditPost", err) return } diff --git a/routers/repo/view.go b/routers/repo/view.go new file mode 100644 index 00000000..9562bb78 --- /dev/null +++ b/routers/repo/view.go @@ -0,0 +1,203 @@ +// Copyright 2014 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 ( + "bytes" + "io/ioutil" + "path" + "path/filepath" + "strings" + + "github.com/gogits/gogs/modules/base" + "github.com/gogits/gogs/modules/git" + "github.com/gogits/gogs/modules/middleware" +) + +const ( + HOME base.TplName = "repo/home" +) + +func Home(ctx *middleware.Context) { + ctx.Data["Title"] = ctx.Repo.Repository.Name + + branchName := ctx.Repo.BranchName + userName := ctx.Repo.Owner.Name + repoName := ctx.Repo.Repository.Name + + repoLink := ctx.Repo.RepoLink + branchLink := ctx.Repo.RepoLink + "/src/" + branchName + rawLink := ctx.Repo.RepoLink + "/raw/" + branchName + + // Get tree path + treename := ctx.Params("*") + + if len(treename) > 0 && treename[len(treename)-1] == '/' { + ctx.Redirect(repoLink + "/src/" + branchName + "/" + treename[:len(treename)-1]) + return + } + + ctx.Data["IsRepoToolbarSource"] = true + + isViewBranch := ctx.Repo.IsBranch + ctx.Data["IsViewBranch"] = isViewBranch + + treePath := treename + if len(treePath) != 0 { + treePath = treePath + "/" + } + + entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treename) + if err != nil && err != git.ErrNotExist { + ctx.Handle(404, "GetTreeEntryByPath", err) + return + } + + if len(treename) != 0 && entry == nil { + ctx.Handle(404, "repo.Home", nil) + return + } + + if entry != nil && !entry.IsDir() { + blob := entry.Blob() + + if dataRc, err := blob.Data(); err != nil { + ctx.Handle(404, "blob.Data", err) + return + } else { + ctx.Data["FileSize"] = blob.Size() + ctx.Data["IsFile"] = true + ctx.Data["FileName"] = blob.Name() + ext := path.Ext(blob.Name()) + if len(ext) > 0 { + ext = ext[1:] + } + ctx.Data["FileExt"] = ext + ctx.Data["FileLink"] = rawLink + "/" + treename + + buf := make([]byte, 1024) + n, _ := dataRc.Read(buf) + if n > 0 { + buf = buf[:n] + } + + _, isTextFile := base.IsTextFile(buf) + _, isImageFile := base.IsImageFile(buf) + ctx.Data["IsFileText"] = isTextFile + + switch { + case isImageFile: + ctx.Data["IsImageFile"] = true + case isTextFile: + d, _ := ioutil.ReadAll(dataRc) + buf = append(buf, d...) + readmeExist := base.IsMarkdownFile(blob.Name()) || base.IsReadmeFile(blob.Name()) + ctx.Data["ReadmeExist"] = readmeExist + if readmeExist { + ctx.Data["FileContent"] = string(base.RenderMarkdown(buf, "")) + } else { + ctx.Data["FileContent"] = string(buf) + } + } + } + } else { + // Directory and file list. + tree, err := ctx.Repo.Commit.SubTree(treename) + if err != nil { + ctx.Handle(404, "SubTree", err) + return + } + entries, err := tree.ListEntries(treename) + if err != nil { + ctx.Handle(500, "ListEntries", err) + return + } + entries.Sort() + + files := make([][]interface{}, 0, len(entries)) + + for _, te := range entries { + c, err := ctx.Repo.Commit.GetCommitOfRelPath(filepath.Join(treePath, te.Name())) + if err != nil { + ctx.Handle(404, "GetCommitOfRelPath", err) + return + } + + files = append(files, []interface{}{te, c}) + } + + ctx.Data["Files"] = files + + var readmeFile *git.Blob + + for _, f := range entries { + if f.IsDir() || !base.IsReadmeFile(f.Name()) { + continue + } else { + readmeFile = f.Blob() + break + } + } + + if readmeFile != nil { + ctx.Data["ReadmeInHome"] = true + ctx.Data["ReadmeExist"] = true + if dataRc, err := readmeFile.Data(); err != nil { + ctx.Handle(404, "repo.SinglereadmeFile.LookupBlob", err) + return + } else { + + buf := make([]byte, 1024) + n, _ := dataRc.Read(buf) + if n > 0 { + buf = buf[:n] + } + + ctx.Data["FileSize"] = readmeFile.Size() + ctx.Data["FileLink"] = rawLink + "/" + treename + _, isTextFile := base.IsTextFile(buf) + ctx.Data["FileIsText"] = isTextFile + ctx.Data["FileName"] = readmeFile.Name() + if isTextFile { + d, _ := ioutil.ReadAll(dataRc) + buf = append(buf, d...) + switch { + case base.IsMarkdownFile(readmeFile.Name()): + buf = base.RenderMarkdown(buf, branchLink) + default: + buf = bytes.Replace(buf, []byte("\n"), []byte(`<br>`), -1) + } + ctx.Data["FileContent"] = string(buf) + } + } + } + } + + ctx.Data["Username"] = userName + ctx.Data["Reponame"] = repoName + + var treenames []string + Paths := make([]string, 0) + + if len(treename) > 0 { + treenames = strings.Split(treename, "/") + for i, _ := range treenames { + Paths = append(Paths, strings.Join(treenames[0:i+1], "/")) + } + + ctx.Data["HasParentPath"] = true + if len(Paths)-2 >= 0 { + ctx.Data["ParentPath"] = "/" + Paths[len(Paths)-2] + } + } + + ctx.Data["LastCommit"] = ctx.Repo.Commit + ctx.Data["Paths"] = Paths + ctx.Data["TreeName"] = treename + ctx.Data["Treenames"] = treenames + ctx.Data["TreePath"] = treePath + ctx.Data["BranchLink"] = branchLink + ctx.HTML(200, HOME) +} |