third-party-mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-15 19:50:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Removing engine.ErrDataNotFound in favor of domain.ErrNotFound

Browse Source
This commit is contained in:
Deluan 2016-03-23 18:15:14 -04:00
parent c50b0bdc48
commit 1ed8c60130
10 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/browsing.go
View File

@ -2,11 +2,11 @@ package api
import (
"fmt"
"time"
"github.com/astaxie/beego"
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/domain"
"github.com/deluan/gosonic/engine"
"github.com/deluan/gosonic/utils"
)
@ -69,7 +69,7 @@ func (c *BrowsingController) GetDirectory() {
dir, err := c.browser.Directory(id)
switch {
case err == engine.ErrDataNotFound:
case err == domain.ErrNotFound:
beego.Error("Requested Id", id, "not found:", err)
c.SendError(responses.ErrorDataNotFound, "Directory not found")
case err != nil:

7
api/media_annotation.go
View File

@ -6,6 +6,7 @@ import (
"github.com/astaxie/beego"
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/domain"
"github.com/deluan/gosonic/engine"
"github.com/deluan/gosonic/utils"
)
@ -26,9 +27,9 @@ func (c *MediaAnnotationController) Star() {
beego.Debug("Starring ids:", ids)
err := c.ratings.SetStar(true, ids...)
switch {
case err == engine.ErrDataNotFound:
case err == domain.ErrNotFound:
beego.Error(err)
c.SendError(responses.ErrorDataNotFound, "Directory not found")
c.SendError(responses.ErrorDataNotFound, "Id not found")
case err != nil:
beego.Error(err)
c.SendError(responses.ErrorGeneric, "Internal Error")
@ -43,7 +44,7 @@ func (c *MediaAnnotationController) Unstar() {
beego.Debug("Unstarring ids:", ids)
err := c.ratings.SetStar(false, ids...)
switch {
case err == engine.ErrDataNotFound:
case err == domain.ErrNotFound:
beego.Error(err)
c.SendError(responses.ErrorDataNotFound, "Directory not found")
case err != nil:

3
api/media_retrieval.go
View File

@ -6,6 +6,7 @@ import (
"github.com/astaxie/beego"
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/domain"
"github.com/deluan/gosonic/engine"
"github.com/deluan/gosonic/utils"
)
@ -37,7 +38,7 @@ func (c *MediaRetrievalController) GetCover() {
err := c.cover.Get(id, size, c.Ctx.ResponseWriter)
switch {
case err == engine.ErrDataNotFound:
case err == domain.ErrNotFound:
beego.Error(err, "Id:", id)
c.SendError(responses.ErrorDataNotFound, "Directory not found")
case err != nil:

3
api/playlists.go
View File

@ -3,6 +3,7 @@ package api
import (
"github.com/astaxie/beego"
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/domain"
"github.com/deluan/gosonic/engine"
"github.com/deluan/gosonic/utils"
)
@ -42,7 +43,7 @@ func (c *PlaylistsController) Get() {
pinfo, err := c.pls.Get(id)
switch {
case err == engine.ErrDataNotFound:
case err == domain.ErrNotFound:
beego.Error(err, "Id:", id)
c.SendError(responses.ErrorDataNotFound, "Directory not found")
case err != nil:

2
engine/browser.go
View File

@ -82,7 +82,7 @@ func (b *browser) Directory(id string) (*DirectoryInfo, error) {
dir = b.buildAlbumDir(al, tracks)
default:
beego.Debug("Id", id, "not found")
return nil, ErrDataNotFound
return nil, domain.ErrNotFound
}
return dir, nil

5
engine/common.go
View File

@ -1,7 +1,6 @@
package engine
import (
"errors"
"time"
"github.com/deluan/gosonic/domain"
@ -41,10 +40,6 @@ type Entry struct {
type Entries []Entry
var (
ErrDataNotFound = errors.New("data not found")
)
func FromAlbum(al *domain.Album) Entry {
e := Entry{}
e.Id = al.Id

2
engine/cover.go
View File

@ -46,7 +46,7 @@ func (c *cover) Get(id string, size int, out io.Writer) error {
}
if err != nil {
return ErrDataNotFound
return domain.ErrNotFound
}
if size > 0 {

3
engine/cover_test.go
View File

@ -6,6 +6,7 @@ import (
"bytes"
"image"
"github.com/deluan/gosonic/domain"
"github.com/deluan/gosonic/engine"
"github.com/deluan/gosonic/persistence"
. "github.com/deluan/gosonic/tests"
@ -53,7 +54,7 @@ func TestCover(t *testing.T) {
err := cover.Get("2", 0, out)
Convey("Then it should return DatNotFound error", func() {
So(err, ShouldEqual, engine.ErrDataNotFound)
So(err, ShouldEqual, domain.ErrNotFound)
})
})
Convey("When specifying a size", func() {

3
engine/playlists.go
View File

@ -34,9 +34,6 @@ type PlaylistInfo struct {
func (p *playlists) Get(id string) (*PlaylistInfo, error) {
pl, err := p.plsRepo.Get(id)
if err == domain.ErrNotFound {
return nil, ErrDataNotFound
}
if err != nil {
return nil, err
}

2
engine/ratings.go
View File

@ -46,7 +46,7 @@ func (r ratings) SetStar(star bool, ids ...string) error {
}
continue
}
return ErrDataNotFound
return domain.ErrNotFound
}
return nil