Refactored DownloadContentsWithMeta

Author: kuzminT

github/repos_contents.go

@@ -181,28 +181,31 @@ func (s *RepositoriesService) DownloadContents(ctx context.Context, owner, repo,
 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)
-	_, dirContents, resp, err := s.GetContents(ctx, owner, repo, dir, opts)
+	fileContent, _, resp, err := s.GetContents(ctx, owner, repo, filepath, opts)
 	if err != nil {
 		return nil, nil, resp, err
 	}
 
-	for _, contents := range dirContents {
-		if *contents.Name == filename {
-			if contents.DownloadURL == nil || *contents.DownloadURL == "" {
-				return nil, contents, resp, fmt.Errorf("no download link found for %s", filepath)
-			}
+	if fileContent != nil {
+		content, err := fileContent.GetContent()
+		if err == nil && content != "" {
+			return io.NopCloser(strings.NewReader(content)), fileContent, resp, nil
+		}
 
-			dlReq, err := http.NewRequestWithContext(ctx, http.MethodGet, *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
-			}
+		if fileContent.DownloadURL == nil || *fileContent.DownloadURL == "" {
+			return nil, fileContent, resp, fmt.Errorf("no download link found for %s", filepath)
+		}
 
-			return dlResp.Body, contents, &Response{Response: dlResp}, nil
+		dlReq, err := http.NewRequestWithContext(ctx, http.MethodGet, *fileContent.DownloadURL, nil)
+		if err != nil {
+			return nil, fileContent, resp, err
+		}
+		dlResp, err := s.client.client.Do(dlReq)
+		if err != nil {
+			return nil, fileContent, &Response{Response: dlResp}, err
 		}
+
+		return dlResp.Body, fileContent, &Response{Response: dlResp}, nil
 	}
 
 	return nil, nil, resp, fmt.Errorf("no file named %s found in %s", filename, dir)

github/repos_contents_test.go

@@ -265,13 +265,14 @@ func TestRepositoriesService_DownloadContentsWithMeta_Success(t *testing.T) {
 	t.Parallel()
 	client, mux, serverURL := setup(t)
 
-	mux.HandleFunc("/repos/o/r/contents/d", func(w http.ResponseWriter, r *http.Request) {
+	mux.HandleFunc("/repos/o/r/contents/d/f", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, "GET")
-		fmt.Fprint(w, `[{
+		fmt.Fprint(w, `{
 		  "type": "file",
 		  "name": "f",
-		  "download_url": "`+serverURL+baseURLPath+`/download/f"
-		}]`)
+		  "download_url": "`+serverURL+baseURLPath+`/download/f",
+          "content": "foo"
+		}`)
 	})
 	mux.HandleFunc("/download/f", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, "GET")
@@ -328,13 +329,13 @@ func TestRepositoriesService_DownloadContentsWithMeta_FailedResponse(t *testing.
 	t.Parallel()
 	client, mux, serverURL := setup(t)
 
-	mux.HandleFunc("/repos/o/r/contents/d", func(w http.ResponseWriter, r *http.Request) {
+	mux.HandleFunc("/repos/o/r/contents/d/f", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, "GET")
-		fmt.Fprint(w, `[{
+		fmt.Fprint(w, `{
 			"type": "file",
 			"name": "f",
 			"download_url": "`+serverURL+baseURLPath+`/download/f"
-		  }]`)
+		  }`)
 	})
 	mux.HandleFunc("/download/f", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, "GET")