Clear playback properly when cancelling

[broadcaster] / server / main.go

diff --git a/server/main.go b/server/main.go
index d1d47d329afe6029632e073b35d5f1af0fcc800d..363b708fff85764c912f1e71ae4238a9f91305ef 100644 (file)
--- a/server/main.go
+++ b/server/main.go
@@ -5,8 +5,6 @@ import (
        "embed"
        "flag"
        "fmt"
        "embed"
        "flag"
        "fmt"

-       "golang.org/x/crypto/bcrypt"
-       "golang.org/x/net/websocket"

        "html/template"
        "io"
        "log"
        "html/template"
        "io"
        "log"


@@ -16,10 +14,13 @@ import (
        "strconv"
        "strings"
        "time"
        "strconv"
        "strings"
        "time"

+
+       "code.octet-stream.net/broadcaster/internal/protocol"
+       "golang.org/x/crypto/bcrypt"
+       "golang.org/x/net/websocket"

 )
 
 )
 

-const version = "v1.0.0"
-const formatString = "2006-01-02T15:04"
+const version = "v1.1.0"

 
 //go:embed templates/*
 var content embed.FS
 
 //go:embed templates/*
 var content embed.FS


@@ -518,7 +519,7 @@ func editPlaylistPage(w http.ResponseWriter, r *http.Request, id int, user User)
        if id == 0 {
                data.Playlist.Enabled = true
                data.Playlist.Name = "New Playlist"
        if id == 0 {
                data.Playlist.Enabled = true
                data.Playlist.Name = "New Playlist"

-               data.Playlist.StartTime = time.Now().Format(formatString)
+               data.Playlist.StartTime = time.Now().Format(protocol.StartTimeFormatSecs)

                data.Entries = append(data.Entries, PlaylistEntry{})
        } else {
                playlist, err := db.GetPlaylist(id)
                data.Entries = append(data.Entries, PlaylistEntry{})
        } else {
                playlist, err := db.GetPlaylist(id)


@@ -543,7 +544,10 @@ func submitPlaylist(w http.ResponseWriter, r *http.Request) {
                if err != nil {
                        return
                }
                if err != nil {
                        return
                }

-               _, err = time.Parse(formatString, r.Form.Get("playlistStartTime"))
+               _, err = time.Parse(protocol.StartTimeFormatSecs, r.Form.Get("playlistStartTime"))
+               if err != nil {
+                       _, err = time.Parse(protocol.StartTimeFormat, r.Form.Get("playlistStartTime"))
+               }

                if err != nil {
                        return
                }
                if err != nil {
                        return
                }