i think that's all the api endpoints!
Signed-off-by: ari melody <ari@arimelody.me>
This commit is contained in:
parent
494b29def3
commit
05e16a0867
17 changed files with 810 additions and 231 deletions
|
|
@ -1,8 +1,8 @@
|
|||
package music
|
||||
|
||||
import (
|
||||
"arimelody.me/arimelody.me/music/model"
|
||||
"github.com/jmoiron/sqlx"
|
||||
"arimelody.me/arimelody.me/music/model"
|
||||
"github.com/jmoiron/sqlx"
|
||||
)
|
||||
|
||||
// DATABASE
|
||||
|
|
@ -12,7 +12,7 @@ func PullReleaseLinks(db *sqlx.DB, releaseID string) ([]*model.Link, error) {
|
|||
|
||||
err := db.Select(
|
||||
&links,
|
||||
"SELECT * FROM musiclink WHERE release=$1",
|
||||
"SELECT name, url FROM musiclink WHERE release=$1",
|
||||
releaseID,
|
||||
)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
package music
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
|
||||
"arimelody.me/arimelody.me/global"
|
||||
|
|
@ -11,30 +12,60 @@ import (
|
|||
// DATABASE
|
||||
|
||||
func PullAllReleases(db *sqlx.DB) ([]*model.Release, error) {
|
||||
var release_rows = []*model.Release{}
|
||||
var releases = []*model.Release{}
|
||||
|
||||
err := db.Select(&release_rows, "SELECT * FROM musicrelease ORDER BY release_date DESC")
|
||||
err := db.Select(&releases, "SELECT * FROM musicrelease ORDER BY release_date DESC")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for _, release := range release_rows {
|
||||
for _, release := range releases {
|
||||
release.Credits, err = PullReleaseCredits(global.DB, release.ID)
|
||||
if err != nil {
|
||||
fmt.Printf("Error pulling credits for %s: %s\n", release.ID, err)
|
||||
release.Credits = []*model.Credit{}
|
||||
}
|
||||
release.Links, _ = PullReleaseLinks(global.DB, release.ID)
|
||||
release.Links, err = PullReleaseLinks(global.DB, release.ID)
|
||||
if err != nil {
|
||||
fmt.Printf("Error pulling links for %s: %s\n", release.ID, err)
|
||||
release.Links = []*model.Link{}
|
||||
}
|
||||
release.Tracks, err = PullReleaseTracksDB(global.DB, release)
|
||||
if err != nil {
|
||||
fmt.Printf("Error pulling tracks for %s: %s\n", release.ID, err)
|
||||
release.Tracks = []*model.Track{}
|
||||
}
|
||||
release.Tracks = make([]*model.Track, 0)
|
||||
releases = append(releases, release)
|
||||
}
|
||||
|
||||
return releases, nil
|
||||
}
|
||||
|
||||
func PullReleaseTracksDB(db *sqlx.DB, release *model.Release) ([]*model.Track, error) {
|
||||
var track_rows = []string{}
|
||||
var tracks = []*model.Track{}
|
||||
|
||||
err := db.Select(&track_rows,
|
||||
"SELECT track FROM musicreleasetrack "+
|
||||
"WHERE release=$1 "+
|
||||
"ORDER BY number DESC",
|
||||
release.ID,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for _, trackID := range track_rows {
|
||||
var track = global.GetTrack(trackID)
|
||||
if track == nil {
|
||||
return nil, errors.New("Recieved a track from the DB that does not exist in memory")
|
||||
}
|
||||
track.Release = release
|
||||
tracks = append(tracks, track)
|
||||
}
|
||||
|
||||
return tracks, nil
|
||||
}
|
||||
|
||||
func CreateReleaseDB(db *sqlx.DB, release *model.Release) error {
|
||||
_, err := db.Exec(
|
||||
"INSERT INTO musicrelease "+
|
||||
|
|
@ -60,10 +91,11 @@ func CreateReleaseDB(db *sqlx.DB, release *model.Release) error {
|
|||
func UpdateReleaseDB(db *sqlx.DB, release *model.Release) error {
|
||||
_, err := db.Exec(
|
||||
"UPDATE musicrelease SET "+
|
||||
"title=$2, description=$3, type=$4, release_date=$5, artwork=$6, buyname=$7, buylink=$8) "+
|
||||
"VALUES ($2, $3, $4, $5, $6, $7, $8) "+
|
||||
"visible=$2, title=$3, description=$4, type=$5, release_date=$6, artwork=$7, buyname=$8, buylink=$9) "+
|
||||
"VALUES ($2, $3, $4, $5, $6, $7, $8, $9) "+
|
||||
"WHERE id=$1",
|
||||
release.ID,
|
||||
release.Visible,
|
||||
release.Title,
|
||||
release.Description,
|
||||
release.ReleaseType,
|
||||
|
|
@ -79,6 +111,88 @@ func UpdateReleaseDB(db *sqlx.DB, release *model.Release) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func UpdateReleaseTracksDB(db *sqlx.DB, release *model.Release, new_tracks []*model.Track) error {
|
||||
_, err := db.Exec(
|
||||
"DELETE FROM musicreleasetrack "+
|
||||
"WHERE release=$1",
|
||||
release.ID,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for i, track := range new_tracks {
|
||||
_, err = db.Exec(
|
||||
"INSERT INTO musicreleasetrack "+
|
||||
"(release, track, number) "+
|
||||
"VALUES ($1, $2, $3)",
|
||||
release.ID,
|
||||
track.ID,
|
||||
i,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func UpdateReleaseCreditsDB(db *sqlx.DB, release *model.Release, new_credits []*model.Credit) error {
|
||||
_, err := db.Exec(
|
||||
"DELETE FROM musiccredit "+
|
||||
"WHERE release=$1",
|
||||
release.ID,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for _, credit := range new_credits {
|
||||
_, err = db.Exec(
|
||||
"INSERT INTO musiccredit "+
|
||||
"(release, artist, role, is_primary) "+
|
||||
"VALUES ($1, $2, $3, $4)",
|
||||
release.ID,
|
||||
credit.Artist.ID,
|
||||
credit.Role,
|
||||
credit.Primary,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func UpdateReleaseLinksDB(db *sqlx.DB, release *model.Release, new_links []*model.Link) error {
|
||||
_, err := db.Exec(
|
||||
"DELETE FROM musiclink "+
|
||||
"WHERE release=$1",
|
||||
release.ID,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for _, link := range new_links {
|
||||
_, err = db.Exec(
|
||||
"INSERT INTO musiclink "+
|
||||
"(release, name, url) "+
|
||||
"VALUES ($1, $2, $3)",
|
||||
release.ID,
|
||||
link.Name,
|
||||
link.URL,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func DeleteReleaseDB(db *sqlx.DB, release *model.Release) error {
|
||||
_, err := db.Exec(
|
||||
"DELETE FROM musicrelease "+
|
||||
|
|
|
|||
|
|
@ -18,6 +18,21 @@ func PullAllTracks(db *sqlx.DB) ([]*model.Track, error) {
|
|||
return tracks, nil
|
||||
}
|
||||
|
||||
func PullOrphanTracks(db *sqlx.DB) ([]*model.Track, error) {
|
||||
var tracks = []*model.Track{}
|
||||
|
||||
err := db.Select(&tracks,
|
||||
"SELECT id, title, description, lyrics, preview_url FROM musictrack "+
|
||||
"WHERE id NOT IN "+
|
||||
"(SELECT track FROM musicreleasetrack)",
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return tracks, nil
|
||||
}
|
||||
|
||||
func CreateTrackDB(db *sqlx.DB, track *model.Track) (string, error) {
|
||||
var trackID string
|
||||
err := db.QueryRow(
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
package model
|
||||
|
||||
type Track struct {
|
||||
ID string `json:"id"`
|
||||
Title string `json:"title"`
|
||||
Description string `json:"description"`
|
||||
Lyrics string `json:"lyrics"`
|
||||
PreviewURL string `json:"previewURL" db:"preview_url"`
|
||||
ID string `json:"id"`
|
||||
Title string `json:"title"`
|
||||
Description string `json:"description"`
|
||||
Lyrics string `json:"lyrics"`
|
||||
PreviewURL string `json:"previewURL" db:"preview_url"`
|
||||
Release *Release `json:"-" db:"-"`
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import (
|
|||
|
||||
"arimelody.me/arimelody.me/admin"
|
||||
"arimelody.me/arimelody.me/global"
|
||||
"arimelody.me/arimelody.me/music/model"
|
||||
)
|
||||
|
||||
// HTTP HANDLERS
|
||||
|
|
@ -48,6 +49,18 @@ func ServeGateway() http.Handler {
|
|||
return
|
||||
}
|
||||
|
||||
type (
|
||||
GatewayTrack struct {
|
||||
*model.Track
|
||||
Number int
|
||||
}
|
||||
|
||||
GatewayRelease struct {
|
||||
*model.Release
|
||||
Tracks []GatewayTrack
|
||||
}
|
||||
)
|
||||
|
||||
id := r.URL.Path[1:]
|
||||
release := global.GetRelease(id)
|
||||
if release == nil {
|
||||
|
|
@ -55,6 +68,14 @@ func ServeGateway() http.Handler {
|
|||
return
|
||||
}
|
||||
|
||||
tracks := []GatewayTrack{}
|
||||
for i, track := range release.Tracks {
|
||||
tracks = append([]GatewayTrack{GatewayTrack{
|
||||
Track: track,
|
||||
Number: len(release.Tracks) - i,
|
||||
}}, tracks...)
|
||||
}
|
||||
|
||||
// only allow authorised users to view unreleased releases
|
||||
authorised := admin.GetSession(r) != nil
|
||||
if !release.IsReleased() && !authorised {
|
||||
|
|
@ -64,7 +85,7 @@ func ServeGateway() http.Handler {
|
|||
|
||||
lrw := global.LoggingResponseWriter{w, http.StatusOK}
|
||||
|
||||
global.ServeTemplate("music-gateway.html", release).ServeHTTP(&lrw, r)
|
||||
global.ServeTemplate("music-gateway.html", GatewayRelease{release, tracks}).ServeHTTP(&lrw, r)
|
||||
|
||||
if lrw.Code != http.StatusOK {
|
||||
fmt.Printf("Error rendering music gateway for %s\n", id)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue