Skip to content

feat: Refactor repositories download contents #4153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stevehipwell wants to merge 4 commits into
base: master
Choose a base branch
from
+186 −257
Open

feat: Refactor repositories download contents #4153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5069e18
feat: Refactor repositories download contents
stevehipwell Apr 14, 2026
eaa3b4a
fixup! feat: Refactor repositories download contents
stevehipwell Apr 14, 2026
52eb7b3
fixup! feat: Refactor repositories download contents
stevehipwell Apr 15, 2026
7312075
fixup! feat: Refactor repositories download contents
stevehipwell Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 24 additions & 61 deletions github/repos_contents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"io"
"net/http"
"net/url"
"path"
"strings"
)

Expand Down Expand Up @@ -137,40 +136,8 @@ func (s *RepositoriesService) GetReadme(ctx context.Context, owner, repo string,
//
//meta:operation GET /repos/{owner}/{repo}/contents/{path}
func (s *RepositoriesService) DownloadContents(ctx context.Context, owner, repo, filepath string, opts *RepositoryContentGetOptions) (io.ReadCloser, *Response, error) {
dir := path.Dir(filepath)
filename := path.Base(filepath)
fileContent, _, resp, err := s.GetContents(ctx, owner, repo, filepath, opts)
if err == nil && fileContent != nil {
content, err := fileContent.GetContent()
if err == nil && content != "" {
return io.NopCloser(strings.NewReader(content)), resp, nil
}
}

_, dirContents, resp, err := s.GetContents(ctx, owner, repo, dir, opts)
if err != nil {
return nil, resp, err
}

for _, contents := range dirContents {
if contents.GetName() == filename {
if contents.GetDownloadURL() == "" {
return nil, resp, fmt.Errorf("no download link found for %v", filepath)
}
dlReq, err := http.NewRequestWithContext(ctx, "GET", *contents.DownloadURL, nil)
if err != nil {
return nil, resp, err
}
dlResp, err := s.client.client.Do(dlReq)
if err != nil {
return nil, &Response{Response: dlResp}, err
}

return dlResp.Body, &Response{Response: dlResp}, nil
}
}

return nil, resp, fmt.Errorf("no file named %v found in %v", filename, dir)
rc, _, resp, err := s.DownloadContentsWithMeta(ctx, owner, repo, filepath, opts)
return rc, resp, err
}

// DownloadContentsWithMeta is identical to DownloadContents but additionally
Expand All @@ -186,40 +153,36 @@ func (s *RepositoriesService) DownloadContents(ctx context.Context, owner, repo,
//
//meta:operation GET /repos/{owner}/{repo}/contents/{path}
func (s *RepositoriesService) DownloadContentsWithMeta(ctx context.Context, owner, repo, filepath string, opts *RepositoryContentGetOptions) (io.ReadCloser, *RepositoryContent, *Response, error) {
dir := path.Dir(filepath)
filename := path.Base(filepath)
fileContent, _, resp, err := s.GetContents(ctx, owner, repo, filepath, opts)
if err == nil && fileContent != nil {
content, err := fileContent.GetContent()
if err == nil && content != "" {
return io.NopCloser(strings.NewReader(content)), fileContent, resp, nil
}
if err != nil {
return nil, nil, resp, err
}

if fileContent == nil {
return nil, nil, resp, fmt.Errorf("no file content found at path %v in %v/%v", filepath, owner, repo)
}

content, err := fileContent.GetContent()
if err == nil && content != "" {
return io.NopCloser(strings.NewReader(content)), fileContent, resp, nil
}

_, dirContents, resp, err := s.GetContents(ctx, owner, repo, dir, opts)
downloadURL := fileContent.GetDownloadURL()
if downloadURL == "" {
return nil, fileContent, resp, fmt.Errorf("could not get download url for path %v in %v/%v", filepath, owner, repo)
}

dlReq, err := http.NewRequestWithContext(ctx, "GET", downloadURL, nil)
if err != nil {
return nil, nil, resp, err
return nil, fileContent, resp, err
}

for _, contents := range dirContents {
if contents.GetName() == filename {
if contents.GetDownloadURL() == "" {
return nil, contents, resp, fmt.Errorf("no download link found for %v", filepath)
}
dlReq, err := http.NewRequestWithContext(ctx, "GET", *contents.DownloadURL, nil)
if err != nil {
return nil, contents, resp, err
}
dlResp, err := s.client.client.Do(dlReq)
if err != nil {
return nil, contents, &Response{Response: dlResp}, err
}

return dlResp.Body, contents, &Response{Response: dlResp}, nil
}
dlResp, err := s.client.client.Do(dlReq)
if err != nil {
return nil, fileContent, &Response{Response: dlResp}, err
}

return nil, nil, resp, fmt.Errorf("no file named %v found in %v", filename, dir)
return dlResp.Body, fileContent, &Response{Response: dlResp}, nil
}

// GetContents can return either the metadata and content of a single file
Expand Down
Loading
Loading