Skip to content

Commit e669da8

Browse files
lunnyjeffliu27
authored andcommitted
Fix database lock when use random repository fallback image (go-gitea#7166)
* fix database lock when use random repository fallback image * remove unused function
1 parent 7247bea commit e669da8

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

models/repo.go

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ func (repo *Repository) innerAPIFormat(e Engine, mode AccessMode, isParent bool)
331331
AllowRebase: allowRebase,
332332
AllowRebaseMerge: allowRebaseMerge,
333333
AllowSquash: allowSquash,
334-
AvatarURL: repo.AvatarLink(),
334+
AvatarURL: repo.avatarLink(e),
335335
}
336336
}
337337

@@ -2524,11 +2524,7 @@ func (repo *Repository) CustomAvatarPath() string {
25242524
return filepath.Join(setting.RepositoryAvatarUploadPath, repo.Avatar)
25252525
}
25262526

2527-
// GenerateRandomAvatar generates a random avatar for repository.
2528-
func (repo *Repository) GenerateRandomAvatar() error {
2529-
return repo.generateRandomAvatar(x)
2530-
}
2531-
2527+
// generateRandomAvatar generates a random avatar for repository.
25322528
func (repo *Repository) generateRandomAvatar(e Engine) error {
25332529
idToString := fmt.Sprintf("%d", repo.ID)
25342530

@@ -2581,16 +2577,19 @@ func RemoveRandomAvatars() error {
25812577

25822578
// RelAvatarLink returns a relative link to the repository's avatar.
25832579
func (repo *Repository) RelAvatarLink() string {
2580+
return repo.relAvatarLink(x)
2581+
}
25842582

2583+
func (repo *Repository) relAvatarLink(e Engine) string {
25852584
// If no avatar - path is empty
25862585
avatarPath := repo.CustomAvatarPath()
25872586
if len(avatarPath) <= 0 || !com.IsFile(avatarPath) {
25882587
switch mode := setting.RepositoryAvatarFallback; mode {
25892588
case "image":
25902589
return setting.RepositoryAvatarFallbackImage
25912590
case "random":
2592-
if err := repo.GenerateRandomAvatar(); err != nil {
2593-
log.Error("GenerateRandomAvatar: %v", err)
2591+
if err := repo.generateRandomAvatar(e); err != nil {
2592+
log.Error("generateRandomAvatar: %v", err)
25942593
}
25952594
default:
25962595
// default behaviour: do not display avatar
@@ -2600,9 +2599,9 @@ func (repo *Repository) RelAvatarLink() string {
26002599
return setting.AppSubURL + "/repo-avatars/" + repo.Avatar
26012600
}
26022601

2603-
// AvatarLink returns user avatar absolute link.
2604-
func (repo *Repository) AvatarLink() string {
2605-
link := repo.RelAvatarLink()
2602+
// avatarLink returns user avatar absolute link.
2603+
func (repo *Repository) avatarLink(e Engine) string {
2604+
link := repo.relAvatarLink(e)
26062605
// link may be empty!
26072606
if len(link) > 0 {
26082607
if link[0] == '/' && link[1] != '/' {

0 commit comments

Comments
 (0)