arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 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
Download Patch File Download Diff File Expand all files Collapse all files
api/browsing.go
+2 -2
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:
api/media_annotation.go
+4 -3
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:
api/media_retrieval.go
+2 -1
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:
api/playlists.go
+2 -1
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: