`)
@@ -283,7 +266,7 @@ func MakeAlbumPage(album musicindex.Album) (p AlbumPage) {
p.Album = album
p.bodyHTML = b.String()
- return
+ return p
}
func (p AlbumPage) SourceFile() string { return "base.html" }
diff --git a/server/server.go b/server/server.go
index a0a8ca9..ea8040d 100644
--- a/server/server.go
+++ b/server/server.go
@@ -1,6 +1,3 @@
-// Copyright (c) 2026 Jeremy Baxter.
-// HTTP music server
-
package server
import (
@@ -28,16 +25,6 @@ var artistPages map[string]map[string]ArtistPage
// mapping of artist names to album names to pages
var albumPages map[string]map[string]AlbumPage
-func httpErrorReason(w http.ResponseWriter, error int, reason string) {
- errorName := fmt.Sprintf("%d %s", error, http.StatusText(error))
- w.WriteHeader(error)
- writePage(MakeErrorPage(errorName, reason), w)
-}
-
-func httpError(w http.ResponseWriter, error int) {
- httpErrorReason(w, error, "")
-}
-
func doIndexPage(w http.ResponseWriter, req *http.Request) {
writePage(indexPage, w)
}
@@ -74,13 +61,13 @@ func detectTextType(fileName string) string {
func serveStaticFiles(w http.ResponseWriter, req *http.Request) {
if strings.HasPrefix(req.RequestURI, "/static/templates/") {
- httpError(w, http.StatusForbidden)
+ http.Error(w, "forbidden", http.StatusForbidden)
return
}
contents, err := staticFS.ReadFile(req.RequestURI[1:])
if err != nil {
- httpError(w, http.StatusNotFound)
+ http.Error(w, err.Error(), http.StatusNotFound)
return
}
@@ -96,31 +83,30 @@ func serveStaticFiles(w http.ResponseWriter, req *http.Request) {
func serveMediaDirectory(w http.ResponseWriter, req *http.Request) {
path, err := url.QueryUnescape("/" + strings.SplitN(req.RequestURI[1:], "/", 2)[1])
if err != nil {
- httpError(w, http.StatusBadRequest)
+ http.Error(w, "bad request", http.StatusBadRequest)
return
}
filePath := musicindex.MediaDirectory() + path
- if strings.Contains(path, "/../") || strings.Contains(path, "/./") {
- httpError(w, http.StatusForbidden)
+ if strings.Contains(path, "/..") || strings.Contains(path, "/.") {
+ http.Error(w, "forbidden", http.StatusForbidden)
return
}
stat, err := os.Stat(filePath)
if err != nil {
- httpError(w, http.StatusNotFound)
+ http.Error(w, "not found", http.StatusNotFound)
return
}
if stat.IsDir() {
- httpErrorReason(w, http.StatusForbidden,
- "is a directory; maybe you are looking for " + path)
+ http.Error(w, "is a directory; maybe you are looking for " + path, http.StatusForbidden)
return
}
f, err := os.Open(filePath)
if err != nil {
- httpError(w, http.StatusNotFound)
+ http.Error(w, "not found", http.StatusNotFound)
return
}
defer f.Close()
@@ -131,14 +117,14 @@ func handleArtistAlbumPage(w http.ResponseWriter, req *http.Request) {
// test artist
rx, err := regexp.Compile("^/([^/?]+)/?(\\?.*)?$")
if err != nil {
- httpError(w, http.StatusInternalServerError)
+ http.Error(w, "internal server error", http.StatusInternalServerError)
return
}
if (rx.MatchString(req.RequestURI)) {
artist, err := url.QueryUnescape(rx.FindStringSubmatch(req.RequestURI)[1])
if err != nil {
- httpError(w, http.StatusBadRequest)
+ http.Error(w, "bad request", http.StatusBadRequest)
return
}
if musicindex.ArtistExists(artist) {
@@ -153,14 +139,14 @@ func handleArtistAlbumPage(w http.ResponseWriter, req *http.Request) {
}
// artist not found
- httpError(w, http.StatusNotFound)
+ http.Error(w, "not found", http.StatusNotFound)
return
}
// test album tarball
rx, err = regexp.Compile("^/([^/?]+)/([^/?]+)\\.tar\\.gz$")
if err != nil {
- httpError(w, http.StatusInternalServerError)
+ http.Error(w, "internal server error", http.StatusInternalServerError)
return
}
@@ -168,12 +154,12 @@ func handleArtistAlbumPage(w http.ResponseWriter, req *http.Request) {
captures := rx.FindStringSubmatch(req.RequestURI)
artist, err := url.QueryUnescape(captures[1])
if err != nil {
- httpError(w, http.StatusBadRequest)
+ http.Error(w, "bad request", http.StatusBadRequest)
return
}
albumName, err := url.QueryUnescape(captures[2])
if err != nil {
- httpError(w, http.StatusBadRequest)
+ http.Error(w, "bad request", http.StatusBadRequest)
return
}
@@ -182,7 +168,8 @@ func handleArtistAlbumPage(w http.ResponseWriter, req *http.Request) {
if ok {
f, err := os.Open(album.Tarball)
if err != nil {
- httpErrorReason(w, http.StatusInternalServerError, err.Error())
+ http.Error(w, "internal server error: " + err.Error(),
+ http.StatusInternalServerError)
return
}
defer f.Close()
@@ -197,14 +184,14 @@ func handleArtistAlbumPage(w http.ResponseWriter, req *http.Request) {
}
// artist or album not found
- httpError(w, http.StatusNotFound)
+ http.Error(w, "not found", http.StatusNotFound)
return
}
// test album
rx, err = regexp.Compile("^/([^/?]+)/([^/?]+)/?(\\?.*)?$")
if err != nil {
- httpErrorReason(w, http.StatusInternalServerError, err.Error())
+ http.Error(w, "internal server error", http.StatusInternalServerError)
return
}
@@ -212,12 +199,12 @@ func handleArtistAlbumPage(w http.ResponseWriter, req *http.Request) {
captures := rx.FindStringSubmatch(req.RequestURI)
artist, err := url.QueryUnescape(captures[1])
if err != nil {
- httpError(w, http.StatusBadRequest)
+ http.Error(w, "bad request", http.StatusBadRequest)
return
}
albumName, err := url.QueryUnescape(captures[2])
if err != nil {
- httpError(w, http.StatusBadRequest)
+ http.Error(w, "bad request", http.StatusBadRequest)
return
}
@@ -230,12 +217,12 @@ func handleArtistAlbumPage(w http.ResponseWriter, req *http.Request) {
}
// artist or album not found
- httpError(w, http.StatusNotFound)
+ http.Error(w, "not found", http.StatusNotFound)
return
}
// illegal URI format
- httpError(w, http.StatusNotFound)
+ http.Error(w, "not found", http.StatusNotFound)
}
func RunOn(address string) {
diff --git a/util/util.go b/util/util.go
index abe7e6c..77149eb 100644
--- a/util/util.go
+++ b/util/util.go
@@ -1,6 +1,3 @@
-// Copyright (c) 2026 Jeremy Baxter.
-// Reusable utility functions
-
package util
import (
@@ -86,13 +83,9 @@ func HashOf(s string) string {
return fmt.Sprintf("%x", h.Sum(nil))
}
-func Interactive() bool {
- return term.IsTerminal(int(os.Stderr.Fd()))
-}
-
// print only if interactive
func Iprint(format string, args ...any) {
- if Interactive() {
+ if term.IsTerminal(int(os.Stderr.Fd())) {
fmt.Fprintf(os.Stderr, format, args...)
}
}