turns out rewriting all of your database code takes a while
This commit is contained in:
parent
1998a36d6d
commit
965d6f5c3e
30 changed files with 947 additions and 1036 deletions
|
@ -7,7 +7,18 @@ import (
|
|||
|
||||
// DATABASE
|
||||
|
||||
func PullAllArtists(db *sqlx.DB) ([]*model.Artist, error) {
|
||||
func GetArtist(db *sqlx.DB, id string) (*model.Artist, error) {
|
||||
var artist = model.Artist{}
|
||||
|
||||
err := db.Get(&artist, "SELECT * FROM artist WHERE id=$1", id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &artist, nil
|
||||
}
|
||||
|
||||
func GetAllArtists(db *sqlx.DB) ([]*model.Artist, error) {
|
||||
var artists = []*model.Artist{}
|
||||
|
||||
err := db.Select(&artists, "SELECT * FROM artist")
|
||||
|
@ -18,7 +29,22 @@ func PullAllArtists(db *sqlx.DB) ([]*model.Artist, error) {
|
|||
return artists, nil
|
||||
}
|
||||
|
||||
func CreateArtistDB(db *sqlx.DB, artist *model.Artist) error {
|
||||
func GetArtistsNotOnRelease(db *sqlx.DB, release *model.Release) ([]*model.Artist, error) {
|
||||
var artists = []*model.Artist{}
|
||||
|
||||
err := db.Select(&artists,
|
||||
"SELECT * FROM artist "+
|
||||
"WHERE id NOT IN "+
|
||||
"(SELECT artist FROM musiccredit WHERE release=$1)",
|
||||
release.ID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return artists, nil
|
||||
}
|
||||
|
||||
func CreateArtist(db *sqlx.DB, artist *model.Artist) error {
|
||||
_, err := db.Exec(
|
||||
"INSERT INTO artist (id, name, website, avatar) "+
|
||||
"VALUES ($1, $2, $3, $4)",
|
||||
|
@ -34,7 +60,7 @@ func CreateArtistDB(db *sqlx.DB, artist *model.Artist) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func UpdateArtistDB(db *sqlx.DB, artist *model.Artist) error {
|
||||
func UpdateArtist(db *sqlx.DB, artist *model.Artist) error {
|
||||
_, err := db.Exec(
|
||||
"UPDATE artist "+
|
||||
"SET name=$2, website=$3, avatar=$4 "+
|
||||
|
@ -51,7 +77,7 @@ func UpdateArtistDB(db *sqlx.DB, artist *model.Artist) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func DeleteArtistDB(db *sqlx.DB, artist *model.Artist) error {
|
||||
func DeleteArtist(db *sqlx.DB, artist *model.Artist) error {
|
||||
_, err := db.Exec(
|
||||
"DELETE FROM artist "+
|
||||
"WHERE id=$1",
|
||||
|
|
|
@ -1,43 +1,29 @@
|
|||
package music
|
||||
|
||||
import (
|
||||
"arimelody.me/arimelody.me/global"
|
||||
"arimelody.me/arimelody.me/music/model"
|
||||
"github.com/jmoiron/sqlx"
|
||||
)
|
||||
|
||||
// DATABASE
|
||||
|
||||
func PullReleaseCredits(db *sqlx.DB, releaseID string) ([]*model.Credit, error) {
|
||||
type creditDB struct {
|
||||
Artist string
|
||||
Role string
|
||||
Primary bool `db:"is_primary"`
|
||||
}
|
||||
var credit_rows = []creditDB{}
|
||||
var credits = []*model.Credit{}
|
||||
func GetReleaseCredits(db *sqlx.DB, release *model.Release) ([]model.Credit, error) {
|
||||
var credits = []model.Credit{}
|
||||
|
||||
err := db.Select(
|
||||
&credit_rows,
|
||||
"SELECT artist, role, is_primary FROM musiccredit WHERE release=$1",
|
||||
releaseID,
|
||||
err := db.Select(&credits,
|
||||
"SELECT artist.*,role,is_primary FROM musiccredit "+
|
||||
"JOIN artist ON artist=id "+
|
||||
"WHERE release=$1",
|
||||
release.ID,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for _, c := range credit_rows {
|
||||
credits = append(credits, &model.Credit{
|
||||
Artist: global.GetArtist(c.Artist),
|
||||
Role: c.Role,
|
||||
Primary: c.Primary,
|
||||
})
|
||||
}
|
||||
|
||||
return credits, nil
|
||||
}
|
||||
|
||||
func CreateCreditDB(db *sqlx.DB, releaseID string, artistID string, credit *model.Credit) (error) {
|
||||
func CreateCredit(db *sqlx.DB, releaseID string, artistID string, credit *model.Credit) (error) {
|
||||
_, err := db.Exec(
|
||||
"INSERT INTO musiccredit (release, artist, role, is_primary) "+
|
||||
"VALUES ($1, $2, $3, $4)",
|
||||
|
@ -53,7 +39,7 @@ func CreateCreditDB(db *sqlx.DB, releaseID string, artistID string, credit *mode
|
|||
return nil
|
||||
}
|
||||
|
||||
func UpdateCreditDB(db *sqlx.DB, releaseID string, artistID string, credit *model.Credit) (error) {
|
||||
func UpdateCredit(db *sqlx.DB, releaseID string, artistID string, credit *model.Credit) (error) {
|
||||
_, err := db.Exec(
|
||||
"UPDATE musiccredit SET "+
|
||||
"role=$3, is_primary=$4 "+
|
||||
|
@ -70,7 +56,7 @@ func UpdateCreditDB(db *sqlx.DB, releaseID string, artistID string, credit *mode
|
|||
return nil
|
||||
}
|
||||
|
||||
func DeleteCreditDB(db *sqlx.DB, releaseID string, artistID string) (error) {
|
||||
func DeleteCredit(db *sqlx.DB, releaseID string, artistID string) (error) {
|
||||
_, err := db.Exec(
|
||||
"DELETE FROM musiccredit "+
|
||||
"WHERE release=$1, artist=$2",
|
||||
|
|
|
@ -7,14 +7,10 @@ import (
|
|||
|
||||
// DATABASE
|
||||
|
||||
func PullReleaseLinks(db *sqlx.DB, releaseID string) ([]*model.Link, error) {
|
||||
var links = []*model.Link{}
|
||||
func GetReleaseLinks(db *sqlx.DB, release *model.Release) ([]model.Link, error) {
|
||||
var links = []model.Link{}
|
||||
|
||||
err := db.Select(
|
||||
&links,
|
||||
"SELECT name, url FROM musiclink WHERE release=$1",
|
||||
releaseID,
|
||||
)
|
||||
err := db.Select(&links, "SELECT name,url FROM musiclink WHERE release=$1", release.ID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
@ -22,7 +18,7 @@ func PullReleaseLinks(db *sqlx.DB, releaseID string) ([]*model.Link, error) {
|
|||
return links, nil
|
||||
}
|
||||
|
||||
func CreateLinkDB(db *sqlx.DB, releaseID string, link *model.Link) (error) {
|
||||
func CreateLink(db *sqlx.DB, releaseID string, link *model.Link) (error) {
|
||||
_, err := db.Exec(
|
||||
"INSERT INTO musiclink (release, name, url) "+
|
||||
"VALUES ($1, $2, $3)",
|
||||
|
@ -37,7 +33,7 @@ func CreateLinkDB(db *sqlx.DB, releaseID string, link *model.Link) (error) {
|
|||
return nil
|
||||
}
|
||||
|
||||
func UpdateLinkDB(db *sqlx.DB, releaseID string, link *model.Link) (error) {
|
||||
func UpdateLink(db *sqlx.DB, releaseID string, link *model.Link) (error) {
|
||||
_, err := db.Exec(
|
||||
"UPDATE musiclink SET "+
|
||||
"name=$2, url=$3 "+
|
||||
|
@ -53,7 +49,7 @@ func UpdateLinkDB(db *sqlx.DB, releaseID string, link *model.Link) (error) {
|
|||
return nil
|
||||
}
|
||||
|
||||
func DeleteLinkDB(db *sqlx.DB, releaseID string, link *model.Link) (error) {
|
||||
func DeleteLink(db *sqlx.DB, releaseID string, link *model.Link) (error) {
|
||||
_, err := db.Exec(
|
||||
"DELETE FROM musiclink "+
|
||||
"WHERE release=$1, name=$2",
|
||||
|
|
|
@ -1,17 +1,22 @@
|
|||
package music
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
|
||||
"arimelody.me/arimelody.me/global"
|
||||
"arimelody.me/arimelody.me/music/model"
|
||||
"github.com/jmoiron/sqlx"
|
||||
)
|
||||
|
||||
// DATABASE
|
||||
func GetRelease(db *sqlx.DB, id string) (*model.Release, error) {
|
||||
var releases = model.Release{}
|
||||
|
||||
func PullAllReleases(db *sqlx.DB) ([]*model.Release, error) {
|
||||
err := db.Get(&releases, "SELECT * FROM musicrelease WHERE id=$1", id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &releases, nil
|
||||
}
|
||||
|
||||
func GetAllReleases(db *sqlx.DB) ([]*model.Release, error) {
|
||||
var releases = []*model.Release{}
|
||||
|
||||
err := db.Select(&releases, "SELECT * FROM musicrelease ORDER BY release_date DESC")
|
||||
|
@ -19,33 +24,15 @@ func PullAllReleases(db *sqlx.DB) ([]*model.Release, error) {
|
|||
return nil, err
|
||||
}
|
||||
|
||||
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, 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{}
|
||||
}
|
||||
}
|
||||
|
||||
return releases, nil
|
||||
}
|
||||
|
||||
func PullReleaseTracksDB(db *sqlx.DB, release *model.Release) ([]*model.Track, error) {
|
||||
var track_rows = []string{}
|
||||
func GetReleaseTracks(db *sqlx.DB, release *model.Release) ([]*model.Track, error) {
|
||||
var tracks = []*model.Track{}
|
||||
|
||||
err := db.Select(&track_rows,
|
||||
"SELECT track FROM musicreleasetrack "+
|
||||
err := db.Select(&tracks,
|
||||
"SELECT musictrack.* FROM musictrack "+
|
||||
"JOIN musicreleasetrack ON track=id "+
|
||||
"WHERE release=$1 "+
|
||||
"ORDER BY number ASC",
|
||||
release.ID,
|
||||
|
@ -54,19 +41,10 @@ func PullReleaseTracksDB(db *sqlx.DB, release *model.Release) ([]*model.Track, e
|
|||
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 {
|
||||
func CreateRelease(db *sqlx.DB, release *model.Release) error {
|
||||
_, err := db.Exec(
|
||||
"INSERT INTO musicrelease "+
|
||||
"(id, visible, title, description, type, release_date, artwork, buyname, buylink) "+
|
||||
|
@ -88,7 +66,7 @@ func CreateReleaseDB(db *sqlx.DB, release *model.Release) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func UpdateReleaseDB(db *sqlx.DB, release *model.Release) error {
|
||||
func UpdateRelease(db *sqlx.DB, release *model.Release) error {
|
||||
_, err := db.Exec(
|
||||
"UPDATE musicrelease SET "+
|
||||
"visible=$2, title=$3, description=$4, type=$5, release_date=$6, artwork=$7, buyname=$8, buylink=$9 "+
|
||||
|
@ -110,7 +88,7 @@ func UpdateReleaseDB(db *sqlx.DB, release *model.Release) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func UpdateReleaseTracksDB(db *sqlx.DB, release *model.Release, new_tracks []*model.Track) error {
|
||||
func UpdateReleaseTracks(db *sqlx.DB, release *model.Release, new_tracks []*model.Track) error {
|
||||
_, err := db.Exec(
|
||||
"DELETE FROM musicreleasetrack "+
|
||||
"WHERE release=$1",
|
||||
|
@ -137,7 +115,7 @@ func UpdateReleaseTracksDB(db *sqlx.DB, release *model.Release, new_tracks []*mo
|
|||
return nil
|
||||
}
|
||||
|
||||
func UpdateReleaseCreditsDB(db *sqlx.DB, release *model.Release, new_credits []*model.Credit) error {
|
||||
func UpdateReleaseCredits(db *sqlx.DB, release *model.Release, new_credits []*model.Credit) error {
|
||||
_, err := db.Exec(
|
||||
"DELETE FROM musiccredit "+
|
||||
"WHERE release=$1",
|
||||
|
@ -165,7 +143,7 @@ func UpdateReleaseCreditsDB(db *sqlx.DB, release *model.Release, new_credits []*
|
|||
return nil
|
||||
}
|
||||
|
||||
func UpdateReleaseLinksDB(db *sqlx.DB, release *model.Release, new_links []*model.Link) error {
|
||||
func UpdateReleaseLinks(db *sqlx.DB, release *model.Release, new_links []*model.Link) error {
|
||||
_, err := db.Exec(
|
||||
"DELETE FROM musiclink "+
|
||||
"WHERE release=$1",
|
||||
|
@ -192,7 +170,7 @@ func UpdateReleaseLinksDB(db *sqlx.DB, release *model.Release, new_links []*mode
|
|||
return nil
|
||||
}
|
||||
|
||||
func DeleteReleaseDB(db *sqlx.DB, release *model.Release) error {
|
||||
func DeleteRelease(db *sqlx.DB, release *model.Release) error {
|
||||
_, err := db.Exec(
|
||||
"DELETE FROM musicrelease "+
|
||||
"WHERE id=$1",
|
||||
|
@ -204,3 +182,34 @@ func DeleteReleaseDB(db *sqlx.DB, release *model.Release) error {
|
|||
|
||||
return nil
|
||||
}
|
||||
|
||||
func GetFullRelease(db *sqlx.DB, release *model.Release) (*model.FullRelease, error) {
|
||||
// get credits
|
||||
credits, err := GetReleaseCredits(db, release)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// get tracks
|
||||
dbTracks, err := GetReleaseTracks(db, release)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
tracks := []model.DisplayTrack{}
|
||||
for i, track := range dbTracks {
|
||||
tracks = append(tracks, track.MakeDisplay(i + 1))
|
||||
}
|
||||
|
||||
// get links
|
||||
links, err := GetReleaseLinks(db, release)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &model.FullRelease{
|
||||
Release: release,
|
||||
Tracks: tracks,
|
||||
Credits: credits,
|
||||
Links: links,
|
||||
}, nil
|
||||
}
|
||||
|
|
|
@ -7,10 +7,21 @@ import (
|
|||
|
||||
// DATABASE
|
||||
|
||||
func PullAllTracks(db *sqlx.DB) ([]*model.Track, error) {
|
||||
func GetTrack(db *sqlx.DB, id string) (*model.Track, error) {
|
||||
var track = model.Track{}
|
||||
|
||||
stmt, _ := db.Preparex("SELECT * FROM musictrack WHERE id=$1")
|
||||
err := stmt.Get(&track, id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &track, nil
|
||||
}
|
||||
|
||||
func GetAllTracks(db *sqlx.DB) ([]*model.Track, error) {
|
||||
var tracks = []*model.Track{}
|
||||
|
||||
err := db.Select(&tracks, "SELECT id, title, description, lyrics, preview_url FROM musictrack")
|
||||
err := db.Select(&tracks, "SELECT * FROM musictrack")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
@ -18,6 +29,49 @@ func PullAllTracks(db *sqlx.DB) ([]*model.Track, error) {
|
|||
return tracks, nil
|
||||
}
|
||||
|
||||
func GetOrphanTracks(db *sqlx.DB) ([]*model.Track, error) {
|
||||
var tracks = []*model.Track{}
|
||||
|
||||
err := db.Select(&tracks, "SELECT * FROM musictrack WHERE id NOT IN (SELECT track FROM musicreleasetrack)")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return tracks, nil
|
||||
}
|
||||
|
||||
func GetTracksNotOnRelease(db *sqlx.DB, release *model.Release) ([]*model.Track, error) {
|
||||
var tracks = []*model.Track{}
|
||||
|
||||
err := db.Select(&tracks,
|
||||
"SELECT * FROM musictrack "+
|
||||
"WHERE id NOT IN "+
|
||||
"(SELECT track FROM musicreleasetrack WHERE release=$1)",
|
||||
release.ID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return tracks, nil
|
||||
}
|
||||
|
||||
func GetTrackReleases(db *sqlx.DB, track *model.Track) ([]*model.Release, error) {
|
||||
var releases = []*model.Release{}
|
||||
|
||||
err := db.Select(&releases,
|
||||
"SELECT musicrelease.* FROM musicrelease "+
|
||||
"JOIN musicreleasetrack ON release=id "+
|
||||
"WHERE track=$1 "+
|
||||
"ORDER BY release_date",
|
||||
track.ID,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return releases, nil
|
||||
}
|
||||
|
||||
func PullOrphanTracks(db *sqlx.DB) ([]*model.Track, error) {
|
||||
var tracks = []*model.Track{}
|
||||
|
||||
|
@ -33,7 +87,7 @@ func PullOrphanTracks(db *sqlx.DB) ([]*model.Track, error) {
|
|||
return tracks, nil
|
||||
}
|
||||
|
||||
func CreateTrackDB(db *sqlx.DB, track *model.Track) (string, error) {
|
||||
func CreateTrack(db *sqlx.DB, track *model.Track) (string, error) {
|
||||
var trackID string
|
||||
err := db.QueryRow(
|
||||
"INSERT INTO musictrack (title, description, lyrics, preview_url) "+
|
||||
|
@ -51,7 +105,7 @@ func CreateTrackDB(db *sqlx.DB, track *model.Track) (string, error) {
|
|||
return trackID, nil
|
||||
}
|
||||
|
||||
func UpdateTrackDB(db *sqlx.DB, track *model.Track) error {
|
||||
func UpdateTrack(db *sqlx.DB, track *model.Track) error {
|
||||
_, err := db.Exec(
|
||||
"UPDATE musictrack "+
|
||||
"SET title=$2, description=$3, lyrics=$4, preview_url=$5 "+
|
||||
|
@ -69,7 +123,7 @@ func UpdateTrackDB(db *sqlx.DB, track *model.Track) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func DeleteTrackDB(db *sqlx.DB, track *model.Track) error {
|
||||
func DeleteTrack(db *sqlx.DB, track *model.Track) error {
|
||||
_, err := db.Exec(
|
||||
"DELETE FROM musictrack "+
|
||||
"WHERE id=$1",
|
||||
|
|
|
@ -1,8 +1,10 @@
|
|||
package model
|
||||
|
||||
import "strings"
|
||||
|
||||
type (
|
||||
Artist struct {
|
||||
ID string `json:"id"`
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Website string `json:"website"`
|
||||
Avatar string `json:"avatar"`
|
||||
|
@ -14,8 +16,61 @@ func (artist Artist) GetWebsite() string {
|
|||
}
|
||||
|
||||
func (artist Artist) GetAvatar() string {
|
||||
if artist.Avatar == "" {
|
||||
return "/img/default-avatar.png"
|
||||
}
|
||||
if artist.Avatar == "" {
|
||||
return "/img/default-avatar.png"
|
||||
}
|
||||
return artist.Avatar
|
||||
}
|
||||
|
||||
func (release FullRelease) GetUniqueArtists(only_primary bool) []*Artist {
|
||||
var artists = []*Artist{}
|
||||
|
||||
for _, credit := range release.Credits {
|
||||
if only_primary && !credit.Primary {
|
||||
continue
|
||||
}
|
||||
|
||||
exists := false
|
||||
for _, a := range artists {
|
||||
if a.ID == credit.Artist.ID {
|
||||
exists = true
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if exists {
|
||||
continue
|
||||
}
|
||||
|
||||
artists = append(artists, &credit.Artist)
|
||||
}
|
||||
|
||||
return artists
|
||||
}
|
||||
|
||||
func (release FullRelease) GetUniqueArtistNames(only_primary bool) []string {
|
||||
var names = []string{}
|
||||
for _, artist := range release.GetUniqueArtists(only_primary) {
|
||||
names = append(names, artist.Name)
|
||||
}
|
||||
|
||||
return names
|
||||
}
|
||||
|
||||
func (release FullRelease) PrintArtists(only_primary bool, ampersand bool) string {
|
||||
names := release.GetUniqueArtistNames(only_primary)
|
||||
|
||||
if len(names) == 0 {
|
||||
return "Unknown Artist"
|
||||
} else if len(names) == 1 {
|
||||
return names[0]
|
||||
}
|
||||
|
||||
if ampersand {
|
||||
res := strings.Join(names[:len(names)-1], ", ")
|
||||
res += " & " + names[len(names)-1]
|
||||
return res
|
||||
} else {
|
||||
return strings.Join(names[:], ", ")
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package model
|
||||
|
||||
type Credit struct {
|
||||
Artist *Artist `json:"artist"`
|
||||
Artist `json:"artist"`
|
||||
Role string `json:"role"`
|
||||
Primary bool `json:"primary" db:"is_primary"`
|
||||
}
|
||||
|
|
|
@ -6,8 +6,8 @@ import (
|
|||
)
|
||||
|
||||
type Link struct {
|
||||
Name string `json:"name"`
|
||||
URL string `json:"url"`
|
||||
Name string `json:"name"`
|
||||
URL string `json:"url"`
|
||||
}
|
||||
|
||||
func (link Link) NormaliseName() string {
|
||||
|
|
|
@ -1,25 +1,31 @@
|
|||
package model
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
type (
|
||||
ReleaseType string
|
||||
Release struct {
|
||||
ID string `json:"id"`
|
||||
Visible bool `json:"visible"`
|
||||
Title string `json:"title"`
|
||||
Description string `json:"description"`
|
||||
ReleaseType ReleaseType `json:"type" db:"type"`
|
||||
ReleaseDate time.Time `json:"releaseDate" db:"release_date"`
|
||||
Artwork string `json:"artwork"`
|
||||
Buyname string `json:"buyname"`
|
||||
Buylink string `json:"buylink"`
|
||||
Links []*Link `json:"links"`
|
||||
Credits []*Credit `json:"credits"`
|
||||
Tracks []*Track `json:"tracks"`
|
||||
|
||||
Release struct {
|
||||
ID string `json:"id"`
|
||||
Visible bool `json:"visible"`
|
||||
Title string `json:"title"`
|
||||
Description string `json:"description"`
|
||||
ReleaseType ReleaseType `json:"type" db:"type"`
|
||||
ReleaseDate time.Time `json:"releaseDate" db:"release_date"`
|
||||
Artwork string `json:"artwork"`
|
||||
Buyname string `json:"buyname"`
|
||||
Buylink string `json:"buylink"`
|
||||
Copyright string `json:"copyright" db:"copyright"`
|
||||
CopyrightURL string `json:"copyrightURL" db:"copyrighturl"`
|
||||
}
|
||||
|
||||
FullRelease struct {
|
||||
*Release
|
||||
Tracks []DisplayTrack
|
||||
Credits []Credit
|
||||
Links []Link
|
||||
}
|
||||
)
|
||||
|
||||
|
@ -52,63 +58,10 @@ func (release Release) GetArtwork() string {
|
|||
return release.Artwork
|
||||
}
|
||||
|
||||
func (release Release) IsSingle() bool {
|
||||
func (release FullRelease) IsSingle() bool {
|
||||
return len(release.Tracks) == 1;
|
||||
}
|
||||
|
||||
func (release Release) IsReleased() bool {
|
||||
return release.ReleaseDate.Before(time.Now())
|
||||
}
|
||||
|
||||
func (release Release) GetUniqueArtists(only_primary bool) []Artist {
|
||||
var artists = []Artist{}
|
||||
|
||||
for _, credit := range release.Credits {
|
||||
if only_primary && !credit.Primary {
|
||||
continue
|
||||
}
|
||||
|
||||
exists := false
|
||||
for _, a := range artists {
|
||||
if a.ID == credit.Artist.ID {
|
||||
exists = true
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if exists {
|
||||
continue
|
||||
}
|
||||
|
||||
artists = append(artists, *credit.Artist)
|
||||
}
|
||||
|
||||
return artists
|
||||
}
|
||||
|
||||
func (release Release) GetUniqueArtistNames(only_primary bool) []string {
|
||||
var names = []string{}
|
||||
for _, artist := range release.GetUniqueArtists(only_primary) {
|
||||
names = append(names, artist.Name)
|
||||
}
|
||||
|
||||
return names
|
||||
}
|
||||
|
||||
func (release Release) PrintArtists(only_primary bool, ampersand bool) string {
|
||||
names := release.GetUniqueArtistNames(only_primary)
|
||||
|
||||
if len(names) == 0 {
|
||||
return "Unknown Artist"
|
||||
} else if len(names) == 1 {
|
||||
return names[0]
|
||||
}
|
||||
|
||||
if ampersand {
|
||||
res := strings.Join(names[:len(names)-1], ", ")
|
||||
res += " & " + names[len(names)-1]
|
||||
return res
|
||||
} else {
|
||||
return strings.Join(names[:], ", ")
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,10 +1,30 @@
|
|||
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"`
|
||||
Release *Release `json:"-" db:"-"`
|
||||
import (
|
||||
"html/template"
|
||||
"strings"
|
||||
)
|
||||
|
||||
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"`
|
||||
}
|
||||
|
||||
DisplayTrack struct {
|
||||
*Track
|
||||
Lyrics template.HTML
|
||||
Number int
|
||||
}
|
||||
)
|
||||
|
||||
func (track Track) MakeDisplay(number int) DisplayTrack {
|
||||
return DisplayTrack{
|
||||
Track: &track,
|
||||
Lyrics: template.HTML(strings.Replace(track.Lyrics, "\n", "<br>", -1)),
|
||||
Number: number,
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,10 +1,13 @@
|
|||
package view
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
|
||||
"arimelody.me/arimelody.me/global"
|
||||
music "arimelody.me/arimelody.me/music/controller"
|
||||
"arimelody.me/arimelody.me/music/model"
|
||||
"arimelody.me/arimelody.me/templates"
|
||||
)
|
||||
|
||||
// HTTP HANDLER METHODS
|
||||
|
@ -17,7 +20,15 @@ func Handler() http.Handler {
|
|||
ServeCatalog().ServeHTTP(w, r)
|
||||
return
|
||||
}
|
||||
ServeGateway().ServeHTTP(w, r)
|
||||
|
||||
var release model.Release
|
||||
err := global.DB.Get(&release, "SELECT * FROM musicrelease WHERE id=$1", r.URL.Path[1:])
|
||||
if err != nil {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
|
||||
ServeGateway(release).ServeHTTP(w, r)
|
||||
}))
|
||||
|
||||
return mux
|
||||
|
@ -25,71 +36,30 @@ func Handler() http.Handler {
|
|||
|
||||
func ServeCatalog() http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
releases := []model.Release{}
|
||||
for _, r := range global.Releases {
|
||||
if r.Visible {
|
||||
release := *r
|
||||
if !release.IsReleased() {
|
||||
release.ReleaseType = model.Upcoming
|
||||
}
|
||||
releases = append(releases, release)
|
||||
}
|
||||
}
|
||||
|
||||
global.ServeTemplate("music.html", releases).ServeHTTP(w, r)
|
||||
})
|
||||
}
|
||||
|
||||
/*
|
||||
func ServeArtwork() http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.URL.Path == "/" {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
|
||||
if !strings.HasSuffix(r.URL.Path, ".png") {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
|
||||
releaseID := r.URL.Path[1:len(r.URL.Path) - 4]
|
||||
var release = GetRelease(releaseID)
|
||||
if release == nil {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
|
||||
// only allow authorised users to view unreleased releases
|
||||
authorised := r.Context().Value("role") != nil && r.Context().Value("role") == "admin"
|
||||
if !release.IsReleased() && !authorised {
|
||||
admin.MustAuthorise(ServeArtwork()).ServeHTTP(w, r)
|
||||
return
|
||||
}
|
||||
|
||||
fp := filepath.Join("data", "music-artwork", releaseID + ".png")
|
||||
info, err := os.Stat(fp)
|
||||
if err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
}
|
||||
length := info.Size()
|
||||
|
||||
file, err := os.Open(fp)
|
||||
dbReleases, err := music.GetAllReleases(global.DB)
|
||||
if err != nil {
|
||||
fmt.Printf("FATAL: Failed to pull releases for catalog: %s\n", err)
|
||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
defer file.Close()
|
||||
releases := []*model.FullRelease{}
|
||||
for _, dbRelease := range dbReleases {
|
||||
if !dbRelease.Visible { continue }
|
||||
if !dbRelease.IsReleased() {
|
||||
dbRelease.ReleaseType = model.Upcoming
|
||||
}
|
||||
release, err := music.GetFullRelease(global.DB, dbRelease)
|
||||
if err != nil {
|
||||
fmt.Printf("FATAL: Failed to pull full release for %s: %s\n", dbRelease.ID, err)
|
||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
releases = append(releases, release)
|
||||
}
|
||||
|
||||
var bytes = make([]byte, length)
|
||||
file.Read(bytes)
|
||||
|
||||
w.Header().Add("Content-Type", "image/png")
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write(bytes)
|
||||
err = templates.Pages["music"].Execute(w, releases)
|
||||
if err != nil {
|
||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||
}
|
||||
})
|
||||
}
|
||||
*/
|
||||
|
|
|
@ -3,59 +3,42 @@ package view
|
|||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"html/template"
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
"arimelody.me/arimelody.me/admin"
|
||||
"arimelody.me/arimelody.me/global"
|
||||
"arimelody.me/arimelody.me/music/model"
|
||||
)
|
||||
|
||||
type (
|
||||
gatewayTrack struct {
|
||||
*model.Track
|
||||
Lyrics template.HTML
|
||||
Number int
|
||||
}
|
||||
|
||||
gatewayRelease struct {
|
||||
*model.Release
|
||||
Tracks []gatewayTrack
|
||||
Authorised bool
|
||||
}
|
||||
db "arimelody.me/arimelody.me/music/controller"
|
||||
"arimelody.me/arimelody.me/templates"
|
||||
)
|
||||
|
||||
// HTTP HANDLERS
|
||||
|
||||
func ServeRelease() http.Handler {
|
||||
func ServeRelease(release model.Release) http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.URL.Path == "/" {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
|
||||
releaseID := r.URL.Path[1:]
|
||||
var releaseRef = global.GetRelease(releaseID)
|
||||
if releaseRef == nil {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
var release = *releaseRef
|
||||
|
||||
// only allow authorised users to view hidden releases
|
||||
authorised := admin.GetSession(r) != nil
|
||||
if !authorised && !release.Visible {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
if !authorised && !release.IsReleased() {
|
||||
release.Tracks = nil
|
||||
release.Credits = nil
|
||||
|
||||
fullRelease := &model.FullRelease{
|
||||
Release: &release,
|
||||
}
|
||||
|
||||
if authorised || release.IsReleased() {
|
||||
fullerRelease, err := db.GetFullRelease(global.DB, &release)
|
||||
if err != nil {
|
||||
fmt.Printf("FATAL: Failed to pull full release data for %s: %s\n", release.ID, err)
|
||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
fullRelease = fullerRelease
|
||||
}
|
||||
|
||||
w.Header().Add("Content-Type", "application/json")
|
||||
err := json.NewEncoder(w).Encode(release)
|
||||
err := json.NewEncoder(w).Encode(fullRelease)
|
||||
if err != nil {
|
||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||
return
|
||||
|
@ -63,42 +46,34 @@ func ServeRelease() http.Handler {
|
|||
})
|
||||
}
|
||||
|
||||
func ServeGateway() http.Handler {
|
||||
func ServeGateway(release model.Release) http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.URL.Path == "/" {
|
||||
http.Redirect(w, r, "/music", http.StatusPermanentRedirect)
|
||||
return
|
||||
}
|
||||
|
||||
id := r.URL.Path[1:]
|
||||
release := global.GetRelease(id)
|
||||
if release == nil {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
|
||||
// only allow authorised users to view hidden releases
|
||||
authorised := admin.GetSession(r) != nil
|
||||
if !release.Visible && !authorised {
|
||||
if !authorised && !release.Visible {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
|
||||
tracks := []gatewayTrack{}
|
||||
for i, track := range release.Tracks {
|
||||
tracks = append(tracks, gatewayTrack{
|
||||
Track: track,
|
||||
Lyrics: template.HTML(strings.Replace(track.Lyrics, "\n", "<br>", -1)),
|
||||
Number: i + 1,
|
||||
})
|
||||
fullRelease := &model.FullRelease{
|
||||
Release: &release,
|
||||
}
|
||||
|
||||
lrw := global.LoggingResponseWriter{ResponseWriter: w, Code: http.StatusOK}
|
||||
if authorised || release.IsReleased() {
|
||||
fullerRelease, err := db.GetFullRelease(global.DB, &release)
|
||||
if err != nil {
|
||||
fmt.Printf("FATAL: Failed to pull full release data for %s: %s\n", release.ID, err)
|
||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
fullRelease = fullerRelease
|
||||
}
|
||||
|
||||
global.ServeTemplate("music-gateway.html", gatewayRelease{release, tracks, authorised}).ServeHTTP(&lrw, r)
|
||||
err := templates.Pages["music-gateway"].Execute(w, fullRelease)
|
||||
|
||||
if lrw.Code != http.StatusOK {
|
||||
fmt.Printf("Error rendering music gateway for %s\n", id)
|
||||
if err != nil {
|
||||
fmt.Printf("Error rendering music gateway for %s: %s\n", release.ID, err)
|
||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
})
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue