Fix error codes for required parameters in getAlbumList

server/subsonic/album_lists.go

@@ -2,7 +2,6 @@ package subsonic
 
 import (
 	"context"
-	"errors"
 	"net/http"
 	"strconv"
 	"time"
@@ -53,12 +52,24 @@ func (c *AlbumListController) getAlbumList(r *http.Request) (model.Albums, int64
 	case "highest":
 		opts = filter.AlbumsByRating()
 	case "byGenre":
-		opts = filter.AlbumsByGenre(utils.ParamString(r, "genre"))
+		genre, err := requiredParamString(r, "genre")
+		if err != nil {
+			return nil, 0, err
+		}
+		opts = filter.AlbumsByGenre(genre)
 	case "byYear":
-		opts = filter.AlbumsByYear(utils.ParamInt(r, "fromYear", 0), utils.ParamInt(r, "toYear", 0))
+		fromYear, err := requiredParamInt(r, "fromYear")
+		if err != nil {
+			return nil, 0, err
+		}
+		toYear, err := requiredParamInt(r, "toYear")
+		if err != nil {
+			return nil, 0, err
+		}
+		opts = filter.AlbumsByYear(fromYear, toYear)
 	default:
 		log.Error(r, "albumList type not implemented", "type", typ)
-		return nil, 0, errors.New("not implemented")
+		return nil, 0, newError(responses.ErrorGeneric, "type '%s' not implemented", typ)
 	}
 
 	opts.Offset = utils.ParamInt(r, "offset", 0)
@@ -67,13 +78,13 @@ func (c *AlbumListController) getAlbumList(r *http.Request) (model.Albums, int64
 
 	if err != nil {
 		log.Error(r, "Error retrieving albums", "error", err)
-		return nil, 0, errors.New("internal error")
+		return nil, 0, newError(responses.ErrorGeneric, "internal error")
 	}
 
 	count, err := c.ds.Album(r.Context()).CountAll(opts)
 	if err != nil {
 		log.Error(r, "Error counting albums", "error", err)
-		return nil, 0, errors.New("internal error")
+		return nil, 0, newError(responses.ErrorGeneric, "internal error")
 	}
 
 	return albums, count, nil
@@ -82,7 +93,7 @@ func (c *AlbumListController) getAlbumList(r *http.Request) (model.Albums, int64
 func (c *AlbumListController) GetAlbumList(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) {
 	albums, count, err := c.getAlbumList(r)
 	if err != nil {
-		return nil, newError(responses.ErrorGeneric, err.Error())
+		return nil, err
 	}
 
 	w.Header().Set("x-total-count", strconv.Itoa(int(count)))
@@ -95,7 +106,7 @@ func (c *AlbumListController) GetAlbumList(w http.ResponseWriter, r *http.Reques
 func (c *AlbumListController) GetAlbumList2(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) {
 	albums, pageCount, err := c.getAlbumList(r)
 	if err != nil {
-		return nil, newError(responses.ErrorGeneric, err.Error())
+		return nil, err
 	}
 
 	w.Header().Set("x-total-count", strconv.FormatInt(pageCount, 10))