ari/arimelody.me
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

create support for releases, artists, tracks, and credits

Browse source 
Signed-off-by: ari melody <ari@arimelody.me>
This commit is contained in:
ari melody 2024-08-03 00:27:30 +01:00
parent 442889340c
commit 9329aa9f60
19 changed files with 252 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
admin/http.go
View file

@ -34,13 +34,15 @@ func Handler() http.Handler {
}
type IndexData struct {
Releases []musicModel.Release
Artists []musicModel.Artist
Releases []*musicModel.Release
Artists []*musicModel.Artist
Tracks []*musicModel.Track
}
serveTemplate("index.html", IndexData{
Releases: global.Releases,
Artists: global.Artists,
Tracks: global.Tracks,
}).ServeHTTP(w, r)
}))

26
admin/static/admin.css
View file

@ -77,6 +77,7 @@ a:hover {
}
.release {
margin-bottom: 1em;
padding: 1em;
display: flex;
flex-direction: row;
@ -164,6 +165,7 @@ a:hover {
}
.artist {
margin-bottom: .5em;
padding: .5em;
display: flex;
flex-direction: row;
@ -185,3 +187,27 @@ a:hover {
object-fit: cover;
border-radius: 100%;
}
.track {
margin-bottom: 1em;
padding: 1em;
display: flex;
flex-direction: column;
gap: .5em;
border-radius: .5em;
background: #f8f8f8f8;
border: 1px solid #808080;
}
h2.track-title {
margin: 0
}
.track-description {
font-style: italic;
}
.track .empty {
opacity: 0.75;
}

4
api/api.go
View file

@ -24,6 +24,7 @@ func Handler() http.Handler {
return
}
}))
mux.Handle("/v1/music/", http.StripPrefix("/v1/music", music.ServeRelease()))
mux.Handle("/v1/music", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
switch r.Method {
@ -39,5 +40,8 @@ func Handler() http.Handler {
}
}))
mux.Handle("/v1/musiccredit", CreateCredit())
mux.Handle("/v1/track", CreateTrack())
return mux
}

14
api/artist.go
View file

@ -98,10 +98,20 @@ func CreateArtist() http.Handler {
var data model.Artist
err := json.NewDecoder(r.Body).Decode(&data)
if err != nil {
fmt.Printf("Failed to create artist: %s\n", err)
http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
return
}
if data.ID == "" {
http.Error(w, "Artist ID cannot be blank", http.StatusBadRequest)
return
}
if data.Name == "" {
http.Error(w, "Artist name cannot be blank", http.StatusBadRequest)
return
}
if global.GetArtist(data.ID) != nil {
http.Error(w, fmt.Sprintf("Artist %s already exists", data.ID), http.StatusBadRequest)
return
@ -114,8 +124,6 @@ func CreateArtist() http.Handler {
Avatar: data.Avatar,
}
global.Artists = append(global.Artists, artist)
err = controller.CreateArtistDB(global.DB, &artist)
if err != nil {
fmt.Printf("Failed to create artist %s: %s\n", artist.ID, err)
@ -123,6 +131,8 @@ func CreateArtist() http.Handler {
return
}
global.Artists = append(global.Artists, &artist)
w.Header().Add("Content-Type", "application/json")
w.WriteHeader(http.StatusCreated)
err = json.NewEncoder(w).Encode(artist)

65
api/credit.go Normal file
View file

@ -0,0 +1,65 @@
package api
import (
"encoding/json"
"fmt"
"net/http"
"arimelody.me/arimelody.me/global"
"arimelody.me/arimelody.me/music/model"
controller "arimelody.me/arimelody.me/music/controller"
)
func CreateCredit() http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodPost {
http.NotFound(w, r)
return
}
type creditJSON struct {
Release string
Artist string
Role string
Primary bool
}
var data creditJSON
err := json.NewDecoder(r.Body).Decode(&data)
if err != nil {
http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
return
}
var release = global.GetRelease(data.Release)
if release == nil {
http.Error(w, fmt.Sprintf("Release %s does not exist", data.Release), http.StatusBadRequest)
return
}
var artist = global.GetArtist(data.Artist)
if artist == nil {
http.Error(w, fmt.Sprintf("Artist %s does not exist", data.Artist), http.StatusBadRequest)
return
}
var credit = model.Credit{
Artist: artist,
Role: data.Role,
Primary: data.Primary,
}
err = controller.CreateCreditDB(global.DB, release.ID, artist.ID, &credit)
if err != nil {
fmt.Printf("Failed to create credit: %s\n", err)
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return
}
release.Credits = append(release.Credits, &credit)
w.Header().Add("Content-Type", "application/json")
w.WriteHeader(http.StatusCreated)
err = json.NewEncoder(w).Encode(credit)
})
}

