heimoshuiyu/gonic
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

delete multierr

Browse Source
This commit is contained in:
sentriz
2023-09-14 01:09:57 +01:00
parent 12c31cd334
commit 0eb5add1a0
5 changed files with 23 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/ctrlsubsonic/handlers_common.go
View File

@@ -13,7 +13,6 @@ import (
"github.com/jinzhu/gorm"
"go.senan.xyz/gonic/db"
"go.senan.xyz/gonic/multierr"
"go.senan.xyz/gonic/scanner"
"go.senan.xyz/gonic/server/ctrlsubsonic/params"
"go.senan.xyz/gonic/server/ctrlsubsonic/spec"
@@ -73,14 +72,14 @@ func (c *Controller) ServeScrobble(r *http.Request) *spec.Response {
return spec.NewError(0, "error updating stats: %v", err)
}
var scrobbleErrs multierr.Err
var scrobbleErrs []error
for _, scrobbler := range c.Scrobblers {
if err := scrobbler.Scrobble(user, track, optStamp, optSubmission); err != nil {
scrobbleErrs.Add(err)
scrobbleErrs = append(scrobbleErrs, err)
}
}
if scrobbleErrs.Len() > 0 {
return spec.NewError(0, "error when submitting: %s", scrobbleErrs.Error())
if len(scrobbleErrs) > 0 {
return spec.NewError(0, "error when submitting: %v", errors.Join(scrobbleErrs...))
}
return spec.NewResponse()