Remove some wrapper and make code more redable (#478)

* meaningful var names
* no context wrapper, use store directly
* retrieve store from context once
* rm store.GetRepoOwnerName
This commit is contained in:
6543
2021-10-28 11:12:58 +02:00
committed by GitHub
parent 473a05d5b5
commit 965235e421
13 changed files with 155 additions and 231 deletions

View File

@@ -37,6 +37,9 @@ func GetSelf(c *gin.Context) {
}
func GetFeed(c *gin.Context) {
store_ := store.FromContext(c)
remote_ := remote.FromContext(c)
user := session.User(c)
latest, _ := strconv.ParseBool(c.Query("latest"))
@@ -44,14 +47,14 @@ func GetFeed(c *gin.Context) {
log.Debug().Msgf("sync begin: %s", user.Login)
user.Synced = time.Now().Unix()
store.FromContext(c).UpdateUser(user)
store_.UpdateUser(user)
config := ToConfig(c)
sync := shared.Syncer{
Remote: remote.FromContext(c),
Store: store.FromContext(c),
Perms: store.FromContext(c),
Remote: remote_,
Store: store_,
Perms: store_,
Match: shared.NamespaceFilter(config.OwnersWhitelist),
}
if err := sync.Sync(c, user); err != nil {
@@ -62,7 +65,7 @@ func GetFeed(c *gin.Context) {
}
if latest {
feed, err := store.FromContext(c).RepoListLatest(user)
feed, err := store_.RepoListLatest(user)
if err != nil {
c.String(500, "Error fetching feed. %s", err)
} else {
@@ -71,7 +74,7 @@ func GetFeed(c *gin.Context) {
return
}
feed, err := store.FromContext(c).UserFeed(user)
feed, err := store_.UserFeed(user)
if err != nil {
c.String(500, "Error fetching user feed. %s", err)
return
@@ -80,23 +83,24 @@ func GetFeed(c *gin.Context) {
}
func GetRepos(c *gin.Context) {
var (
user = session.User(c)
all, _ = strconv.ParseBool(c.Query("all"))
flush, _ = strconv.ParseBool(c.Query("flush"))
)
store_ := store.FromContext(c)
remote_ := remote.FromContext(c)
user := session.User(c)
all, _ := strconv.ParseBool(c.Query("all"))
flush, _ := strconv.ParseBool(c.Query("flush"))
if flush || time.Unix(user.Synced, 0).Add(time.Hour*72).Before(time.Now()) {
log.Debug().Msgf("sync begin: %s", user.Login)
user.Synced = time.Now().Unix()
store.FromContext(c).UpdateUser(user)
store_.UpdateUser(user)
config := ToConfig(c)
sync := shared.Syncer{
Remote: remote.FromContext(c),
Store: store.FromContext(c),
Perms: store.FromContext(c),
Remote: remote_,
Store: store_,
Perms: store_,
Match: shared.NamespaceFilter(config.OwnersWhitelist),
}
@@ -107,7 +111,7 @@ func GetRepos(c *gin.Context) {
}
}
repos, err := store.FromContext(c).RepoList(user, true)
repos, err := store_.RepoList(user, true)
if err != nil {
c.String(500, "Error fetching repository list. %s", err)
return
@@ -138,11 +142,13 @@ func PostToken(c *gin.Context) {
}
func DeleteToken(c *gin.Context) {
store_ := store.FromContext(c)
user := session.User(c)
user.Hash = base32.StdEncoding.EncodeToString(
securecookie.GenerateRandomKey(32),
)
if err := store.UpdateUser(c, user); err != nil {
if err := store_.UpdateUser(user); err != nil {
c.String(500, "Error revoking tokens. %s", err)
return
}