Skip to content

Commit ec9b43b

Browse files
zeripathlunny
andauthored
Remove calls to load Mirrors in user.Dashboard (#20855) (#20897)
Backport #20855 Whilst looking at #20840 I noticed that the Mirrors data doesn't appear to be being used therefore we can remove this and in fact none of the related code is used elsewhere so it can also be removed. Related #20840 Related #20804 Signed-off-by: Andrew Thornton <[email protected]> Signed-off-by: Andrew Thornton <[email protected]> Signed-off-by: Andrew Thornton <[email protected]> Co-authored-by: Lunny Xiao <[email protected]>
1 parent e6ec411 commit ec9b43b

File tree

2 files changed

+0
-86
lines changed

2 files changed

+0
-86
lines changed

Diff for: models/repo/mirror.go

-53
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ package repo
88
import (
99
"context"
1010
"errors"
11-
"fmt"
1211
"time"
1312

1413
"code.gitea.io/gitea/models/db"
@@ -121,55 +120,3 @@ func InsertMirror(ctx context.Context, mirror *Mirror) error {
121120
_, err := db.GetEngine(ctx).Insert(mirror)
122121
return err
123122
}
124-
125-
// MirrorRepositoryList contains the mirror repositories
126-
type MirrorRepositoryList []*Repository
127-
128-
func (repos MirrorRepositoryList) loadAttributes(ctx context.Context) error {
129-
if len(repos) == 0 {
130-
return nil
131-
}
132-
133-
// Load mirrors.
134-
repoIDs := make([]int64, 0, len(repos))
135-
for i := range repos {
136-
if !repos[i].IsMirror {
137-
continue
138-
}
139-
140-
repoIDs = append(repoIDs, repos[i].ID)
141-
}
142-
mirrors := make([]*Mirror, 0, len(repoIDs))
143-
if err := db.GetEngine(ctx).
144-
Where("id > 0").
145-
In("repo_id", repoIDs).
146-
Find(&mirrors); err != nil {
147-
return fmt.Errorf("find mirrors: %v", err)
148-
}
149-
150-
set := make(map[int64]*Mirror)
151-
for i := range mirrors {
152-
set[mirrors[i].RepoID] = mirrors[i]
153-
}
154-
for i := range repos {
155-
repos[i].Mirror = set[repos[i].ID]
156-
if repos[i].Mirror != nil {
157-
repos[i].Mirror.Repo = repos[i]
158-
}
159-
}
160-
return nil
161-
}
162-
163-
// LoadAttributes loads the attributes for the given MirrorRepositoryList
164-
func (repos MirrorRepositoryList) LoadAttributes() error {
165-
return repos.loadAttributes(db.DefaultContext)
166-
}
167-
168-
// GetUserMirrorRepositories returns a list of mirror repositories of given user.
169-
func GetUserMirrorRepositories(userID int64) ([]*Repository, error) {
170-
repos := make([]*Repository, 0, 10)
171-
return repos, db.GetEngine(db.DefaultContext).
172-
Where("owner_id = ?", userID).
173-
And("is_mirror = ?", true).
174-
Find(&repos)
175-
}

Diff for: routers/web/user/home.go

-33
Original file line numberDiff line numberDiff line change
@@ -100,39 +100,6 @@ func Dashboard(ctx *context.Context) {
100100
}
101101

102102
var err error
103-
var mirrors []*repo_model.Repository
104-
if ctxUser.IsOrganization() {
105-
var env organization.AccessibleReposEnvironment
106-
if ctx.Org.Team != nil {
107-
env = organization.OrgFromUser(ctxUser).AccessibleTeamReposEnv(ctx.Org.Team)
108-
} else {
109-
env, err = organization.AccessibleReposEnv(ctx, organization.OrgFromUser(ctxUser), ctx.Doer.ID)
110-
if err != nil {
111-
ctx.ServerError("AccessibleReposEnv", err)
112-
return
113-
}
114-
}
115-
mirrors, err = env.MirrorRepos()
116-
if err != nil {
117-
ctx.ServerError("env.MirrorRepos", err)
118-
return
119-
}
120-
} else {
121-
mirrors, err = repo_model.GetUserMirrorRepositories(ctxUser.ID)
122-
if err != nil {
123-
ctx.ServerError("GetUserMirrorRepositories", err)
124-
return
125-
}
126-
}
127-
ctx.Data["MaxShowRepoNum"] = setting.UI.User.RepoPagingNum
128-
129-
if err := repo_model.MirrorRepositoryList(mirrors).LoadAttributes(); err != nil {
130-
ctx.ServerError("MirrorRepositoryList.LoadAttributes", err)
131-
return
132-
}
133-
ctx.Data["MirrorCount"] = len(mirrors)
134-
ctx.Data["Mirrors"] = mirrors
135-
136103
ctx.Data["Feeds"], err = models.GetFeeds(ctx, models.GetFeedsOptions{
137104
RequestedUser: ctxUser,
138105
RequestedTeam: ctx.Org.Team,

0 commit comments

Comments
 (0)