Browse Source

提交代码,去掉重复的查询所有项目接口

Signed-off-by: zouap <zouap@pcl.ac.cn>
tags/v1.21.12.1
zouap 4 years ago
parent
commit
91019242aa
4 changed files with 14 additions and 37 deletions
  1. +0
    -10
      models/user_business_analysis.go
  2. +6
    -4
      models/user_follow.go
  3. +3
    -22
      modules/git/repo.go
  4. +5
    -1
      routers/repo/user_data_analysis.go

+ 0
- 10
models/user_business_analysis.go View File

@@ -344,13 +344,3 @@ func subMonth(t1, t2 time.Time) (month int) {
month = yearInterval*12 + monthInterval
return month
}

func QueryAllRepo() []*Repository {
sess := x.NewSession()
defer sess.Close()
sess.Select("*").Table("repository")
repositoryList := make([]*Repository, 0)
sess.Find(&repositoryList)

return repositoryList
}

+ 6
- 4
models/user_follow.go View File

@@ -4,12 +4,14 @@

package models

import "code.gitea.io/gitea/modules/timeutil"

// Follow represents relations of user and his/her followers.
type Follow struct {
ID int64 `xorm:"pk autoincr"`
UserID int64 `xorm:"UNIQUE(follow)"`
FollowID int64 `xorm:"UNIQUE(follow)"`
CreatedUnix int64 `xorm:"created"`
ID int64 `xorm:"pk autoincr"`
UserID int64 `xorm:"UNIQUE(follow)"`
FollowID int64 `xorm:"UNIQUE(follow)"`
CreatedUnix timeutil.TimeStamp `xorm:"created"`
}

// IsFollowing returns true if user is following followID.


+ 3
- 22
modules/git/repo.go View File

@@ -52,25 +52,6 @@ func (repo *Repository) GetAllCommitsCount() (int64, error) {
return AllCommitsCount(repo.Path)
}

func (repo *Repository) ParsePrettyFormatLogToList(logs []byte) (*list.List, error) {
l := list.New()
if len(logs) == 0 {
return l, nil
}

parts := bytes.Split(logs, []byte{'\n'})

for _, commitID := range parts {
commit, err := repo.GetCommit(string(commitID))
if err != nil {
return nil, err
}
l.PushBack(commit)
}

return l, nil
}

func (repo *Repository) parsePrettyFormatLogToList(logs []byte) (*list.List, error) {
l := list.New()
if len(logs) == 0 {
@@ -460,7 +441,7 @@ type Contributor struct {
Email string
}

func GetContributors(repoPath string) ([]Contributor, error) {
func GetContributors(repoPath string) ([]Contributor, error){
cmd := NewCommand("shortlog", "-sne", "--all")
stdout, err := cmd.RunInDir(repoPath)
if err != nil {
@@ -477,9 +458,9 @@ func GetContributors(repoPath string) ([]Contributor, error) {
}
number := oneCount[0:strings.Index(oneCount, "\t")]
commitCnt, _ := strconv.Atoi(number)
committer := oneCount[strings.Index(oneCount, "\t")+1 : strings.LastIndex(oneCount, " ")]
committer := oneCount[strings.Index(oneCount, "\t")+1:strings.LastIndex(oneCount, " ")]
committer = strings.Trim(committer, " ")
email := oneCount[strings.Index(oneCount, "<")+1 : strings.Index(oneCount, ">")]
email := oneCount[strings.Index(oneCount, "<")+1:strings.Index(oneCount, ">")]
contributorsInfo[i] = Contributor{
commitCnt, committer, email,
}


+ 5
- 1
routers/repo/user_data_analysis.go View File

@@ -18,7 +18,11 @@ func TimeingCountData() {

yesterday := currentTimeNow.AddDate(0, 0, -1)

repoList := models.QueryAllRepo()
repoList, err := models.GetAllRepositories()
if err != nil {
log.Error("query repo error.")
return
}
log.Info("start to query wiki data")
for _, repoRecord := range repoList {
wikiPath := models.WikiPath(repoRecord.OwnerName, repoRecord.Name)


Loading…
Cancel
Save