archlinux/autobuilder
archlinux/autobuilder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup code

Browse Source
This commit is contained in:
Sebastiaan de Schaetzen 2025-04-24 12:11:05 +02:00
parent 447b138f8b
commit 7442746e59
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gitea.go
View File

@ -24,7 +24,14 @@ type Owner struct {
Username string `json:"username"` Username string `json:"username"`
} }
func (g *GiteaClient) getRepositories(org string) (list []Repository, rerr error) { func closeReader(rc io.ReadCloser, err *error) {
tempErr := rc.Close()
if tempErr != nil && *err == nil {
*err = tempErr
}
}
func (g *GiteaClient) getRepositories(org string) (list []Repository, resultErr error) {
url := fmt.Sprintf("%s/api/v1/orgs/%s/repos", g.BaseURL, org) url := fmt.Sprintf("%s/api/v1/orgs/%s/repos", g.BaseURL, org)
req, _ := http.NewRequest("GET", url, nil) req, _ := http.NewRequest("GET", url, nil)
req.Header.Set("Authorization", "token "+g.Token) req.Header.Set("Authorization", "token "+g.Token)
@ -33,12 +40,7 @@ func (g *GiteaClient) getRepositories(org string) (list []Repository, rerr error
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer func(Body io.ReadCloser) { defer closeReader(resp.Body, &err)
err := Body.Close()
if err != nil {
rerr = err
}
}(resp.Body)
var repos []Repository var repos []Repository
if err := json.NewDecoder(resp.Body).Decode(&repos); err != nil { if err := json.NewDecoder(resp.Body).Decode(&repos); err != nil {
@ -47,7 +49,7 @@ func (g *GiteaClient) getRepositories(org string) (list []Repository, rerr error
return repos, nil return repos, nil
} }
func (g *GiteaClient) hasPKGBUILD(repo Repository) (present bool, rerr error) { func (g *GiteaClient) hasPKGBUILD(repo Repository) (present bool, resultErr error) {
url := fmt.Sprintf("%s/api/v1/repos/%s/%s/contents/PKGBUILD", g.BaseURL, repo.Owner.Username, repo.Name) url := fmt.Sprintf("%s/api/v1/repos/%s/%s/contents/PKGBUILD", g.BaseURL, repo.Owner.Username, repo.Name)
req, _ := http.NewRequest("GET", url, nil) req, _ := http.NewRequest("GET", url, nil)
req.Header.Set("Authorization", "token "+g.Token) req.Header.Set("Authorization", "token "+g.Token)
@ -56,12 +58,7 @@ func (g *GiteaClient) hasPKGBUILD(repo Repository) (present bool, rerr error) {
if err != nil { if err != nil {
return false, err return false, err
} }
defer func(Body io.ReadCloser) { defer closeReader(resp.Body, &err)
err := Body.Close()
if err != nil {
rerr = err
}
}(resp.Body)
if resp.StatusCode == http.StatusNotFound { if resp.StatusCode == http.StatusNotFound {
return false, nil return false, nil