Download response uses shared error parser

Author: jdsutherland

cmd/cmd.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"strings"
 
 	"io"
 
@@ -78,14 +79,22 @@ func validateUserConfig(cfg *viper.Viper) error {
 func decodedAPIError(resp *http.Response) error {
 	var apiError struct {
 		Error struct {
-			Type    string `json:"type"`
-			Message string `json:"message"`
+			Type             string   `json:"type"`
+			Message          string   `json:"message"`
+			PossibleTrackIDs []string `json:"possible_track_ids"`
 		} `json:"error,omitempty"`
 	}
 	if err := json.NewDecoder(resp.Body).Decode(&apiError); err != nil {
 		return fmt.Errorf("failed to parse API error response: %s", err)
 	}
 	if apiError.Error.Message != "" {
+		if apiError.Error.Type == "track_ambiguous" {
+			return fmt.Errorf(
+				"%s: %s",
+				apiError.Error.Message,
+				strings.Join(apiError.Error.PossibleTrackIDs, ", "),
+			)
+		}
 		return fmt.Errorf(apiError.Error.Message)
 	}
 	return fmt.Errorf("unexpected API response: %d", resp.StatusCode)

cmd/download.go

@@ -204,26 +204,7 @@ func newDownload(flags *pflag.FlagSet, usrCfg *viper.Viper) (*download, error) {
 	defer res.Body.Close()
 
 	if err := json.NewDecoder(res.Body).Decode(&d.payload); err != nil {
-		return nil, fmt.Errorf("unable to parse API response - %s", err)
-	}
-
-	if res.StatusCode == http.StatusUnauthorized {
-		return nil, fmt.Errorf(
-			"unauthorized request. Please run the configure command. You can find your API token at %s/my/settings",
-			config.InferSiteURL(d.apibaseurl),
-		)
-	}
-	if res.StatusCode != http.StatusOK {
-		switch d.payload.Error.Type {
-		case "track_ambiguous":
-			return nil, fmt.Errorf(
-				"%s: %s",
-				d.payload.Error.Message,
-				strings.Join(d.payload.Error.PossibleTrackIDs, ", "),
-			)
-		default:
-			return nil, errors.New(d.payload.Error.Message)
-		}
+		return nil, decodedAPIError(res)
 	}
 
 	return d, nil