Small refactoring

Author: lafriks

models/repo.go

@@ -258,6 +258,11 @@ func (repo *Repository) APIFormat(mode AccessMode) *api.Repository {
 	return repo.innerAPIFormat(mode, false)
 }
 
+// GetCommitsCountCacheKey returns cache key used for commits count caching.
+func (repo *Repository) GetCommitsCountCacheKey(contextName string) string {
+	return fmt.Sprintf("commits-count-%d-%s", repo.ID, contextName)
+}
+
 func (repo *Repository) innerAPIFormat(mode AccessMode, isParent bool) *api.Repository {
 	var parent *api.Repository
 

models/update.go

@@ -213,7 +213,7 @@ func pushUpdate(opts PushUpdateOptions) (repo *Repository, err error) {
 			}
 		} else {
 			// Clear cache for tag commit count
-			cache.Remove(fmt.Sprintf("tag-commits-count-%d-%s", repo.ID, tagName))
+			cache.Remove(repo.GetCommitsCountCacheKey(tagName))
 			err = pushUpdateAddTag(repo, gitRepo, tagName)
 			if err != nil {
 				return nil, fmt.Errorf("pushUpdateAddTag: %v", err)
@@ -222,8 +222,8 @@ func pushUpdate(opts PushUpdateOptions) (repo *Repository, err error) {
 	} else if !isDelRef {
 		// If is branch reference
 
-		// Clear cache for branch commit counr
-		cache.Remove(fmt.Sprintf("branch-commits-count-%d-%s", repo.ID, opts.RefFullName[len(git.BranchPrefix):]))
+		// Clear cache for branch commit count
+		cache.Remove(repo.GetCommitsCountCacheKey(opts.RefFullName[len(git.BranchPrefix):]))
 
 		newCommit, err := gitRepo.GetCommit(opts.NewCommitID)
 		if err != nil {

modules/context/repo.go

@@ -104,17 +104,15 @@ func (r *Repository) CanUseTimetracker(issue *models.Issue, user *models.User) b
 
 // GetCommitsCount returns cached commit count for current view
 func (r *Repository) GetCommitsCount() (int64, error) {
+	var contextName string
 	if r.IsViewBranch {
-		return cache.GetInt64(fmt.Sprintf("branch-commits-count-%d-%s", r.Repository.ID, r.BranchName), func() (int64, error) {
-			return r.Commit.CommitsCount()
-		})
-	}
-	if r.IsViewTag {
-		return cache.GetInt64(fmt.Sprintf("tag-commits-count-%d-%s", r.Repository.ID, r.TagName), func() (int64, error) {
-			return r.Commit.CommitsCount()
-		})
+		contextName = r.BranchName
+	} else if r.IsViewTag {
+		contextName = r.TagName
+	} else {
+		contextName = r.CommitID
 	}
-	return cache.GetInt64(fmt.Sprintf("commit-commits-count-%d-%s", r.Repository.ID, r.CommitID), func() (int64, error) {
+	return cache.GetInt64(r.Repository.GetCommitsCountCacheKey(contextName), func() (int64, error) {
 		return r.Commit.CommitsCount()
 	})
 }