Improve logging of user events

[broadcaster] / radio / main.go

diff --git a/radio/main.go b/radio/main.go
index 22658a38633fab0219c54e1fee37a80c4e44e95f..5edd54efe22f6bcfe07009154080602dbfee8d45 100644 (file)
--- a/radio/main.go
+++ b/radio/main.go
@@ -227,7 +227,10 @@ func playlistWorker(ch <-chan []protocol.PlaylistSpec, stop <-chan bool) {
                        }
                        var soonestTime time.Time
                        for _, v := range specs {
                        }
                        var soonestTime time.Time
                        for _, v := range specs {

-                               t, err := time.ParseInLocation(protocol.StartTimeFormat, v.StartTime, loc)
+                               t, err := time.ParseInLocation(protocol.StartTimeFormatSecs, v.StartTime, loc)
+                               if err != nil {
+                                       t, err = time.ParseInLocation(protocol.StartTimeFormat, v.StartTime, loc)
+                               }

                                if err != nil {
                                        log.Println("Error parsing start time", err)
                                        continue
                                if err != nil {
                                        log.Println("Error parsing start time", err)
                                        continue


@@ -327,16 +330,20 @@ entries:
                        })))
                }
 
                        })))
                }
 

+               aborting := false

                select {
                case <-done:
                        log.Println("Audio playback complete")
                case <-cancel:
                select {
                case <-done:
                        log.Println("Audio playback complete")
                case <-cancel:

-                       log.Println("Disengaging PTT and aborting playlist playback")
-                       ptt.DisengagePTT()
-                       break entries
+                       log.Println("Playlist aborting as requested")
+                       aborting = true

                }
                }

-               log.Println("PTT off since audio file has finished")
+               speaker.Clear()
+               log.Println("PTT off")

                ptt.DisengagePTT()
                ptt.DisengagePTT()

+               if aborting {
+                       break entries
+               }

        }
        log.Println("Playlist finished", playlist.Name)
        statusCollector.PlaylistBeginIdle <- true
        }
        log.Println("Playlist finished", playlist.Name)
        statusCollector.PlaylistBeginIdle <- true