Refactored DownloadContentsWithMeta method, used bcombined approach, updated tests

Author: kuzminT

github/repos_contents.go

@@ -191,21 +191,30 @@ func (s *RepositoriesService) DownloadContentsWithMeta(ctx context.Context, owne
 		if err == nil && content != "" {
 			return io.NopCloser(strings.NewReader(content)), fileContent, resp, nil
 		}
+	}
 
-		if fileContent.DownloadURL == nil || *fileContent.DownloadURL == "" {
-			return nil, fileContent, resp, fmt.Errorf("no download link found for %s", filepath)
-		}
+	_, dirContents, resp, err := s.GetContents(ctx, owner, repo, dir, opts)
+	if err != nil {
+		return nil, nil, resp, err
+	}
 
-		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
-		}
+	for _, contents := range dirContents {
+		if contents.GetName() == filename {
+			if contents.GetDownloadURL() == "" {
+				return nil, contents, resp, fmt.Errorf("no download link found for %s", filepath)
+			}
 
-		return dlResp.Body, fileContent, &Response{Response: dlResp}, 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
+			}
+
+			return dlResp.Body, contents, &Response{Response: dlResp}, nil
+		}
 	}
 
 	return nil, nil, resp, fmt.Errorf("no file named %s found in %s", filename, dir)

github/repos_contents_test.go

@@ -329,19 +329,29 @@ func TestRepositoriesService_DownloadContentsWithMeta_FailedResponse(t *testing.
 	t.Parallel()
 	client, mux, serverURL := setup(t)
 
+	downloadURL := fmt.Sprintf("%s%s/download/f", serverURL, baseURLPath)
+
 	mux.HandleFunc("/repos/o/r/contents/d/f", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, "GET")
 		fmt.Fprint(w, `{
 			"type": "file",
 			"name": "f",
-			"download_url": "`+serverURL+baseURLPath+`/download/f"
+			"download_url": "`+downloadURL+`"
 		  }`)
 	})
 	mux.HandleFunc("/download/f", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, "GET")
 		w.WriteHeader(http.StatusInternalServerError)
 		fmt.Fprint(w, "foo error")
 	})
+	mux.HandleFunc("/repos/o/r/contents/d", func(w http.ResponseWriter, r *http.Request) {
+		testMethod(t, r, "GET")
+		fmt.Fprint(w, `[{
+			"type": "file",
+			"name": "f",
+			"download_url": "`+downloadURL+`"
+		  }]`)
+	})
 
 	ctx := context.Background()
 	r, c, resp, err := client.Repositories.DownloadContentsWithMeta(ctx, "o", "r", "d/f", nil)
@@ -376,6 +386,14 @@ func TestRepositoriesService_DownloadContentsWithMeta_NoDownloadURL(t *testing.T
 	t.Parallel()
 	client, mux, _ := setup(t)
 
+	mux.HandleFunc("/repos/o/r/contents/d/f", func(w http.ResponseWriter, r *http.Request) {
+		testMethod(t, r, "GET")
+		fmt.Fprint(w, `{
+		  "type": "file",
+		  "name": "f",
+		}`)
+	})
+
 	mux.HandleFunc("/repos/o/r/contents/d", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, "GET")
 		fmt.Fprint(w, `[{