idanoo/GoScrobble
1
0
Fork 0
mirror of https://github.com/idanoo/GoScrobble.git synced 2024-11-25 09:55:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add proper handling to album links

Browse Source
This commit is contained in:
Daniel Mason 2021-03-28 22:24:18 +13:00
parent c267f5a7ef
commit e9474ba0b6
Signed by: idanoo
GPG Key ID: 387387CDBC02F132
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/goscrobble/album.go
View File

@ -28,7 +28,10 @@ func insertAlbum(name string, mbid string, artists []string, tx *sql.Tx) (Album,
} }
album = fetchAlbum("mbid", mbid, tx) album = fetchAlbum("mbid", mbid, tx)
album.linkAlbumToArtists(artists, tx) err = album.linkAlbumToArtists(artists, tx)
if err != nil {
return album, err
}
} }
} else { } else {
album = fetchAlbum("name", name, tx) album = fetchAlbum("name", name, tx)
@ -40,7 +43,10 @@ func insertAlbum(name string, mbid string, artists []string, tx *sql.Tx) (Album,
} }
album = fetchAlbum("name", name, tx) album = fetchAlbum("name", name, tx)
album.linkAlbumToArtists(artists, tx) err = album.linkAlbumToArtists(artists, tx)
if err != nil {
return album, err
}
} }
} }
@ -76,8 +82,8 @@ func insertNewAlbum(name string, mbid string, tx *sql.Tx) error {
func (album *Album) linkAlbumToArtists(artists []string, tx *sql.Tx) error { func (album *Album) linkAlbumToArtists(artists []string, tx *sql.Tx) error {
var err error var err error
for _, artist := range artists { for _, artist := range artists {
_, err = tx.Exec("INSERT INTO `track_artist` (`track`, `artist`) "+ _, err = tx.Exec("INSERT INTO `album_artist` (`album`, `artist`) "+
"VALUES (UUID_TO_BIN(?, true), UUID_TO_BIN(?, true)", album.Uuid, artist) "VALUES (UUID_TO_BIN(?, true), UUID_TO_BIN(?, true))", album.Uuid, artist)
if err != nil { if err != nil {
return err return err
} }

10
internal/goscrobble/server.go
View File

@ -97,10 +97,10 @@ func throwBadReq(w http.ResponseWriter, m string) {
http.Error(w, err.Error(), http.StatusBadRequest) http.Error(w, err.Error(), http.StatusBadRequest)
} }
// throwUnauthorized - Throws a 403 // throwOkMessage - Throws a happy 200
func throwOkMessage(w http.ResponseWriter, m string) { func throwOkMessage(w http.ResponseWriter, m string) {
jr := jsonResponse{ jr := jsonResponse{
Err: m, Msg: m,
} }
js, _ := json.Marshal(&jr) js, _ := json.Marshal(&jr)
err := errors.New(string(js)) err := errors.New(string(js))
@ -241,11 +241,11 @@ func handleIngress(w http.ResponseWriter, r *http.Request) {
return return
} }
throwOkMessage(w, "{}") throwOkMessage(w, "success")
return return
} }
// Lets trick 'em for now ;) ;)
fmt.Fprintf(w, "{}") throwBadReq(w, "Unknown ingress type")
} }
// FRONTEND HANDLING // FRONTEND HANDLING