diff --git a/main.go b/main.go index e5d6f64..7e4401e 100644 --- a/main.go +++ b/main.go @@ -4,13 +4,13 @@ import ( "net/http" "prettysunflower-website/keys" "prettysunflower-website/pages" - "prettysunflower-website/radio" + "prettysunflower-website/regio43" "prettysunflower-website/static" ) func main() { pages.InitHttpHandlers() - radio.InitHttpHandlers() + regio43.InitHttpHandlers() static.InitHttpHandlers() keys.InitHttpHandlers() diff --git a/radio/init.go b/regio43/init.go similarity index 52% rename from radio/init.go rename to regio43/init.go index 5d40c33..3443bfd 100644 --- a/radio/init.go +++ b/regio43/init.go @@ -1,8 +1,7 @@ -package radio +package regio43 import ( "embed" - "fmt" "net/http" ) @@ -10,6 +9,5 @@ import ( var content embed.FS func InitHttpHandlers() { - prefix := "/radio/" - http.HandleFunc(fmt.Sprint(prefix, "trains"), trains) + http.HandleFunc("/regio43/", trains) } diff --git a/radio/playlist.go b/regio43/playlist.go similarity index 99% rename from radio/playlist.go rename to regio43/playlist.go index 54abfa1..34b73c9 100644 --- a/radio/playlist.go +++ b/regio43/playlist.go @@ -1,4 +1,4 @@ -package radio +package regio43 import ( "encoding/json" diff --git a/radio/templates/trains.tmpl b/regio43/templates/regio43.tmpl similarity index 95% rename from radio/templates/trains.tmpl rename to regio43/templates/regio43.tmpl index 28df2b3..ccb21b9 100644 --- a/radio/templates/trains.tmpl +++ b/regio43/templates/regio43.tmpl @@ -3,7 +3,7 @@ - prettysunflower - The trains radio + prettysunflower - Regio 43 @@ -11,7 +11,7 @@ -

The trains radio

+

Regio 43

{{ range .PlaylistItems }} diff --git a/radio/trains.go b/regio43/trains.go similarity index 84% rename from radio/trains.go rename to regio43/trains.go index 2c6f1aa..5d622ba 100644 --- a/radio/trains.go +++ b/regio43/trains.go @@ -1,4 +1,4 @@ -package radio +package regio43 import ( "html/template" @@ -16,14 +16,14 @@ func trains(w http.ResponseWriter, r *http.Request) { trainsPlaylist[i], trainsPlaylist[j] = trainsPlaylist[j], trainsPlaylist[i] }) - templateFile := "templates/trains.tmpl" + templateFile := "templates/regio43.tmpl" files, err := template.New(templateFile).ParseFS(content, templateFile) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return } - err = files.ExecuteTemplate(w, "trains.tmpl", TrainsTemplateData{ + err = files.ExecuteTemplate(w, "regio43.tmpl", TrainsTemplateData{ PlaylistItems: trainsPlaylist, })