+
diff --git a/admin/views/music.html b/admin/views/music.html
deleted file mode 100644
index 110b0da..0000000
--- a/admin/views/music.html
+++ /dev/null
@@ -1,73 +0,0 @@
-{{define "head"}}
-
Music - ari melody 💫
-
-
-{{end}}
-
-{{define "content"}}
-
- Music
-
-
-
- {{range .Releases}}
- {{block "release" .}}{{end}}
- {{end}}
- {{if not .Releases}}
-
There are no releases.
- {{end}}
-
- {{range $Artist := .Artists}}
-
- {{end}}
- {{if not .Artists}}
-
There are no artists.
- {{end}}
-
-
"Orphaned" tracks that have not yet been bound to a release.
-
- {{range $Track := .Tracks}}
-
-
- {{if $Track.Description}}
-
{{$Track.GetDescriptionHTML}}
- {{else}}
-
No description provided.
- {{end}}
- {{if $Track.Lyrics}}
-
{{$Track.GetLyricsHTML}}
- {{else}}
-
There are no lyrics.
- {{end}}
-
- {{end}}
- {{if not .Artists}}
-
There are no artists.
- {{end}}
-
-
-
-
-{{end}}
diff --git a/api/api.go b/api/api.go
index 398db4b..c5156c2 100644
--- a/api/api.go
+++ b/api/api.go
@@ -2,7 +2,6 @@ package api
import (
"context"
- "errors"
"fmt"
"net/http"
"os"
@@ -173,7 +172,7 @@ func getSession(app *model.AppState, r *http.Request) (*model.Session, error) {
// check cookies first
sessionCookie, err := r.Cookie(model.COOKIE_TOKEN)
if err != nil && err != http.ErrNoCookie {
- return nil, errors.New(fmt.Sprintf("Failed to retrieve session cookie: %v\n", err))
+ return nil, fmt.Errorf("Failed to retrieve session cookie: %v\n", err)
}
if sessionCookie != nil {
token = sessionCookie.Value
@@ -188,7 +187,7 @@ func getSession(app *model.AppState, r *http.Request) (*model.Session, error) {
session, err := controller.GetSession(app.DB, token)
if err != nil && !strings.Contains(err.Error(), "no rows") {
- return nil, errors.New(fmt.Sprintf("Failed to retrieve session: %v\n", err))
+ return nil, fmt.Errorf("Failed to retrieve session: %v\n", err)
}
if session != nil {
diff --git a/api/uploads.go b/api/uploads.go
index 4678f22..3c3c58a 100644
--- a/api/uploads.go
+++ b/api/uploads.go
@@ -50,7 +50,7 @@ func HandleImageUpload(app *model.AppState, data *string, directory string, file
return "", nil
}
- app.Log.Info(log.TYPE_FILES, "\"%s/%s.%s\" created.", directory, filename, ext)
+ app.Log.Info(log.TYPE_FILES, "\"%s\" created.", imagePath)
return filename, nil
}
diff --git a/controller/artist.go b/controller/artist.go
index f086778..adcdbc5 100644
--- a/controller/artist.go
+++ b/controller/artist.go
@@ -29,6 +29,11 @@ func GetAllArtists(db *sqlx.DB) ([]*model.Artist, error) {
return artists, nil
}
+func GetArtistCount(db *sqlx.DB) (int, error) {
+ var count int
+ err := db.Get(&count, "SELECT count(*) FROM artist")
+ return count, err
+}
func GetArtistsNotOnRelease(db *sqlx.DB, releaseID string) ([]*model.Artist, error) {
var artists = []*model.Artist{}
diff --git a/controller/bluesky.go b/controller/bluesky.go
index 0e382df..b44cdd0 100644
--- a/controller/bluesky.go
+++ b/controller/bluesky.go
@@ -3,7 +3,6 @@ package controller
import (
"arimelody-web/model"
"encoding/json"
- "errors"
"fmt"
"net/http"
"net/url"
@@ -32,7 +31,7 @@ func FetchThreadViewPost(actorID string, postID string) (*model.ThreadViewPost,
res, err := client.Do(req)
if err != nil {
- return nil, errors.New(fmt.Sprintf("Failed to call Bluesky API: %v", err))
+ return nil, fmt.Errorf("Failed to call Bluesky API: %v", err)
}
type Data struct {
@@ -41,7 +40,7 @@ func FetchThreadViewPost(actorID string, postID string) (*model.ThreadViewPost,
data := Data{}
err = json.NewDecoder(res.Body).Decode(&data)
if err != nil {
- return nil, errors.New(fmt.Sprintf("Invalid response from server: %v", err))
+ return nil, fmt.Errorf("Invalid response from server: %v", err)
}
return &data.Thread, nil
diff --git a/controller/controller.go b/controller/controller.go
index 44194e4..95615fb 100644
--- a/controller/controller.go
+++ b/controller/controller.go
@@ -5,7 +5,7 @@ import "math/rand"
func GenerateAlnumString(length int) []byte {
const CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
res := []byte{}
- for i := 0; i < length; i++ {
+ for range length {
res = append(res, CHARS[rand.Intn(len(CHARS))])
}
return res
diff --git a/controller/migrator.go b/controller/migrator.go
index ac3c419..adf3dac 100644
--- a/controller/migrator.go
+++ b/controller/migrator.go
@@ -1,11 +1,12 @@
package controller
import (
- "fmt"
- "os"
- "time"
+ "embed"
+ "fmt"
+ "os"
+ "time"
- "github.com/jmoiron/sqlx"
+ "github.com/jmoiron/sqlx"
)
const DB_VERSION int = 5
@@ -59,10 +60,13 @@ func CheckDBVersionAndMigrate(db *sqlx.DB) {
fmt.Printf("Database schema up to date.\n")
}
+//go:embed "schema-migration"
+var schemaFS embed.FS
+
func ApplyMigration(db *sqlx.DB, scriptFile string) {
fmt.Printf("Applying schema migration %s...\n", scriptFile)
- bytes, err := os.ReadFile("schema-migration/" + scriptFile + ".sql")
+ bytes, err := schemaFS.ReadFile("schema-migration/" + scriptFile + ".sql")
if err != nil {
fmt.Fprintf(os.Stderr, "FATAL: Failed to open schema file \"%s\": %v\n", scriptFile, err)
os.Exit(1)
diff --git a/controller/qr.go b/controller/qr.go
index dd08637..21ed3e6 100644
--- a/controller/qr.go
+++ b/controller/qr.go
@@ -2,8 +2,8 @@ package controller
import (
"encoding/base64"
- "image"
- "image/color"
+ // "image"
+ // "image/color"
"github.com/skip2/go-qrcode"
)
@@ -18,36 +18,35 @@ func GenerateQRCode(data string) (string, error) {
}
// vvv DEPRECATED vvv
-
-const margin = 4
-
-type QRCodeECCLevel int64
-const (
- LOW QRCodeECCLevel = iota
- MEDIUM
- QUARTILE
- HIGH
-)
-
-func drawLargeAlignmentSquare(x int, y int, img *image.Gray) {
- for yi := range 7 {
- for xi := range 7 {
- if (xi == 0 || xi == 6) || (yi == 0 || yi == 6) {
- img.Set(x + xi, y + yi, color.Black)
- } else if (xi > 1 && xi < 5) && (yi > 1 && yi < 5) {
- img.Set(x + xi, y + yi, color.Black)
- }
- }
- }
-}
-
-func drawSmallAlignmentSquare(x int, y int, img *image.Gray) {
- for yi := range 5 {
- for xi := range 5 {
- if (xi == 0 || xi == 4) || (yi == 0 || yi == 4) {
- img.Set(x + xi, y + yi, color.Black)
- }
- }
- }
- img.Set(x + 2, y + 2, color.Black)
-}
+// const margin = 4
+//
+// type QRCodeECCLevel int64
+// const (
+// LOW QRCodeECCLevel = iota
+// MEDIUM
+// QUARTILE
+// HIGH
+// )
+//
+// func drawLargeAlignmentSquare(x int, y int, img *image.Gray) {
+// for yi := range 7 {
+// for xi := range 7 {
+// if (xi == 0 || xi == 6) || (yi == 0 || yi == 6) {
+// img.Set(x + xi, y + yi, color.Black)
+// } else if (xi > 1 && xi < 5) && (yi > 1 && yi < 5) {
+// img.Set(x + xi, y + yi, color.Black)
+// }
+// }
+// }
+// }
+//
+// func drawSmallAlignmentSquare(x int, y int, img *image.Gray) {
+// for yi := range 5 {
+// for xi := range 5 {
+// if (xi == 0 || xi == 4) || (yi == 0 || yi == 4) {
+// img.Set(x + xi, y + yi, color.Black)
+// }
+// }
+// }
+// img.Set(x + 2, y + 2, color.Black)
+// }
diff --git a/controller/release.go b/controller/release.go
index 991ed17..b9e5ba7 100644
--- a/controller/release.go
+++ b/controller/release.go
@@ -1,7 +1,6 @@
package controller
import (
- "errors"
"fmt"
"strings"
@@ -22,7 +21,7 @@ func GetRelease(db *sqlx.DB, id string, full bool) (*model.Release, error) {
// get credits
credits, err := GetReleaseCredits(db, id)
if err != nil {
- return nil, errors.New(fmt.Sprintf("Credits: %s", err))
+ return nil, fmt.Errorf("Credits: %s", err)
}
for _, credit := range credits {
release.Credits = append(release.Credits, credit)
@@ -31,7 +30,7 @@ func GetRelease(db *sqlx.DB, id string, full bool) (*model.Release, error) {
// get tracks
tracks, err := GetReleaseTracks(db, id)
if err != nil {
- return nil, errors.New(fmt.Sprintf("Tracks: %s", err))
+ return nil, fmt.Errorf("Tracks: %s", err)
}
for _, track := range tracks {
release.Tracks = append(release.Tracks, track)
@@ -40,7 +39,7 @@ func GetRelease(db *sqlx.DB, id string, full bool) (*model.Release, error) {
// get links
links, err := GetReleaseLinks(db, id)
if err != nil {
- return nil, errors.New(fmt.Sprintf("Links: %s", err))
+ return nil, fmt.Errorf("Links: %s", err)
}
for _, link := range links {
release.Links = append(release.Links, link)
@@ -72,7 +71,7 @@ func GetAllReleases(db *sqlx.DB, onlyVisible bool, limit int, full bool) ([]*mod
// get credits
credits, err := GetReleaseCredits(db, release.ID)
if err != nil {
- return nil, errors.New(fmt.Sprintf("Credits: %s", err))
+ return nil, fmt.Errorf("Credits: %s", err)
}
for _, credit := range credits {
release.Credits = append(release.Credits, credit)
@@ -82,7 +81,7 @@ func GetAllReleases(db *sqlx.DB, onlyVisible bool, limit int, full bool) ([]*mod
// get tracks
tracks, err := GetReleaseTracks(db, release.ID)
if err != nil {
- return nil, errors.New(fmt.Sprintf("Tracks: %s", err))
+ return nil, fmt.Errorf("Tracks: %s", err)
}
for _, track := range tracks {
release.Tracks = append(release.Tracks, track)
@@ -91,7 +90,7 @@ func GetAllReleases(db *sqlx.DB, onlyVisible bool, limit int, full bool) ([]*mod
// get links
links, err := GetReleaseLinks(db, release.ID)
if err != nil {
- return nil, errors.New(fmt.Sprintf("Links: %s", err))
+ return nil, fmt.Errorf("Links: %s", err)
}
for _, link := range links {
release.Links = append(release.Links, link)
@@ -101,6 +100,17 @@ func GetAllReleases(db *sqlx.DB, onlyVisible bool, limit int, full bool) ([]*mod
return releases, nil
}
+func GetReleaseCount(db *sqlx.DB, onlyVisible bool) (int, error) {
+ query := "SELECT count(*) FROM musicrelease"
+ if onlyVisible {
+ query += " WHERE visible=true"
+ }
+
+ var count int
+ err := db.Get(&count, query)
+
+ return count, err
+}
func GetLatestRelease(db *sqlx.DB) (*model.Release, error) {
var release = model.Release{}
@@ -116,7 +126,7 @@ func GetLatestRelease(db *sqlx.DB) (*model.Release, error) {
// get credits
credits, err := GetReleaseCredits(db, release.ID)
if err != nil {
- return nil, errors.New(fmt.Sprintf("Credits: %s", err))
+ return nil, fmt.Errorf("Credits: %s", err)
}
for _, credit := range credits {
release.Credits = append(release.Credits, credit)
@@ -125,7 +135,7 @@ func GetLatestRelease(db *sqlx.DB) (*model.Release, error) {
// get tracks
tracks, err := GetReleaseTracks(db, release.ID)
if err != nil {
- return nil, errors.New(fmt.Sprintf("Tracks: %s", err))
+ return nil, fmt.Errorf("Tracks: %s", err)
}
for _, track := range tracks {
release.Tracks = append(release.Tracks, track)
@@ -134,7 +144,7 @@ func GetLatestRelease(db *sqlx.DB) (*model.Release, error) {
// get links
links, err := GetReleaseLinks(db, release.ID)
if err != nil {
- return nil, errors.New(fmt.Sprintf("Links: %s", err))
+ return nil, fmt.Errorf("Links: %s", err)
}
for _, link := range links {
release.Links = append(release.Links, link)
diff --git a/schema-migration/000-init.sql b/controller/schema-migration/000-init.sql
similarity index 100%
rename from schema-migration/000-init.sql
rename to controller/schema-migration/000-init.sql
diff --git a/schema-migration/001-pre-versioning.sql b/controller/schema-migration/001-pre-versioning.sql
similarity index 100%
rename from schema-migration/001-pre-versioning.sql
rename to controller/schema-migration/001-pre-versioning.sql
diff --git a/schema-migration/002-audit-logs.sql b/controller/schema-migration/002-audit-logs.sql
similarity index 100%
rename from schema-migration/002-audit-logs.sql
rename to controller/schema-migration/002-audit-logs.sql
diff --git a/schema-migration/003-fail-lock.sql b/controller/schema-migration/003-fail-lock.sql
similarity index 100%
rename from schema-migration/003-fail-lock.sql
rename to controller/schema-migration/003-fail-lock.sql
diff --git a/schema-migration/004-blog.sql b/controller/schema-migration/004-blog.sql
similarity index 100%
rename from schema-migration/004-blog.sql
rename to controller/schema-migration/004-blog.sql
diff --git a/controller/session.go b/controller/session.go
index 5028789..dfae551 100644
--- a/controller/session.go
+++ b/controller/session.go
@@ -2,7 +2,6 @@ package controller
import (
"database/sql"
- "errors"
"fmt"
"net/http"
"strings"
@@ -19,7 +18,7 @@ const TOKEN_LEN = 64
func GetSessionFromRequest(app *model.AppState, r *http.Request) (*model.Session, error) {
sessionCookie, err := r.Cookie(model.COOKIE_TOKEN)
if err != nil && err != http.ErrNoCookie {
- return nil, errors.New(fmt.Sprintf("Failed to retrieve session cookie: %v", err))
+ return nil, fmt.Errorf("Failed to retrieve session cookie: %v", err)
}
var session *model.Session
@@ -29,7 +28,7 @@ func GetSessionFromRequest(app *model.AppState, r *http.Request) (*model.Session
session, err = GetSession(app.DB, sessionCookie.Value)
if err != nil && !strings.Contains(err.Error(), "no rows") {
- return nil, errors.New(fmt.Sprintf("Failed to retrieve session: %v", err))
+ return nil, fmt.Errorf("Failed to retrieve session: %v", err)
}
if session != nil {
diff --git a/controller/track.go b/controller/track.go
index ee7581c..27f4afc 100644
--- a/controller/track.go
+++ b/controller/track.go
@@ -29,6 +29,11 @@ func GetAllTracks(db *sqlx.DB) ([]*model.Track, error) {
return tracks, nil
}
+func GetTrackCount(db *sqlx.DB) (int, error) {
+ var count int
+ err := db.Get(&count, "SELECT count(*) FROM musictrack")
+ return count, err
+}
func GetOrphanTracks(db *sqlx.DB) ([]*model.Track, error) {
var tracks = []*model.Track{}
diff --git a/main.go b/main.go
index f7afa81..3f505fa 100644
--- a/main.go
+++ b/main.go
@@ -1,32 +1,33 @@
package main
import (
- "bufio"
- "errors"
- "fmt"
- stdLog "log"
- "math"
- "math/rand"
- "net"
- "net/http"
- "os"
- "path/filepath"
- "strconv"
- "strings"
- "time"
+ "bufio"
+ "embed"
+ "errors"
+ "fmt"
+ stdLog "log"
+ "math"
+ "math/rand"
+ "net"
+ "net/http"
+ "os"
+ "path/filepath"
+ "strconv"
+ "strings"
+ "time"
- "arimelody-web/admin"
- "arimelody-web/api"
- "arimelody-web/colour"
- "arimelody-web/controller"
- "arimelody-web/cursor"
- "arimelody-web/log"
- "arimelody-web/model"
- "arimelody-web/view"
+ "arimelody-web/admin"
+ "arimelody-web/api"
+ "arimelody-web/colour"
+ "arimelody-web/controller"
+ "arimelody-web/cursor"
+ "arimelody-web/log"
+ "arimelody-web/model"
+ "arimelody-web/view"
- "github.com/jmoiron/sqlx"
- _ "github.com/lib/pq"
- "golang.org/x/crypto/bcrypt"
+ "github.com/jmoiron/sqlx"
+ _ "github.com/lib/pq"
+ "golang.org/x/crypto/bcrypt"
)
// used for database migrations
@@ -35,12 +36,16 @@ const DB_VERSION = 1
const DEFAULT_PORT int64 = 8080
const HRT_DATE int64 = 1756478697
+//go:embed "public"
+var publicFS embed.FS
+
func main() {
fmt.Printf("made with <3 by ari melody\n\n")
app := model.AppState{
Config: controller.GetConfig(),
Twitch: nil,
+ PublicFS: publicFS,
}
// initialise database connection
@@ -527,7 +532,7 @@ func createServeMux(app *model.AppState) *http.ServeMux {
mux.Handle("/api/", http.StripPrefix("/api", api.Handler(app)))
mux.Handle("/music/", http.StripPrefix("/music", view.MusicHandler(app)))
mux.Handle("/blog/", http.StripPrefix("/blog", view.BlogHandler(app)))
- mux.Handle("/uploads/", http.StripPrefix("/uploads", view.StaticHandler(filepath.Join(app.Config.DataDirectory, "uploads"))))
+ mux.Handle("/uploads/", http.StripPrefix("/uploads", view.ServeFiles(filepath.Join(app.Config.DataDirectory, "uploads"))))
mux.Handle("/cursor-ws", cursor.Handler(app))
mux.Handle("/", view.IndexHandler(app))
diff --git a/model/appstate.go b/model/appstate.go
index 3a1c230..1a13be9 100644
--- a/model/appstate.go
+++ b/model/appstate.go
@@ -1,9 +1,11 @@
package model
import (
- "github.com/jmoiron/sqlx"
+ "embed"
- "arimelody-web/log"
+ "github.com/jmoiron/sqlx"
+
+ "arimelody-web/log"
)
type (
@@ -43,5 +45,6 @@ type (
Config Config
Log log.Logger
Twitch *TwitchState
+ PublicFS embed.FS
}
)
diff --git a/model/release.go b/model/release.go
index e64317b..46f4460 100644
--- a/model/release.go
+++ b/model/release.go
@@ -39,7 +39,7 @@ const (
// GETTERS
func (release Release) GetDescriptionHTML() template.HTML {
- return template.HTML(strings.Replace(release.Description, "\n", "
", -1))
+ return template.HTML(strings.ReplaceAll(release.Description, "\n", "
"))
}
func (release Release) TextReleaseDate() string {
diff --git a/model/track.go b/model/track.go
index deaf086..eb70fcd 100644
--- a/model/track.go
+++ b/model/track.go
@@ -13,19 +13,14 @@ type (
Lyrics string `json:"lyrics" db:"lyrics"`
PreviewURL string `json:"previewURL" db:"preview_url"`
- Number int
+ Number int `json:"-"`
}
)
func (track Track) GetDescriptionHTML() template.HTML {
- return template.HTML(strings.Replace(track.Description, "\n", "
", -1))
+ return template.HTML(strings.ReplaceAll(track.Description, "\n", "
"))
}
func (track Track) GetLyricsHTML() template.HTML {
- return template.HTML(strings.Replace(track.Lyrics, "\n", "
", -1))
-}
-
-// this function is stupid and i hate that i need it
-func (track Track) Add(a int, b int) int {
- return a + b
+ return template.HTML(strings.ReplaceAll(track.Lyrics, "\n", "
"))
}
diff --git a/model/track_test.go b/model/track_test.go
index fd500d7..eb64b10 100644
--- a/model/track_test.go
+++ b/model/track_test.go
@@ -31,13 +31,3 @@ func Test_Track_LyricsHTML(t *testing.T) {
t.Errorf(`track lyrics incorrectly formatted (want "%s", got "%s")`, want, got)
}
}
-
-func Test_Track_Add(t *testing.T) {
- track := Track{}
-
- want := 4
- got := track.Add(2, 2)
- if want != got {
- t.Errorf(`somehow, we screwed up addition. (want %d, got %d)`, want, got)
- }
-}
diff --git a/public/img/buttons/wangleline.png b/public/img/buttons/wangleline.png
new file mode 100644
index 0000000..b26ea3f
Binary files /dev/null and b/public/img/buttons/wangleline.png differ
diff --git a/public/img/hamburger.svg b/public/img/hamburger.svg
new file mode 100644
index 0000000..f7e91a0
--- /dev/null
+++ b/public/img/hamburger.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/script/music-gateway.js b/public/script/music-gateway.js
index 097a398..237868c 100644
--- a/public/script/music-gateway.js
+++ b/public/script/music-gateway.js
@@ -20,7 +20,6 @@ function update_extras_buttons() {
const info_container = document.getElementById("info")
info_container.addEventListener("scroll", update_extras_buttons);
const info_rect = info_container.getBoundingClientRect();
- const info_y = info_rect.y;
const font_size = parseFloat(getComputedStyle(document.documentElement).fontSize);
let current = extras_pairs[0];
extras_pairs.forEach(pair => {
@@ -53,7 +52,7 @@ function bind_go_back_btn() {
function bind_share_btn() {
const share_btn = document.getElementById("share");
if (navigator.clipboard === undefined) {
- share_btn.onclick = event => {
+ share_btn.onclick = () => {
console.error("clipboard is not supported by this browser!");
};
return;
diff --git a/public/style/music-gateway.css b/public/style/music-gateway.css
index 1c10e0b..1f15f74 100644
--- a/public/style/music-gateway.css
+++ b/public/style/music-gateway.css
@@ -333,7 +333,7 @@ ul#links a {
background-color: #fff;
text-align: center;
text-decoration: none;
- transition: filter .1s,-webkit-filter .1s
+ transition: filter .1s ease-out, -webkit-filter .1s ease-out;
}
#buylink {
diff --git a/view/404.html b/templates/html/404.html
similarity index 100%
rename from view/404.html
rename to templates/html/404.html
diff --git a/view/blog.html b/templates/html/blog.html
similarity index 100%
rename from view/blog.html
rename to templates/html/blog.html
diff --git a/view/blogpost.html b/templates/html/blogpost.html
similarity index 100%
rename from view/blogpost.html
rename to templates/html/blogpost.html
diff --git a/view/footer.html b/templates/html/footer.html
similarity index 100%
rename from view/footer.html
rename to templates/html/footer.html
diff --git a/view/header.html b/templates/html/header.html
similarity index 97%
rename from view/header.html
rename to templates/html/header.html
index 2457197..275103d 100644
--- a/view/header.html
+++ b/templates/html/header.html
@@ -24,7 +24,6 @@
music
-
blog
diff --git a/view/index.html b/templates/html/index.html
similarity index 98%
rename from view/index.html
rename to templates/html/index.html
index 6d0af2c..5255196 100644
--- a/view/index.html
+++ b/templates/html/index.html
@@ -213,6 +213,9 @@
+
+ 
+
diff --git a/view/layout.html b/templates/html/layout.html
similarity index 100%
rename from view/layout.html
rename to templates/html/layout.html
diff --git a/view/music-gateway.html b/templates/html/music-gateway.html
similarity index 98%
rename from view/music-gateway.html
rename to templates/html/music-gateway.html
index febef4d..7fffedc 100644
--- a/view/music-gateway.html
+++ b/templates/html/music-gateway.html
@@ -134,7 +134,7 @@
TRACKS
{{range $i, $track := .Tracks}}
- {{$track.Add $i 1}}. {{$track.Title}}
+ {{add $i 1}}. {{$track.Title}}
{{if $track.Description}}
DESCRIPTION
diff --git a/view/music.html b/templates/html/music.html
similarity index 100%
rename from view/music.html
rename to templates/html/music.html
diff --git a/templates/html/prideflag.html b/templates/html/prideflag.html
new file mode 100644
index 0000000..47ce4c7
--- /dev/null
+++ b/templates/html/prideflag.html
@@ -0,0 +1,21 @@
+{{define "prideflag"}}
+
+
+
+{{end}}
diff --git a/templates/templates.go b/templates/templates.go
index 9cfbd23..4a3eee6 100644
--- a/templates/templates.go
+++ b/templates/templates.go
@@ -1,42 +1,45 @@
package templates
import (
- "html/template"
- "path/filepath"
+ _ "embed"
+ "html/template"
+ "strings"
)
-var IndexTemplate = template.Must(template.ParseFiles(
- filepath.Join("view", "layout.html"),
- filepath.Join("view", "header.html"),
- filepath.Join("view", "footer.html"),
- filepath.Join("view", "prideflag.html"),
- filepath.Join("view", "index.html"),
-))
-var MusicTemplate = template.Must(template.ParseFiles(
- filepath.Join("view", "layout.html"),
- filepath.Join("view", "header.html"),
- filepath.Join("view", "footer.html"),
- filepath.Join("view", "prideflag.html"),
- filepath.Join("view", "music.html"),
-))
-var MusicGatewayTemplate = template.Must(template.ParseFiles(
- filepath.Join("view", "layout.html"),
- filepath.Join("view", "header.html"),
- filepath.Join("view", "footer.html"),
- filepath.Join("view", "prideflag.html"),
- filepath.Join("view", "music-gateway.html"),
-))
-var BlogTemplate = template.Must(template.ParseFiles(
- filepath.Join("view", "layout.html"),
- filepath.Join("view", "header.html"),
- filepath.Join("view", "footer.html"),
- filepath.Join("view", "prideflag.html"),
- filepath.Join("view", "blog.html"),
-))
-var BlogPostTemplate = template.Must(template.ParseFiles(
- filepath.Join("view", "layout.html"),
- filepath.Join("view", "header.html"),
- filepath.Join("view", "footer.html"),
- filepath.Join("view", "prideflag.html"),
- filepath.Join("view", "blogpost.html"),
-))
+//go:embed "html/layout.html"
+var layoutHTML string
+//go:embed "html/header.html"
+var headerHTML string
+//go:embed "html/footer.html"
+var footerHTML string
+//go:embed "html/prideflag.html"
+var prideflagHTML string
+//go:embed "html/index.html"
+var indexHTML string
+//go:embed "html/music.html"
+var musicHTML string
+//go:embed "html/music-gateway.html"
+var musicGatewayHTML string
+// //go:embed "html/404.html"
+// var error404HTML string
+//go:embed "html/blog.html"
+var blogHTML string
+//go:embed "html/blogpost.html"
+var blogPostHTML string
+
+var BaseTemplate = template.Must(
+ template.New("base").Funcs(
+ template.FuncMap{
+ "add": func (a int, b int) int { return a + b },
+ },
+ ).Parse(strings.Join([]string{
+ layoutHTML,
+ headerHTML,
+ footerHTML,
+ prideflagHTML,
+ }, "\n")))
+var IndexTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(indexHTML))
+var MusicTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(musicHTML))
+var MusicGatewayTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(musicGatewayHTML))
+var BlogTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(blogHTML))
+var BlogPostTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(blogPostHTML))
diff --git a/view/static.go b/view/files.go
similarity index 54%
rename from view/static.go
rename to view/files.go
index 52263a2..c1b0e29 100644
--- a/view/static.go
+++ b/view/files.go
@@ -1,13 +1,31 @@
package view
import (
+ "embed"
"errors"
+ "mime"
"net/http"
"os"
+ "path"
"path/filepath"
)
-func StaticHandler(directory string) http.Handler {
+func ServeEmbedFS(fs embed.FS, dir string) http.Handler {
+ return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ file, err := fs.ReadFile(filepath.Join(dir, filepath.Clean(r.URL.Path)))
+ if err != nil {
+ http.NotFound(w, r)
+ return
+ }
+
+ w.Header().Set("Content-Type", mime.TypeByExtension(path.Ext(r.URL.Path)))
+ w.WriteHeader(http.StatusOK)
+
+ w.Write(file)
+ })
+}
+
+func ServeFiles(directory string) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
info, err := os.Stat(filepath.Join(directory, filepath.Clean(r.URL.Path)))
@@ -28,4 +46,3 @@ func StaticHandler(directory string) http.Handler {
http.FileServer(http.Dir(directory)).ServeHTTP(w, r)
})
}
-
diff --git a/view/index.go b/view/index.go
index b6e3891..0b334ef 100644
--- a/view/index.go
+++ b/view/index.go
@@ -16,21 +16,19 @@ func IndexHandler(app *model.AppState) http.Handler {
return
}
- type IndexData struct {
- TwitchStatus *model.TwitchStreamInfo
- }
-
- var err error
- var twitchStatus *model.TwitchStreamInfo = nil
- if app.Twitch != nil && len(app.Config.Twitch.Broadcaster) > 0 {
- twitchStatus, err = controller.GetTwitchStatus(app, app.Config.Twitch.Broadcaster)
- if err != nil {
- fmt.Fprintf(os.Stderr, "WARN: Failed to get Twitch status for %s: %v\n", app.Config.Twitch.Broadcaster, err)
- }
- }
-
if r.URL.Path == "/" || r.URL.Path == "/index.html" {
- err := templates.IndexTemplate.Execute(w, IndexData{
+ type IndexData struct {
+ TwitchStatus *model.TwitchStreamInfo
+ }
+ var err error
+ var twitchStatus *model.TwitchStreamInfo = nil
+ if app.Twitch != nil && len(app.Config.Twitch.Broadcaster) > 0 {
+ twitchStatus, err = controller.GetTwitchStatus(app, app.Config.Twitch.Broadcaster)
+ if err != nil {
+ fmt.Fprintf(os.Stderr, "WARN: Failed to get Twitch status for %s: %v\n", app.Config.Twitch.Broadcaster, err)
+ }
+ }
+ err = templates.IndexTemplate.Execute(w, IndexData{
TwitchStatus: twitchStatus,
})
if err != nil {
@@ -40,6 +38,7 @@ func IndexHandler(app *model.AppState) http.Handler {
return
}
- StaticHandler("public").ServeHTTP(w, r)
+ http.FileServer(http.Dir("./public")).ServeHTTP(w, r)
+ //ServeEmbedFS(app.PublicFS, "public").ServeHTTP(w, r)
})
}