12
api/music.go → api/release.go
View file

@ -14,7 +14,7 @@ import (
func ServeCatalog() http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
releases := []model.Release{}
releases := []*model.Release{}
authorised := admin.GetSession(r) != nil
for _, release := range global.Releases {
if !release.IsReleased() && !authorised {
@ -71,13 +71,11 @@ func CreateRelease() http.Handler {
Artwork: data.Artwork,
Buyname: data.Buyname,
Buylink: data.Buylink,
Links: []model.Link{},
Credits: []model.Credit{},
Tracks: []model.Track{},
Links: []*model.Link{},
Credits: []*model.Credit{},
Tracks: []*model.Track{},
}
global.Releases = append([]model.Release{release}, global.Releases...)
err = controller.CreateReleaseDB(global.DB, &release)
if err != nil {
fmt.Printf("Failed to create release %s: %s\n", release.ID, err)
@ -85,6 +83,8 @@ func CreateRelease() http.Handler {
return
}
global.Releases = append([]*model.Release{&release}, global.Releases...)
w.Header().Add("Content-Type", "application/json")
w.WriteHeader(http.StatusCreated)
err = json.NewEncoder(w).Encode(release)

46
api/track.go Normal file
View file

@ -0,0 +1,46 @@
package api
import (
"encoding/json"
"fmt"
"net/http"
"arimelody.me/arimelody.me/global"
"arimelody.me/arimelody.me/music/model"
controller "arimelody.me/arimelody.me/music/controller"
)
func CreateTrack() http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodPost {
http.NotFound(w, r)
return
}
var track model.Track
err := json.NewDecoder(r.Body).Decode(&track)
if err != nil {
http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
return
}
if track.Title == "" {
http.Error(w, "Track title cannot be empty", http.StatusBadRequest)
return
}
trackID, err := controller.CreateTrackDB(global.DB, &track)
if err != nil {
fmt.Printf("Failed to create credit: %s\n", err)
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return
}
track.ID = trackID
global.Tracks = append(global.Tracks, &track)
w.Header().Add("Content-Type", "application/json")
w.WriteHeader(http.StatusCreated)
err = json.NewEncoder(w).Encode(track)
})
}

10
global/data.go
View file

@ -17,14 +17,14 @@ var HTTP_DOMAIN = func() string {
var DB *sqlx.DB
var Releases []model.Release
var Artists []model.Artist
var Tracks []model.Track
var Releases []*model.Release
var Artists []*model.Artist
var Tracks []*model.Track
func GetRelease(id string) *model.Release {
for _, release := range Releases {
if release.ID == id {
return &release
return release
}
}
return nil
@ -33,7 +33,7 @@ func GetRelease(id string) *model.Release {
func GetArtist(id string) *model.Artist {
for _, artist := range Artists {
if artist.ID == id {
return &artist
return artist
}
}
return nil

8
main.go
View file

@ -49,6 +49,14 @@ func main() {
}
fmt.Printf("%d releases loaded successfully.\n", len(global.Releases))
// pull track data from DB
global.Tracks, err = musicController.PullAllTracks(global.DB)
if err != nil {
fmt.Printf("Failed to pull tracks from database: %v\n", err);
panic(1)
}
fmt.Printf("%d tracks loaded successfully.\n", len(global.Tracks))
// start the web server!
mux := createServeMux()
port := DEFAULT_PORT

4
music/controller/artist.go
View file

@ -7,8 +7,8 @@ import (
// DATABASE
func PullAllArtists(db *sqlx.DB) ([]model.Artist, error) {
var artists = []model.Artist{}
func PullAllArtists(db *sqlx.DB) ([]*model.Artist, error) {
var artists = []*model.Artist{}
err := db.Select(&artists, "SELECT * FROM artist")
if err != nil {

23
music/controller/credit.go
View file

@ -1,24 +1,39 @@
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) {
var credits = []model.Credit{}
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{}
err := db.Select(
&credits,
"SELECT * FROM musiccredit WHERE release=$1",
&credit_rows,
"SELECT artist, role, is_primary FROM musiccredit WHERE release=$1",
releaseID,
)
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
}

4
music/controller/link.go
View file

@ -7,8 +7,8 @@ import (
// DATABASE
func PullReleaseLinks(db *sqlx.DB, releaseID string) ([]model.Link, error) {
var links = []model.Link{}
func PullReleaseLinks(db *sqlx.DB, releaseID string) ([]*model.Link, error) {
var links = []*model.Link{}
err := db.Select(
&links,

23
music/controller/release.go
View file

@ -1,20 +1,37 @@
package music
import (
"fmt"
"arimelody.me/arimelody.me/global"
"arimelody.me/arimelody.me/music/model"
"github.com/jmoiron/sqlx"
)
// DATABASE
func PullAllReleases(db *sqlx.DB) ([]model.Release, error) {
var releases = []model.Release{}
func PullAllReleases(db *sqlx.DB) ([]*model.Release, error) {
var release_rows = []*model.Release{}
var releases = []*model.Release{}
err := db.Select(&releases, "SELECT * FROM musicrelease ORDER BY release_date DESC")
err := db.Select(&release_rows, "SELECT * FROM musicrelease ORDER BY release_date DESC")
if err != nil {
return nil, err
}
for _, release := range release_rows {
release.Credits, err = PullReleaseCredits(global.DB, release.ID)
if err != nil {
fmt.Printf("Error pulling credits for %s: %s\n", release.ID, err)
}
release.Links, _ = PullReleaseLinks(global.DB, release.ID)
if err != nil {
fmt.Printf("Error pulling links for %s: %s\n", release.ID, err)
}
release.Tracks = make([]*model.Track, 0)
releases = append(releases, release)
}
return releases, nil
}

6
music/controller/track.go
View file

@ -7,10 +7,10 @@ import (
// DATABASE
func PullAllTracks(db *sqlx.DB) ([]model.Track, error) {
var tracks = []model.Track{}
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")
err := db.Select(&tracks, "SELECT id, title, description, lyrics, preview_url FROM musictrack")
if err != nil {
return nil, err
}

6
music/model/release.go
View file

@ -17,9 +17,9 @@ type (
Artwork string `json:"artwork"`
Buyname string `json:"buyname"`
Buylink string `json:"buylink"`
Links []Link `json:"links"`
Credits []Credit `json:"credits"`
Tracks []Track `json:"tracks"`
Links []*Link `json:"links"`
Credits []*Credit `json:"credits"`
Tracks []*Track `json:"tracks"`
}
)

2
music/view/music.go
View file

@ -26,7 +26,7 @@ func Handler() http.Handler {
func ServeCatalog() http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
releases := []model.Release{}
releases := []*model.Release{}
authorised := admin.GetSession(r) != nil
for _, release := range global.Releases {
if !release.IsReleased() && !authorised {

BIN
public/img/default-avatar.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

2
schema.sql
View file

@ -2,7 +2,7 @@
-- Artists (should be applicable to all art)
--
CREATE TABLE public.artist (
id character varying(64) DEFAULT gen_random_uuid(),
id character varying(64),
name text NOT NULL,
website text,
avatar text

26
views/admin/index.html
View file

@ -40,8 +40,30 @@
<div class="card artists">
{{range $Artist := .Artists}}
<div class="artist">
<img src="https://arimelody.me/img/favicon.png" alt="" width="64" loading="lazy" class="artist-avatar">
<a href="/admin/artists/arimelody" class="artist-name">ari melody</a>
<img src="{{$Artist.GetAvatar}}" alt="" width="64" loading="lazy" class="artist-avatar">
<a href="/admin/artists/{{$Artist.ID}}" class="artist-name">{{$Artist.Name}}</a>
</div>
{{end}}
{{if not .Artists}}
<p>There are no artists.</p>
{{end}}
</div>
<h1>Tracks</h1>
<div class="card tracks">
{{range $Track := .Tracks}}
<div class="track">
<h2 class="track-title">{{$Track.Title}}</h2>
{{if $Track.Description}}
<p class="track-description">{{$Track.Description}}</p>
{{else}}
<p class="track-description empty">No description provided.</p>
{{end}}
{{if $Track.Lyrics}}
<p class="track-lyrics">{{$Track.Lyrics}}</p>
{{else}}
<p class="track-lyrics empty">There are no lyrics.</p>
{{end}}
</div>
{{end}}
{{if not .Artists}}