HOLY REFACTOR GOOD GRIEF (also finally started some CRUD work)
Signed-off-by: ari melody <ari@arimelody.me>
This commit is contained in:
parent
1c310c9101
commit
442889340c
80 changed files with 1571 additions and 1330 deletions
155
music/artist.go
155
music/artist.go
|
|
@ -1,155 +0,0 @@
|
|||
package music
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
|
||||
"github.com/jmoiron/sqlx"
|
||||
)
|
||||
|
||||
type Artist struct {
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Website string `json:"website"`
|
||||
}
|
||||
|
||||
var Artists []Artist
|
||||
|
||||
func GetArtist(id string) *Artist {
|
||||
for _, artist := range Artists {
|
||||
if artist.GetID() == id {
|
||||
return &artist
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// GETTERS
|
||||
|
||||
func (artist Artist) GetID() string {
|
||||
return artist.ID
|
||||
}
|
||||
|
||||
func (artist Artist) GetName() string {
|
||||
return artist.Name
|
||||
}
|
||||
|
||||
func (artist Artist) GetWebsite() string {
|
||||
return artist.Website
|
||||
}
|
||||
|
||||
// SETTERS
|
||||
|
||||
func (artist Artist) SetID(id string) error {
|
||||
artist.ID = id
|
||||
return nil
|
||||
}
|
||||
|
||||
func (artist Artist) SetName(name string) error {
|
||||
artist.Name = name
|
||||
return nil
|
||||
}
|
||||
|
||||
func (artist Artist) SetWebsite(website string) error {
|
||||
artist.Website = website
|
||||
return nil
|
||||
}
|
||||
|
||||
// DATABASE
|
||||
|
||||
func (artist Artist) PushToDB(db *sqlx.DB) {
|
||||
// fmt.Printf("Pushing artist [%s] to database...", artist.Name)
|
||||
|
||||
db.MustExec(
|
||||
"INSERT INTO artists (id, name, website) "+
|
||||
"VALUES ($1, $2, $3) "+
|
||||
"ON CONFLICT (id) "+
|
||||
"DO UPDATE SET name=$2, website=$3",
|
||||
artist.ID,
|
||||
artist.Name,
|
||||
artist.Website,
|
||||
)
|
||||
|
||||
// fmt.Printf("done!\n")
|
||||
}
|
||||
|
||||
func PullAllArtists(db *sqlx.DB) ([]Artist, error) {
|
||||
artists := []Artist{}
|
||||
|
||||
rows, err := db.Query("SELECT id, name, website FROM artists")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for rows.Next() {
|
||||
var artist = Artist{}
|
||||
|
||||
err = rows.Scan(
|
||||
&artist.ID,
|
||||
&artist.Name,
|
||||
&artist.Website,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
artists = append(artists, artist)
|
||||
}
|
||||
|
||||
return artists, nil
|
||||
}
|
||||
|
||||
// HTTP HANDLERS
|
||||
|
||||
func ServeArtist() http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.URL.Path == "/" {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
|
||||
type (
|
||||
creditJSON struct {
|
||||
Role string `json:"role"`
|
||||
Primary bool `json:"primary"`
|
||||
}
|
||||
artistJSON struct {
|
||||
Artist
|
||||
Credits map[string]creditJSON `json:"credits"`
|
||||
}
|
||||
)
|
||||
var res = artistJSON{}
|
||||
|
||||
res.ID = r.URL.Path[1:]
|
||||
var artist = GetArtist(res.ID)
|
||||
if artist == nil {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
res.Name = artist.Name
|
||||
res.Website = artist.Website
|
||||
res.Credits = make(map[string]creditJSON)
|
||||
|
||||
for _, release := range Releases {
|
||||
for _, credit := range release.Credits {
|
||||
if credit.Artist.ID != res.ID {
|
||||
continue
|
||||
}
|
||||
res.Credits[release.ID] = creditJSON{
|
||||
Role: credit.Role,
|
||||
Primary: credit.Primary,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
jsonBytes, err := json.Marshal(res)
|
||||
if err != nil {
|
||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
w.Header().Add("Content-Type", "application/json")
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write(jsonBytes)
|
||||
})
|
||||
}
|
||||
65
music/controller/artist.go
Normal file
65
music/controller/artist.go
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
package music
|
||||
|
||||
import (
|
||||
"arimelody.me/arimelody.me/music/model"
|
||||
"github.com/jmoiron/sqlx"
|
||||
)
|
||||
|
||||
// DATABASE
|
||||
|
||||
func PullAllArtists(db *sqlx.DB) ([]model.Artist, error) {
|
||||
var artists = []model.Artist{}
|
||||
|
||||
err := db.Select(&artists, "SELECT * FROM artist")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return artists, nil
|
||||
}
|
||||
|
||||
func CreateArtistDB(db *sqlx.DB, artist *model.Artist) error {
|
||||
_, err := db.Exec(
|
||||
"INSERT INTO artist (id, name, website, avatar) "+
|
||||
"VALUES ($1, $2, $3, $4)",
|
||||
artist.ID,
|
||||
artist.Name,
|
||||
artist.Website,
|
||||
artist.Avatar,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func UpdateArtistDB(db *sqlx.DB, artist *model.Artist) error {
|
||||
_, err := db.Exec(
|
||||
"UPDATE artist "+
|
||||
"SET name=$2, website=$3, avatar=$4 "+
|
||||
"WHERE id=$1",
|
||||
artist.ID,
|
||||
artist.Name,
|
||||
artist.Website,
|
||||
artist.Avatar,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func DeleteArtistDB(db *sqlx.DB, artistID string) error {
|
||||
_, err := db.Exec(
|
||||
"DELETE FROM artist "+
|
||||
"WHERE id=$1",
|
||||
artistID,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
70
music/controller/credit.go
Normal file
70
music/controller/credit.go
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
package music
|
||||
|
||||
import (
|
||||
"arimelody.me/arimelody.me/music/model"
|
||||
"github.com/jmoiron/sqlx"
|
||||
)
|
||||
|
||||
// DATABASE
|
||||
|
||||
func PullReleaseCredits(db *sqlx.DB, releaseID string) ([]model.Credit, error) {
|
||||
var credits = []model.Credit{}
|
||||
|
||||
err := db.Select(
|
||||
&credits,
|
||||
"SELECT * FROM musiccredit WHERE release=$1",
|
||||
releaseID,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return credits, nil
|
||||
}
|
||||
|
||||
func CreateCreditDB(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)",
|
||||
releaseID,
|
||||
artistID,
|
||||
credit.Role,
|
||||
credit.Primary,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func UpdateCreditDB(db *sqlx.DB, releaseID string, artistID string, credit *model.Credit) (error) {
|
||||
_, err := db.Exec(
|
||||
"UPDATE musiccredit SET "+
|
||||
"role=$3, is_primary=$4 "+
|
||||
"WHERE release=$1, artist=$2",
|
||||
releaseID,
|
||||
artistID,
|
||||
credit.Role,
|
||||
credit.Primary,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func DeleteCreditDB(db *sqlx.DB, releaseID string, artistID string) (error) {
|
||||
_, err := db.Exec(
|
||||
"DELETE FROM musiccredit "+
|
||||
"WHERE release=$1, artist=$2",
|
||||
releaseID,
|
||||
artistID,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
68
music/controller/link.go
Normal file
68
music/controller/link.go
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
package music
|
||||
|
||||
import (
|
||||
"arimelody.me/arimelody.me/music/model"
|
||||
"github.com/jmoiron/sqlx"
|
||||
)
|
||||
|
||||
// DATABASE
|
||||
|
||||
func PullReleaseLinks(db *sqlx.DB, releaseID string) ([]model.Link, error) {
|
||||
var links = []model.Link{}
|
||||
|
||||
err := db.Select(
|
||||
&links,
|
||||
"SELECT * FROM musiclink WHERE release=$1",
|
||||
releaseID,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return links, nil
|
||||
}
|
||||
|
||||
func CreateLinkDB(db *sqlx.DB, releaseID string, link *model.Link) (error) {
|
||||
_, err := db.Exec(
|
||||
"INSERT INTO musiclink (release, name, url) "+
|
||||
"VALUES ($1, $2, $3)",
|
||||
releaseID,
|
||||
link.Name,
|
||||
link.URL,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func UpdateLinkDB(db *sqlx.DB, releaseID string, link *model.Link) (error) {
|
||||
_, err := db.Exec(
|
||||
"UPDATE musiclink SET "+
|
||||
"name=$2, url=$3 "+
|
||||
"WHERE release=$1",
|
||||
releaseID,
|
||||
link.Name,
|
||||
link.URL,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func DeleteLinkDB(db *sqlx.DB, releaseID string, link *model.Link) (error) {
|
||||
_, err := db.Exec(
|
||||
"DELETE FROM musiclink "+
|
||||
"WHERE release=$1, name=$2",
|
||||
releaseID,
|
||||
link.Name,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
76
music/controller/release.go
Normal file
76
music/controller/release.go
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
package music
|
||||
|
||||
import (
|
||||
"arimelody.me/arimelody.me/music/model"
|
||||
"github.com/jmoiron/sqlx"
|
||||
)
|
||||
|
||||
// DATABASE
|
||||
|
||||
func PullAllReleases(db *sqlx.DB) ([]model.Release, error) {
|
||||
var releases = []model.Release{}
|
||||
|
||||
err := db.Select(&releases, "SELECT * FROM musicrelease ORDER BY release_date DESC")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return releases, nil
|
||||
}
|
||||
|
||||
func CreateReleaseDB(db *sqlx.DB, release *model.Release) error {
|
||||
_, err := db.Exec(
|
||||
"INSERT INTO musicrelease "+
|
||||
"(id, visible, title, description, type, release_date, artwork, buyname, buylink) "+
|
||||
"VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)",
|
||||
release.ID,
|
||||
release.Visible,
|
||||
release.Title,
|
||||
release.Description,
|
||||
release.ReleaseType,
|
||||
release.ReleaseDate.Format("2-Jan-2006"),
|
||||
release.Artwork,
|
||||
release.Buyname,
|
||||
release.Buylink,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
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) "+
|
||||
"WHERE id=$1",
|
||||
release.ID,
|
||||
release.Title,
|
||||
release.Description,
|
||||
release.ReleaseType,
|
||||
release.ReleaseDate.Format("2-Jan-2006"),
|
||||
release.Artwork,
|
||||
release.Buyname,
|
||||
release.Buylink,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func DeleteReleaseDB(db *sqlx.DB, release model.Release) error {
|
||||
_, err := db.Exec(
|
||||
"DELETE FROM musicrelease "+
|
||||
"WHERE id=$1",
|
||||
release.ID,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
69
music/controller/track.go
Normal file
69
music/controller/track.go
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
package music
|
||||
|
||||
import (
|
||||
"arimelody.me/arimelody.me/music/model"
|
||||
"github.com/jmoiron/sqlx"
|
||||
)
|
||||
|
||||
// DATABASE
|
||||
|
||||
func PullAllTracks(db *sqlx.DB) ([]model.Track, error) {
|
||||
var tracks = []model.Track{}
|
||||
|
||||
err := db.Select(&tracks, "SELECT id, title, description, lyrics, preview_url FROM musictrack RETURNING id")
|
||||
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(
|
||||
"INSERT INTO musictrack (title, description, lyrics, preview_url) "+
|
||||
"VALUES ($1, $2, $3, $4) "+
|
||||
"RETURNING id",
|
||||
track.Title,
|
||||
track.Description,
|
||||
track.Lyrics,
|
||||
track.PreviewURL,
|
||||
).Scan(&trackID)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
return trackID, nil
|
||||
}
|
||||
|
||||
func UpdateTrackDB(db *sqlx.DB, track *model.Track) error {
|
||||
_, err := db.Exec(
|
||||
"UPDATE musictrack "+
|
||||
"SET title=$2, description=$3, lyrics=$4, preview_url=$5 "+
|
||||
"WHERE id=$1"+
|
||||
"RETURNING id",
|
||||
track.ID,
|
||||
track.Title,
|
||||
track.Description,
|
||||
track.Lyrics,
|
||||
track.PreviewURL,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func DeleteTrackDB(db *sqlx.DB, trackID string) error {
|
||||
_, err := db.Exec(
|
||||
"DELETE FROM musictrack "+
|
||||
"WHERE id=$1",
|
||||
trackID,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
@ -1,92 +0,0 @@
|
|||
package music
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/jmoiron/sqlx"
|
||||
)
|
||||
|
||||
type (
|
||||
Credit struct {
|
||||
Artist *Artist `json:"artist"`
|
||||
Role string `json:"role"`
|
||||
Primary bool `json:"primary"`
|
||||
}
|
||||
|
||||
PostCreditBody struct {
|
||||
Artist string `json:"artist"`
|
||||
Role string `json:"role"`
|
||||
Primary bool `json:"primary"`
|
||||
}
|
||||
)
|
||||
|
||||
// GETTERS
|
||||
|
||||
func (credit Credit) GetArtist() Artist {
|
||||
return *credit.Artist
|
||||
}
|
||||
|
||||
func (credit Credit) GetRole() string {
|
||||
return credit.Role
|
||||
}
|
||||
|
||||
func (credit Credit) IsPrimary() bool {
|
||||
return credit.Primary
|
||||
}
|
||||
|
||||
// SETTERS
|
||||
|
||||
func (credit Credit) SetArtist(artist *Artist) error {
|
||||
// TODO: update DB
|
||||
credit.Artist = artist
|
||||
return nil
|
||||
}
|
||||
|
||||
func (credit Credit) SetRole(role string) error {
|
||||
// TODO: update DB
|
||||
credit.Role = role
|
||||
return nil
|
||||
}
|
||||
|
||||
func (credit Credit) SetPrimary(primary bool) error {
|
||||
// TODO: update DB
|
||||
credit.Primary = primary
|
||||
return nil
|
||||
}
|
||||
|
||||
// DATABASE
|
||||
|
||||
func PullReleaseCredits(db *sqlx.DB, releaseID string) ([]Credit, error) {
|
||||
var credits = []Credit{}
|
||||
|
||||
credit_rows, err := db.Query("SELECT artist, role, is_primary FROM musiccredits WHERE release=$1", releaseID)
|
||||
if err != nil {
|
||||
return []Credit{}, err
|
||||
}
|
||||
|
||||
for credit_rows.Next() {
|
||||
var artistID string
|
||||
var credit = Credit{}
|
||||
err = credit_rows.Scan(
|
||||
&artistID,
|
||||
&credit.Role,
|
||||
&credit.Primary,
|
||||
)
|
||||
if err != nil {
|
||||
fmt.Printf("Error while pulling credit for release %s: %s\n", releaseID, err)
|
||||
continue
|
||||
}
|
||||
|
||||
credit.Artist = GetArtist(artistID)
|
||||
if credit.Artist == nil {
|
||||
// this should absolutely not happen ever due to foreign key
|
||||
// constraints, but it doesn't hurt to be sure!
|
||||
fmt.Printf("Error while pulling credit for release %s: Artist %s does not exist\n", releaseID, artistID)
|
||||
continue
|
||||
}
|
||||
|
||||
credits = append(credits, credit)
|
||||
}
|
||||
|
||||
return credits, nil
|
||||
}
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
package music
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"github.com/jmoiron/sqlx"
|
||||
)
|
||||
|
||||
type Link struct {
|
||||
Name string `json:"name"`
|
||||
URL string `json:"url"`
|
||||
}
|
||||
|
||||
// GETTERS
|
||||
|
||||
func (link Link) GetName() string {
|
||||
return link.Name
|
||||
}
|
||||
|
||||
func (link Link) GetURL() string {
|
||||
return link.URL
|
||||
}
|
||||
|
||||
// SETTERS
|
||||
|
||||
func (link Link) SetName(name string) error {
|
||||
// TODO: update DB
|
||||
link.Name = name
|
||||
return nil
|
||||
}
|
||||
|
||||
func (link Link) SetURL(url string) error {
|
||||
// TODO: update DB
|
||||
link.URL = url
|
||||
return nil
|
||||
}
|
||||
|
||||
// MISC
|
||||
|
||||
func (link Link) NormaliseName() string {
|
||||
rgx := regexp.MustCompile(`[^a-z0-9]`)
|
||||
return strings.ToLower(rgx.ReplaceAllString(link.Name, ""))
|
||||
}
|
||||
|
||||
// DATABASE
|
||||
|
||||
func PullReleaseLinks(db *sqlx.DB, releaseID string) ([]Link, error) {
|
||||
var links = []Link{}
|
||||
|
||||
link_rows, err := db.Query("SELECT name, url FROM musiclinks WHERE release=$1", releaseID);
|
||||
if err != nil {
|
||||
return []Link{}, err
|
||||
}
|
||||
|
||||
for link_rows.Next() {
|
||||
var link = Link{}
|
||||
|
||||
err = link_rows.Scan(
|
||||
&link.Name,
|
||||
&link.URL,
|
||||
)
|
||||
if err != nil {
|
||||
fmt.Printf("Error while pulling link for release %s: %s\n", releaseID, err)
|
||||
continue
|
||||
}
|
||||
|
||||
links = append(links, link)
|
||||
}
|
||||
|
||||
return links, nil
|
||||
}
|
||||
17
music/model/artist.go
Normal file
17
music/model/artist.go
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
package model
|
||||
|
||||
type (
|
||||
Artist struct {
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Website string `json:"website"`
|
||||
Avatar string `json:"avatar"`
|
||||
}
|
||||
)
|
||||
|
||||
func (artist Artist) GetAvatar() string {
|
||||
if artist.Avatar == "" {
|
||||
return "/img/default-avatar.png"
|
||||
}
|
||||
return artist.Avatar
|
||||
}
|
||||
7
music/model/credit.go
Normal file
7
music/model/credit.go
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
package model
|
||||
|
||||
type Credit struct {
|
||||
Artist *Artist `json:"artist"`
|
||||
Role string `json:"role"`
|
||||
Primary bool `json:"primary" db:"is_primary"`
|
||||
}
|
||||
16
music/model/link.go
Normal file
16
music/model/link.go
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
package model
|
||||
|
||||
import (
|
||||
"regexp"
|
||||
"strings"
|
||||
)
|
||||
|
||||
type Link struct {
|
||||
Name string `json:"name"`
|
||||
URL string `json:"url"`
|
||||
}
|
||||
|
||||
func (link Link) NormaliseName() string {
|
||||
rgx := regexp.MustCompile(`[^a-z0-9]`)
|
||||
return strings.ToLower(rgx.ReplaceAllString(link.Name, ""))
|
||||
}
|
||||
109
music/model/release.go
Normal file
109
music/model/release.go
Normal file
|
|
@ -0,0 +1,109 @@
|
|||
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"`
|
||||
}
|
||||
)
|
||||
|
||||
const (
|
||||
Single ReleaseType = "Single"
|
||||
Album ReleaseType = "Album"
|
||||
EP ReleaseType = "EP"
|
||||
Compilation ReleaseType = "Compilation"
|
||||
)
|
||||
|
||||
// GETTERS
|
||||
|
||||
func (release Release) GetArtwork() string {
|
||||
if release.Artwork == "" {
|
||||
return "/img/default-cover-art.png"
|
||||
}
|
||||
return release.Artwork
|
||||
}
|
||||
|
||||
func (release Release) PrintReleaseDate() string {
|
||||
return release.ReleaseDate.Format("02 January 2006")
|
||||
}
|
||||
|
||||
func (release Release) GetReleaseYear() int {
|
||||
return release.ReleaseDate.Year()
|
||||
}
|
||||
|
||||
func (release Release) 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[:], ", ")
|
||||
}
|
||||
}
|
||||
9
music/model/track.go
Normal file
9
music/model/track.go
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
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"`
|
||||
}
|
||||
492
music/release.go
492
music/release.go
|
|
@ -1,492 +0,0 @@
|
|||
package music
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"arimelody.me/arimelody.me/admin"
|
||||
"github.com/jmoiron/sqlx"
|
||||
)
|
||||
|
||||
type ReleaseType string
|
||||
|
||||
const (
|
||||
Single ReleaseType = "Single"
|
||||
Album ReleaseType = "Album"
|
||||
EP ReleaseType = "EP"
|
||||
Compilation ReleaseType = "Compilation"
|
||||
)
|
||||
|
||||
type (
|
||||
Release struct {
|
||||
ID string `json:"id"`
|
||||
Title string `json:"title"`
|
||||
Description string `json:"description"`
|
||||
ReleaseType ReleaseType `json:"type"`
|
||||
ReleaseDate time.Time `json:"releaseDate"`
|
||||
Artwork string `json:"artwork"`
|
||||
Buyname string `json:"buyname"`
|
||||
Buylink string `json:"buylink"`
|
||||
Links []Link `json:"links"`
|
||||
Credits []Credit `json:"credits"`
|
||||
Tracks []Track `json:"tracks"`
|
||||
}
|
||||
|
||||
PostReleaseBody struct {
|
||||
ID string `json:"id"`
|
||||
Title string `json:"title"`
|
||||
Description string `json:"description"`
|
||||
ReleaseType ReleaseType `json:"type"`
|
||||
ReleaseDate time.Time `json:"releaseDate"`
|
||||
Artwork string `json:"artwork"`
|
||||
Buyname string `json:"buyname"`
|
||||
Buylink string `json:"buylink"`
|
||||
Links []Link `json:"links"`
|
||||
Credits []PostCreditBody `json:"credits"`
|
||||
Tracks []Track `json:"tracks"`
|
||||
}
|
||||
)
|
||||
|
||||
var Releases []Release;
|
||||
|
||||
// GETTERS
|
||||
|
||||
func (release Release) GetID() string {
|
||||
return release.ID
|
||||
}
|
||||
|
||||
func (release Release) GetTitle() string {
|
||||
return release.Title
|
||||
}
|
||||
|
||||
func (release Release) GetDescription() string {
|
||||
return release.Description
|
||||
}
|
||||
|
||||
func (release Release) GetType() ReleaseType {
|
||||
return release.ReleaseType
|
||||
}
|
||||
|
||||
func (release Release) GetReleaseDate() time.Time {
|
||||
return release.ReleaseDate
|
||||
}
|
||||
|
||||
func (release Release) GetArtwork() string {
|
||||
if release.Artwork == "" {
|
||||
return "/img/default-cover-art.png"
|
||||
}
|
||||
return release.Artwork
|
||||
}
|
||||
|
||||
func (release Release) GetBuyName() string {
|
||||
return release.Buyname
|
||||
}
|
||||
|
||||
func (release Release) GetBuyLink() string {
|
||||
return release.Buylink
|
||||
}
|
||||
|
||||
func (release Release) GetLinks() []Link {
|
||||
return release.Links
|
||||
}
|
||||
|
||||
func (release Release) GetCredits() []Credit {
|
||||
return release.Credits
|
||||
}
|
||||
|
||||
func (release Release) GetTracks() []Track {
|
||||
return release.Tracks
|
||||
}
|
||||
|
||||
// SETTERS
|
||||
|
||||
func (release Release) SetID(id string) error {
|
||||
// TODO: update DB
|
||||
release.ID = id
|
||||
return nil
|
||||
}
|
||||
|
||||
func (release Release) SetTitle(title string) error {
|
||||
// TODO: update DB
|
||||
release.Title = title
|
||||
return nil
|
||||
}
|
||||
|
||||
func (release Release) SetDescription(description string) error {
|
||||
// TODO: update DB
|
||||
release.Description = description
|
||||
return nil
|
||||
}
|
||||
|
||||
func (release Release) SetType(releaseType ReleaseType) error {
|
||||
// TODO: update DB
|
||||
release.ReleaseType = releaseType
|
||||
return nil
|
||||
}
|
||||
|
||||
func (release Release) SetReleaseDate(releaseDate time.Time) error {
|
||||
// TODO: update DB
|
||||
release.ReleaseDate = releaseDate
|
||||
return nil
|
||||
}
|
||||
|
||||
func (release Release) SetArtwork(artwork string) error {
|
||||
// TODO: update DB
|
||||
release.Artwork = artwork
|
||||
return nil
|
||||
}
|
||||
|
||||
func (release Release) SetBuyName(buyname string) error {
|
||||
// TODO: update DB
|
||||
release.Buyname = buyname
|
||||
return nil
|
||||
}
|
||||
|
||||
func (release Release) SetBuyLink(buylink string) error {
|
||||
// TODO: update DB
|
||||
release.Buylink = buylink
|
||||
return nil
|
||||
}
|
||||
|
||||
func (release Release) SetLinks(links []Link) error {
|
||||
// TODO: update DB
|
||||
release.Links = links
|
||||
return nil
|
||||
}
|
||||
|
||||
func (release Release) SetCredits(credits []Credit) error {
|
||||
// TODO: update DB
|
||||
release.Credits = credits
|
||||
return nil
|
||||
}
|
||||
|
||||
func (release Release) SetTracks(tracks []Track) error {
|
||||
// TODO: update DB
|
||||
release.Tracks = tracks
|
||||
return nil
|
||||
}
|
||||
|
||||
// MISC
|
||||
|
||||
func GetRelease(id string) *Release {
|
||||
for _, release := range Releases {
|
||||
if release.GetID() == id {
|
||||
return &release
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (release Release) PrintReleaseDate() string {
|
||||
return release.ReleaseDate.Format("02 January 2006")
|
||||
}
|
||||
|
||||
func (release Release) GetReleaseYear() int {
|
||||
return release.ReleaseDate.Year()
|
||||
}
|
||||
|
||||
func (release Release) 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.GetName())
|
||||
}
|
||||
|
||||
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[:], ", ")
|
||||
}
|
||||
}
|
||||
|
||||
// DATABASE
|
||||
|
||||
func (release Release) PushToDB(db *sqlx.DB) error {
|
||||
// fmt.Printf("Pushing release [%s] to database...", release.ID)
|
||||
|
||||
tx, err := db.Begin()
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintf("Failed to initiate transaction: %s", err))
|
||||
}
|
||||
|
||||
_, err = tx.Exec(
|
||||
"INSERT INTO musicreleases (id, title, description, type, release_date, artwork, buyname, buylink) "+
|
||||
"VALUES ($1, $2, $3, $4, $5, $6, $7, $8) "+
|
||||
"ON CONFLICT (id) "+
|
||||
"DO UPDATE SET title=$2, description=$3, type=$4, release_date=$5, artwork=$6, buyname=$7, buylink=$8",
|
||||
release.ID,
|
||||
release.Title,
|
||||
release.Description,
|
||||
release.ReleaseType,
|
||||
release.ReleaseDate.Format("2-Jan-2006"),
|
||||
release.Artwork,
|
||||
release.Buyname,
|
||||
release.Buylink,
|
||||
)
|
||||
|
||||
for _, link := range release.Links {
|
||||
_, err = tx.Exec(
|
||||
"INSERT INTO musiclinks (release, name, url) "+
|
||||
"VALUES ($1, $2, $3) "+
|
||||
"ON CONFLICT (release, name) "+
|
||||
"DO UPDATE SET url=$3 ",
|
||||
release.ID,
|
||||
link.Name,
|
||||
link.URL,
|
||||
)
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintf("Failed to add music link to transaction: %s", err))
|
||||
}
|
||||
}
|
||||
for _, credit := range release.Credits {
|
||||
_, err = tx.Exec(
|
||||
"INSERT INTO musiccredits (release, artist, role, is_primary) "+
|
||||
"VALUES ($1, $2, $3, $4) "+
|
||||
"ON CONFLICT (release, artist) "+
|
||||
"DO UPDATE SET role=$3, is_primary=$4",
|
||||
release.ID,
|
||||
credit.Artist.ID,
|
||||
credit.Role,
|
||||
credit.Primary,
|
||||
)
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintf("Failed to add music credit to transaction: %s", err))
|
||||
}
|
||||
}
|
||||
for _, track := range release.Tracks {
|
||||
_, err = tx.Exec(
|
||||
"INSERT INTO musictracks (release, number, title, description, lyrics, preview_url) "+
|
||||
"VALUES ($1, $2, $3, $4, $5, $6) "+
|
||||
"ON CONFLICT (release, number) "+
|
||||
"DO UPDATE SET title=$3, description=$4, lyrics=$5, preview_url=$6",
|
||||
release.ID,
|
||||
track.Number,
|
||||
track.Title,
|
||||
track.Description,
|
||||
track.Lyrics,
|
||||
track.PreviewURL,
|
||||
)
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintf("Failed to add music track to transaction: %s", err))
|
||||
}
|
||||
}
|
||||
|
||||
err = tx.Commit()
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintf("Failed to commit transaction: %s", err))
|
||||
}
|
||||
|
||||
// fmt.Printf("done!\n")
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (release Release) DeleteFromDB(db *sqlx.DB) error {
|
||||
// this probably doesn't need to be a transaction;
|
||||
// i just felt like making it one
|
||||
tx, err := db.Begin()
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintf("Failed to initiate transaction: %s", err))
|
||||
}
|
||||
|
||||
_, err = tx.Exec("DELETE FROM musicreleases WHERE id=$1", release.ID)
|
||||
|
||||
err = tx.Commit()
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintf("Failed to commit transaction: %s", err))
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func PullAllReleases(db *sqlx.DB) ([]Release, error) {
|
||||
releases := []Release{}
|
||||
|
||||
rows, err := db.Query("SELECT id, title, description, type, release_date, artwork, buyname, buylink FROM musicreleases ORDER BY release_date DESC")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for rows.Next() {
|
||||
var release = Release{}
|
||||
|
||||
err = rows.Scan(
|
||||
&release.ID,
|
||||
&release.Title,
|
||||
&release.Description,
|
||||
&release.ReleaseType,
|
||||
&release.ReleaseDate,
|
||||
&release.Artwork,
|
||||
&release.Buyname,
|
||||
&release.Buylink,
|
||||
)
|
||||
if err != nil {
|
||||
fmt.Printf("Error while pulling a release: %s\n", err)
|
||||
continue
|
||||
}
|
||||
|
||||
release.Credits, err = PullReleaseCredits(db, release.ID)
|
||||
if err != nil {
|
||||
fmt.Printf("Failed to pull credits for %s: %v\n", release.ID, err)
|
||||
}
|
||||
|
||||
release.Links, err = PullReleaseLinks(db, release.ID)
|
||||
if err != nil {
|
||||
fmt.Printf("Failed to pull links for %s: %v\n", release.ID, err)
|
||||
}
|
||||
|
||||
release.Tracks, err = PullReleaseTracks(db, release.ID)
|
||||
if err != nil {
|
||||
return nil, errors.New(fmt.Sprintf("error pulling tracks for %s: %v\n", release.ID, err))
|
||||
}
|
||||
|
||||
releases = append(releases, release)
|
||||
}
|
||||
|
||||
return releases, nil
|
||||
}
|
||||
|
||||
// HTTP HANDLERS
|
||||
|
||||
func ServeRelease() 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 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(ServeRelease()).ServeHTTP(w, r)
|
||||
return
|
||||
}
|
||||
|
||||
jsonBytes, err := json.Marshal(release)
|
||||
if err != nil {
|
||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
w.Header().Add("Content-Type", "application/json")
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write(jsonBytes)
|
||||
})
|
||||
}
|
||||
|
||||
func PostRelease() http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodPost {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
|
||||
var data PostReleaseBody
|
||||
err := json.NewDecoder(r.Body).Decode(&data)
|
||||
if err != nil {
|
||||
http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
if GetRelease(data.ID) != nil {
|
||||
http.Error(w, fmt.Sprintf("Release %s already exists", data.ID), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
var credits = []Credit{}
|
||||
|
||||
for _, credit := range data.Credits {
|
||||
var artist = GetArtist(credit.Artist)
|
||||
|
||||
if artist == nil {
|
||||
http.Error(w, fmt.Sprintf("Artist %s does not exist", credit.Artist), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
credits = append(credits, Credit{
|
||||
Artist: artist,
|
||||
Role: credit.Role,
|
||||
Primary: credit.Primary,
|
||||
})
|
||||
}
|
||||
|
||||
var release = Release{
|
||||
ID: data.ID,
|
||||
Title: data.Title,
|
||||
Description: data.Description,
|
||||
ReleaseType: data.ReleaseType,
|
||||
ReleaseDate: data.ReleaseDate,
|
||||
Artwork: data.Artwork,
|
||||
Buyname: data.Buyname,
|
||||
Buylink: data.Buylink,
|
||||
Links: data.Links,
|
||||
Credits: credits,
|
||||
Tracks: data.Tracks,
|
||||
}
|
||||
|
||||
Releases = append([]Release{release}, Releases...)
|
||||
|
||||
jsonBytes, err := json.Marshal(release)
|
||||
w.Header().Add("Content-Type", "application/json")
|
||||
w.WriteHeader(http.StatusCreated)
|
||||
w.Write(jsonBytes)
|
||||
})
|
||||
}
|
||||
100
music/track.go
100
music/track.go
|
|
@ -1,100 +0,0 @@
|
|||
package music
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/jmoiron/sqlx"
|
||||
)
|
||||
|
||||
type Track struct {
|
||||
Number int `json:"number"`
|
||||
Title string `json:"title"`
|
||||
Description string `json:"description"`
|
||||
Lyrics string `json:"lyrics"`
|
||||
PreviewURL string `json:"previewURL"`
|
||||
}
|
||||
|
||||
// GETTERS
|
||||
|
||||
func (track Track) GetNumber() int {
|
||||
return track.Number
|
||||
}
|
||||
|
||||
func (track Track) GetTitle() string {
|
||||
return track.Title
|
||||
}
|
||||
|
||||
func (track Track) GetDescription() string {
|
||||
return track.Description
|
||||
}
|
||||
|
||||
func (track Track) GetLyrics() string {
|
||||
return track.Lyrics
|
||||
}
|
||||
|
||||
func (track Track) GetPreviewURL() string {
|
||||
return track.PreviewURL
|
||||
}
|
||||
|
||||
// SETTERS
|
||||
|
||||
func (track Track) SetNumber(number int) error {
|
||||
// TODO: update DB
|
||||
track.Number = number
|
||||
return nil
|
||||
}
|
||||
|
||||
func (track Track) SetTitle(title string) error {
|
||||
// TODO: update DB
|
||||
track.Title = title
|
||||
return nil
|
||||
}
|
||||
|
||||
func (track Track) SetDescription(description string) error {
|
||||
// TODO: update DB
|
||||
track.Description = description
|
||||
return nil
|
||||
}
|
||||
|
||||
func (track Track) SetLyrics(lyrics string) error {
|
||||
// TODO: update DB
|
||||
track.Lyrics = lyrics
|
||||
return nil
|
||||
}
|
||||
|
||||
func (track Track) SetPreviewURL(previewURL string) error {
|
||||
// TODO: update DB
|
||||
track.PreviewURL = previewURL
|
||||
return nil
|
||||
}
|
||||
|
||||
// DATABASE
|
||||
|
||||
func PullReleaseTracks(db *sqlx.DB, releaseID string) ([]Track, error) {
|
||||
var tracks = []Track{}
|
||||
|
||||
track_rows, err := db.Query("SELECT number, title, description, lyrics, preview_url FROM musictracks WHERE release=$1", releaseID)
|
||||
if err != nil {
|
||||
return []Track{}, err
|
||||
}
|
||||
|
||||
for track_rows.Next() {
|
||||
var track = Track{}
|
||||
|
||||
err = track_rows.Scan(
|
||||
&track.Number,
|
||||
&track.Title,
|
||||
&track.Description,
|
||||
&track.Lyrics,
|
||||
&track.PreviewURL,
|
||||
)
|
||||
if err != nil {
|
||||
fmt.Printf("Error while pulling track for release %s: %s\n", releaseID, err)
|
||||
continue
|
||||
}
|
||||
|
||||
tracks = append(tracks, track)
|
||||
}
|
||||
|
||||
return tracks, nil
|
||||
}
|
||||
|
|
@ -1,65 +1,45 @@
|
|||
package music
|
||||
package view
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"arimelody.me/arimelody.me/admin"
|
||||
"arimelody.me/arimelody.me/global"
|
||||
"arimelody.me/arimelody.me/music/model"
|
||||
)
|
||||
|
||||
// HTTP HANDLER METHODS
|
||||
|
||||
func Handler() http.Handler {
|
||||
mux := http.NewServeMux()
|
||||
|
||||
mux.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.URL.Path == "/" {
|
||||
ServeCatalog().ServeHTTP(w, r)
|
||||
return
|
||||
}
|
||||
ServeGateway().ServeHTTP(w, r)
|
||||
}))
|
||||
|
||||
return mux
|
||||
}
|
||||
|
||||
func ServeCatalog() http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
releases := []Release{}
|
||||
authorised := r.Context().Value("role") != nil && r.Context().Value("role") == "admin"
|
||||
for _, release := range Releases {
|
||||
releases := []model.Release{}
|
||||
authorised := admin.GetSession(r) != nil
|
||||
for _, release := range global.Releases {
|
||||
if !release.IsReleased() && !authorised {
|
||||
continue
|
||||
}
|
||||
releases = append(releases, release)
|
||||
}
|
||||
|
||||
global.ServeTemplate("music.html", Releases).ServeHTTP(w, r)
|
||||
})
|
||||
}
|
||||
|
||||
func ServeGateway() 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 := GetRelease(id)
|
||||
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(ServeGateway()).ServeHTTP(w, r)
|
||||
return
|
||||
}
|
||||
|
||||
lrw := global.LoggingResponseWriter{w, http.StatusOK}
|
||||
|
||||
global.ServeTemplate("music-gateway.html", release).ServeHTTP(&lrw, r)
|
||||
|
||||
if lrw.Code != http.StatusOK {
|
||||
fmt.Printf("Error loading music gateway for %s\n", id)
|
||||
return
|
||||
}
|
||||
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 == "/" {
|
||||
|
|
@ -111,3 +91,4 @@ func ServeArtwork() http.Handler {
|
|||
w.Write(bytes)
|
||||
})
|
||||
}
|
||||
*/
|
||||
74
music/view/release.go
Normal file
74
music/view/release.go
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
package view
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
|
||||
"arimelody.me/arimelody.me/admin"
|
||||
"arimelody.me/arimelody.me/global"
|
||||
)
|
||||
|
||||
// HTTP HANDLERS
|
||||
|
||||
func ServeRelease() 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 release = global.GetRelease(releaseID)
|
||||
if release == nil {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
|
||||
// only allow authorised users to view unreleased releases
|
||||
authorised := admin.GetSession(r) != nil
|
||||
if !release.IsReleased() && !authorised {
|
||||
admin.MustAuthorise(ServeRelease()).ServeHTTP(w, r)
|
||||
return
|
||||
}
|
||||
|
||||
w.Header().Add("Content-Type", "application/json")
|
||||
err := json.NewEncoder(w).Encode(release)
|
||||
if err != nil {
|
||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func ServeGateway() 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 unreleased releases
|
||||
authorised := admin.GetSession(r) != nil
|
||||
if !release.IsReleased() && !authorised {
|
||||
admin.MustAuthorise(ServeGateway()).ServeHTTP(w, r)
|
||||
return
|
||||
}
|
||||
|
||||
lrw := global.LoggingResponseWriter{w, http.StatusOK}
|
||||
|
||||
global.ServeTemplate("music-gateway.html", release).ServeHTTP(&lrw, r)
|
||||
|
||||
if lrw.Code != http.StatusOK {
|
||||
fmt.Printf("Error rendering music gateway for %s\n", id)
|
||||
return
|
||||
}
|
||||
})
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue