From 706b0f72e2e4bc91bdbed38fee609cabe9f44e43 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Thu, 29 Oct 2015 20:40:57 -0400 Subject: [PATCH] fix issue comment mention and autofix count when start --- gogs.go | 2 +- models/pull.go | 3 +- models/repo.go | 8 ++- modules/setting/setting.go | 13 ++-- routers/repo/issue.go | 125 +++++++++++++++---------------------- templates/.VERSION | 2 +- 6 files changed, 70 insertions(+), 83 deletions(-) diff --git a/gogs.go b/gogs.go index b80240d861..2dbf6eedf1 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.6.18.1026 Beta" +const APP_VER = "0.6.18.1029 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/models/pull.go b/models/pull.go index 55f17fc27c..0300c083d7 100644 --- a/models/pull.go +++ b/models/pull.go @@ -160,7 +160,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error } // Clone base repo. - tmpBasePath := path.Join("data/tmp/repos", com.ToStr(time.Now().Nanosecond())+".git") + tmpBasePath := path.Join(setting.AppDataPath, "tmp/repos", com.ToStr(time.Now().Nanosecond())+".git") os.MkdirAll(path.Dir(tmpBasePath), os.ModePerm) defer os.RemoveAll(path.Dir(tmpBasePath)) @@ -214,6 +214,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error var patchConflicts = []string{ "patch does not apply", "already exists in working directory", + "unrecognized input", } // testPatch checks if patch can be merged to base repository without conflit. diff --git a/models/repo.go b/models/repo.go index 9ea0abf2ae..197415c624 100644 --- a/models/repo.go +++ b/models/repo.go @@ -300,7 +300,7 @@ func (repo *Repository) DescriptionHtml() template.HTML { } func (repo *Repository) LocalCopyPath() string { - return path.Join(setting.RepoRootPath, "local", com.ToStr(repo.ID)) + return path.Join(setting.AppDataPath, "tmp/local", com.ToStr(repo.ID)) } // UpdateLocalCopy makes sure the local copy of repository is up-to-date. @@ -1488,6 +1488,12 @@ func CheckRepoStats() { "UPDATE `user` SET num_repos=(SELECT COUNT(*) FROM `repository` WHERE owner_id=?) WHERE id=?", "user count 'num_repos'", }, + // Issue.NumComments + { + "SELECT `issue`.id FROM `issue` WHERE `issue`.num_comments!=(SELECT COUNT(*) FROM `comment` WHERE issue_id=`issue`.id AND type=0)", + "UPDATE `issue` SET num_comments=(SELECT COUNT(*) FROM `comment` WHERE issue_id=? AND type=0) WHERE id=?", + "issue count 'num_comments'", + }, } for i := range checkers { repoStatsCheck(checkers[i]) diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 88209b25b6..743127d018 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -43,10 +43,11 @@ const ( var ( // App settings. - AppVer string - AppName string - AppUrl string - AppSubUrl string + AppVer string + AppName string + AppUrl string + AppSubUrl string + AppDataPath = "data" // Server settings. Protocol Scheme @@ -319,7 +320,7 @@ func NewContext() { ReverseProxyAuthUser = sec.Key("REVERSE_PROXY_AUTHENTICATION_USER").MustString("X-WEBAUTH-USER") sec = Cfg.Section("attachment") - AttachmentPath = sec.Key("PATH").MustString("data/attachments") + AttachmentPath = sec.Key("PATH").MustString(path.Join(AppDataPath, "attachments")) if !filepath.IsAbs(AttachmentPath) { AttachmentPath = path.Join(workDir, AttachmentPath) } @@ -387,7 +388,7 @@ func NewContext() { sec = Cfg.Section("picture") PictureService = sec.Key("SERVICE").In("server", []string{"server"}) - AvatarUploadPath = sec.Key("AVATAR_UPLOAD_PATH").MustString("data/avatars") + AvatarUploadPath = sec.Key("AVATAR_UPLOAD_PATH").MustString(path.Join(AppDataPath, "avatars")) forcePathSeparator(AvatarUploadPath) if !filepath.IsAbs(AvatarUploadPath) { AvatarUploadPath = path.Join(workDir, AvatarUploadPath) diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 30dcf92578..58382d18cc 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -324,6 +324,47 @@ func ValidateRepoMetas(ctx *middleware.Context, form auth.CreateIssueForm) ([]in return labelIDs, milestoneID, assigneeID } +func checkMentions(ctx *middleware.Context, issue *models.Issue) { + // Update mentions. + mentions := base.MentionPattern.FindAllString(issue.Content, -1) + if len(mentions) > 0 { + for i := range mentions { + mentions[i] = strings.TrimSpace(mentions[i])[1:] + } + + if err := models.UpdateMentions(mentions, issue.ID); err != nil { + ctx.Handle(500, "UpdateMentions", err) + return + } + } + + repo := ctx.Repo.Repository + + // Mail watchers and mentions. + if setting.Service.EnableNotifyMail { + tos, err := mailer.SendIssueNotifyMail(ctx.User, ctx.Repo.Owner, repo, issue) + if err != nil { + ctx.Handle(500, "SendIssueNotifyMail", err) + return + } + + tos = append(tos, ctx.User.LowerName) + newTos := make([]string, 0, len(mentions)) + for _, m := range mentions { + if com.IsSliceContainsStr(tos, m) { + continue + } + + newTos = append(newTos, m) + } + if err = mailer.SendIssueMentionMail(ctx.Render, ctx.User, ctx.Repo.Owner, + repo, issue, models.GetUserEmailsByNames(newTos)); err != nil { + ctx.Handle(500, "SendIssueMentionMail", err) + return + } + } +} + func NewIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) { ctx.Data["Title"] = ctx.Tr("repo.issues.new") ctx.Data["PageIsIssueList"] = true @@ -363,41 +404,9 @@ func NewIssuePost(ctx *middleware.Context, form auth.CreateIssueForm) { return } - // Update mentions. - mentions := base.MentionPattern.FindAllString(issue.Content, -1) - if len(mentions) > 0 { - for i := range mentions { - mentions[i] = strings.TrimSpace(mentions[i])[1:] - } - - if err := models.UpdateMentions(mentions, issue.ID); err != nil { - ctx.Handle(500, "UpdateMentions", err) - return - } - } - - // Mail watchers and mentions. - if setting.Service.EnableNotifyMail { - tos, err := mailer.SendIssueNotifyMail(ctx.User, ctx.Repo.Owner, repo, issue) - if err != nil { - ctx.Handle(500, "SendIssueNotifyMail", err) - return - } - - tos = append(tos, ctx.User.LowerName) - newTos := make([]string, 0, len(mentions)) - for _, m := range mentions { - if com.IsSliceContainsStr(tos, m) { - continue - } - - newTos = append(newTos, m) - } - if err = mailer.SendIssueMentionMail(ctx.Render, ctx.User, ctx.Repo.Owner, - repo, issue, models.GetUserEmailsByNames(newTos)); err != nil { - ctx.Handle(500, "SendIssueMentionMail", err) - return - } + checkMentions(ctx, issue) + if ctx.Written() { + return } log.Trace("Issue created: %d/%d", repo.ID, issue.ID) @@ -836,46 +845,16 @@ func NewComment(ctx *middleware.Context, form auth.CreateCommentForm) { return } - // Update mentions. - mentions := base.MentionPattern.FindAllString(comment.Content, -1) - if len(mentions) > 0 { - for i := range mentions { - mentions[i] = mentions[i][1:] - } - - if err := models.UpdateMentions(mentions, issue.ID); err != nil { - ctx.Handle(500, "UpdateMentions", err) - return - } + checkMentions(ctx, &models.Issue{ + ID: issue.ID, + Index: issue.Index, + Name: issue.Name, + Content: form.Content, + }) + if ctx.Written() { + return } - // Mail watchers and mentions. - if setting.Service.EnableNotifyMail { - tos, err := mailer.SendIssueNotifyMail(ctx.User, ctx.Repo.Owner, ctx.Repo.Repository, &models.Issue{ - Index: issue.Index, - Name: issue.Name, - Content: form.Content, - }) - if err != nil { - ctx.Handle(500, "SendIssueNotifyMail", err) - return - } - - tos = append(tos, ctx.User.LowerName) - newTos := make([]string, 0, len(mentions)) - for _, m := range mentions { - if com.IsSliceContainsStr(tos, m) { - continue - } - - newTos = append(newTos, m) - } - if err = mailer.SendIssueMentionMail(ctx.Render, ctx.User, ctx.Repo.Owner, - ctx.Repo.Repository, issue, models.GetUserEmailsByNames(newTos)); err != nil { - ctx.Handle(500, "SendIssueMentionMail", err) - return - } - } log.Trace("Comment created: %d/%d/%d", ctx.Repo.Repository.ID, issue.ID, comment.ID) } diff --git a/templates/.VERSION b/templates/.VERSION index ae01cedbc6..dbaaca541b 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.6.18.1026 Beta \ No newline at end of file +0.6.18.1029 Beta \ No newline at end of file