This commit is contained in:
@@ -12,17 +12,18 @@ import (
|
||||
)
|
||||
|
||||
type LibraryController struct {
|
||||
service *service.LibraryService
|
||||
scanMutex sync.Mutex
|
||||
isScanning bool
|
||||
libraryService *service.LibraryService
|
||||
coverService *service.CoverService
|
||||
scanMutex sync.Mutex
|
||||
isScanning bool
|
||||
}
|
||||
|
||||
func NewLibraryController(service *service.LibraryService) *LibraryController {
|
||||
return &LibraryController{service: service}
|
||||
func NewLibraryController(libraryService *service.LibraryService, coverSvc *service.CoverService) *LibraryController {
|
||||
return &LibraryController{libraryService: libraryService, coverService: coverSvc}
|
||||
}
|
||||
|
||||
func (c *LibraryController) GetAll(w http.ResponseWriter, r *http.Request) {
|
||||
libraries, err := c.service.GetAll()
|
||||
libraries, err := c.libraryService.GetAll()
|
||||
if err != nil {
|
||||
jsonError(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
@@ -43,7 +44,7 @@ func (c *LibraryController) Create(w http.ResponseWriter, r *http.Request) {
|
||||
jsonError(w, "name and path are required", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
_, err := c.service.Create(req.Name, req.Path)
|
||||
_, err := c.libraryService.Create(req.Name, req.Path)
|
||||
if err != nil {
|
||||
jsonError(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
@@ -58,7 +59,7 @@ func (c *LibraryController) GetByID(w http.ResponseWriter, r *http.Request) {
|
||||
jsonError(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
l, err := c.service.GetByID(id)
|
||||
l, err := c.libraryService.GetByID(id)
|
||||
if err != nil {
|
||||
jsonError(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
@@ -80,7 +81,7 @@ func (c *LibraryController) UpdateName(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
err = c.service.UpdateName(id, name)
|
||||
err = c.libraryService.UpdateName(id, name)
|
||||
if err != nil {
|
||||
jsonError(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
@@ -102,7 +103,7 @@ func (c *LibraryController) UpdatePath(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
err = c.service.UpdatePath(id, path)
|
||||
err = c.libraryService.UpdatePath(id, path)
|
||||
if err != nil {
|
||||
jsonError(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
@@ -137,7 +138,7 @@ func (c *LibraryController) Scan(w http.ResponseWriter, r *http.Request) {
|
||||
c.scanMutex.Unlock()
|
||||
}()
|
||||
|
||||
report, err := c.service.Scan(id)
|
||||
report, err := c.libraryService.Scan(id)
|
||||
if err != nil {
|
||||
log.Printf("Scan failed for library %d: %v", id, err)
|
||||
return
|
||||
@@ -163,7 +164,7 @@ func (c *LibraryController) Delete(w http.ResponseWriter, r *http.Request) {
|
||||
jsonError(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
err = c.service.Delete(id)
|
||||
err = c.libraryService.Delete(id)
|
||||
if err != nil {
|
||||
jsonError(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
@@ -178,7 +179,7 @@ func (c *LibraryController) GetSongs(w http.ResponseWriter, r *http.Request) {
|
||||
jsonError(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
songs, err := c.service.GetSongs(id)
|
||||
songs, err := c.libraryService.GetSongs(id)
|
||||
if err != nil {
|
||||
jsonError(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
@@ -193,7 +194,7 @@ func (c *LibraryController) GetSongsByArtist(w http.ResponseWriter, r *http.Requ
|
||||
jsonError(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
songs, err := c.service.GetSongsByArtist(id)
|
||||
songs, err := c.libraryService.GetSongsByArtist(id)
|
||||
if err != nil {
|
||||
jsonError(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
@@ -208,7 +209,7 @@ func (c *LibraryController) GetSongsByAlbum(w http.ResponseWriter, r *http.Reque
|
||||
jsonError(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
songs, err := c.service.GetSongsByAlbum(id)
|
||||
songs, err := c.libraryService.GetSongsByAlbum(id)
|
||||
if err != nil {
|
||||
jsonError(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
@@ -217,7 +218,7 @@ func (c *LibraryController) GetSongsByAlbum(w http.ResponseWriter, r *http.Reque
|
||||
}
|
||||
|
||||
func (c *LibraryController) GetArtists(w http.ResponseWriter, r *http.Request) {
|
||||
artists, err := c.service.GetArtists()
|
||||
artists, err := c.libraryService.GetArtists()
|
||||
if err != nil {
|
||||
jsonError(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
@@ -232,7 +233,7 @@ func (c *LibraryController) GetArtist(w http.ResponseWriter, r *http.Request) {
|
||||
jsonError(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
artist, err := c.service.GetArtist(id)
|
||||
artist, err := c.libraryService.GetArtist(id)
|
||||
if err != nil {
|
||||
jsonError(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
@@ -241,7 +242,7 @@ func (c *LibraryController) GetArtist(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
func (c *LibraryController) GetAlbums(w http.ResponseWriter, r *http.Request) {
|
||||
albums, err := c.service.GetAlbums()
|
||||
albums, err := c.libraryService.GetAlbums()
|
||||
if err != nil {
|
||||
jsonError(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
@@ -256,7 +257,7 @@ func (c *LibraryController) GetAlbumsByArtist(w http.ResponseWriter, r *http.Req
|
||||
jsonError(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
albums, err := c.service.GetAlbumsByArtistWithDetail(id)
|
||||
albums, err := c.libraryService.GetAlbumsByArtistWithDetail(id)
|
||||
if err != nil {
|
||||
jsonError(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
@@ -271,7 +272,7 @@ func (c *LibraryController) GetAlbum(w http.ResponseWriter, r *http.Request) {
|
||||
jsonError(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
album, err := c.service.GetAlbum(id)
|
||||
album, err := c.libraryService.GetAlbum(id)
|
||||
if err != nil {
|
||||
jsonError(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
@@ -286,7 +287,7 @@ func (c *LibraryController) GetAlbumCover(w http.ResponseWriter, r *http.Request
|
||||
jsonError(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
coverPath, err := c.service.GetAlbumCover(id)
|
||||
coverPath, err := c.coverService.GetAlbumCover(id)
|
||||
if err != nil {
|
||||
jsonError(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user