feat: real-time queue updates via SSE and cross-playlist loading support

Author: Datanoise

playlists/abce.pls

@@ -1,145 +1,3 @@
 [playlist]
-NumberOfEntries=71
-File1=/Users/syso/dev/tinyice/music/(Verse 1)(1).mp3
-Title1=(Verse 1)(1).mp3
-File2=/Users/syso/dev/tinyice/music/DEVASTATION - I Feel Love (Acapella) (Donna Summer Cover)-PN6sPWmZ1o4.mp3
-Title2=DEVASTATION - I Feel Love (Acapella) (Donna Summer Cover)-PN6sPWmZ1o4.mp3
-File3=/Users/syso/dev/tinyice/music/Der Zauberhut 1v2. Hörbuch von Terry Pratchett [_glTWbUIVEo].mp3
-Title3=Der Zauberhut 1v2. Hörbuch von Terry Pratchett [_glTWbUIVEo].mp3
-File4=/Users/syso/dev/tinyice/music/Lexyyysy42l.mp3
-Title4=Lexyyysy42l.mp3
-File5=/Users/syso/dev/tinyice/music/Lexyyysyl.mp3
-Title5=Lexyyysyl.mp3
-File6=/Users/syso/dev/tinyice/music/Lexyyysyl3.mp3
-Title6=Lexyyysyl3.mp3
-File7=/Users/syso/dev/tinyice/music/Linda Di Franco - TV Scene [261953612].mp3
-Title7=Linda Di Franco - TV Scene [261953612].mp3
-File8=/Users/syso/dev/tinyice/music/Live from Nuits sonores： Helena Hauff b2b DJ MELL G [2200736951].mp3
-Title8=Live from Nuits sonores： Helena Hauff b2b DJ MELL G [2200736951].mp3
-File9=/Users/syso/dev/tinyice/music/Madness [DvVP_nOgxQo].mp3
-Title9=Madness [DvVP_nOgxQo].mp3
-File10=/Users/syso/dev/tinyice/music/Oldskool Jungle Drum n Bass Mix 92-97 [VHXvfSmyjj4].mp3
-Title10=Oldskool Jungle Drum n Bass Mix 92-97 [VHXvfSmyjj4].mp3
-File11=/Users/syso/dev/tinyice/music/Omega Nebula - Dubplate - Little Lion Sound - Hero [CycPQZDEHtM].mp3
-Title11=Omega Nebula - Dubplate - Little Lion Sound - Hero [CycPQZDEHtM].mp3
-File12=/Users/syso/dev/tinyice/music/That sound your old pc speaker does when you receive a phone call [FYjs7vsaSEw].mp3
-Title12=That sound your old pc speaker does when you receive a phone call [FYjs7vsaSEw].mp3
-File13=/Users/syso/dev/tinyice/music/The Door in the Wall by H.G. Wells ｜ Short Story Audiobook [Huam5sSRjwc].mp3
-Title13=The Door in the Wall by H.G. Wells ｜ Short Story Audiobook [Huam5sSRjwc].mp3
-File14=/Users/syso/dev/tinyice/music/Video by songsthatshouldnotwork [DRXcvzJjrE-].mp3
-Title14=Video by songsthatshouldnotwork [DRXcvzJjrE-].mp3
-File15=/Users/syso/dev/tinyice/music/You're so precious - Ver 2 Different Take.mp3
-Title15=You're so precious - Ver 2 Different Take.mp3
-File16=/Users/syso/dev/tinyice/music/_tech2_crazy.mp3
-Title16=_tech2_crazy.mp3
-File17=/Users/syso/dev/tinyice/music/a_d.mp3
-Title17=a_d.mp3
-File18=/Users/syso/dev/tinyice/music/a_d_full.mp3
-Title18=a_d_full.mp3
-File19=/Users/syso/dev/tinyice/music/a_d_full_b.mp3
-Title19=a_d_full_b.mp3
-File20=/Users/syso/dev/tinyice/music/a_d_full_b_fixed.mp3
-Title20=a_d_full_b_fixed.mp3
-File21=/Users/syso/dev/tinyice/music/a_dwwe#s.mp3
-Title21=a_dwwe#s.mp3
-File22=/Users/syso/dev/tinyice/music/a_dwwe#sss4344ws5few3s.mp3
-Title22=a_dwwe#sss4344ws5few3s.mp3
-File23=/Users/syso/dev/tinyice/music/a_dwwe#sss4344ws_420.mp3
-Title23=a_dwwe#sss4344ws_420.mp3
-File24=/Users/syso/dev/tinyice/music/abc.mp3
-Title24=abc.mp3
-File25=/Users/syso/dev/tinyice/music/abedi.mp3
-Title25=abedi.mp3
-File26=/Users/syso/dev/tinyice/music/acapella.mp3
-Title26=acapella.mp3
-File27=/Users/syso/dev/tinyice/music/allie_cover_.mp3
-Title27=allie_cover_.mp3
-File28=/Users/syso/dev/tinyice/music/allie_cvr.mp3
-Title28=allie_cvr.mp3
-File29=/Users/syso/dev/tinyice/music/ambi1a.mp3
-Title29=ambi1a.mp3
-File30=/Users/syso/dev/tinyice/music/aos.mp3
-Title30=aos.mp3
-File31=/Users/syso/dev/tinyice/music/asd.mp3
-Title31=asd.mp3
-File32=/Users/syso/dev/tinyice/music/bis.mp3
-Title32=bis.mp3
-File33=/Users/syso/dev/tinyice/music/bjean.mp3
-Title33=bjean.mp3
-File34=/Users/syso/dev/tinyice/music/bla123.mp3
-Title34=bla123.mp3
-File35=/Users/syso/dev/tinyice/music/cabs.mp3
-Title35=cabs.mp3
-File36=/Users/syso/dev/tinyice/music/disco.mp3
-Title36=disco.mp3
-File37=/Users/syso/dev/tinyice/music/dnbass.mp3
-Title37=dnbass.mp3
-File38=/Users/syso/dev/tinyice/music/drbrk.mp3
-Title38=drbrk.mp3
-File39=/Users/syso/dev/tinyice/music/ero.mp3
-Title39=ero.mp3
-File40=/Users/syso/dev/tinyice/music/fmbeat2.mp3
-Title40=fmbeat2.mp3
-File41=/Users/syso/dev/tinyice/music/fuckdat.mp3
-Title41=fuckdat.mp3
-File42=/Users/syso/dev/tinyice/music/funkyshit.mp3
-Title42=funkyshit.mp3
-File43=/Users/syso/dev/tinyice/music/geilo3.mp3
-Title43=geilo3.mp3
-File44=/Users/syso/dev/tinyice/music/geilo32.mp3
-Title44=geilo32.mp3
-File45=/Users/syso/dev/tinyice/music/give.mp3
-Title45=give.mp3
-File46=/Users/syso/dev/tinyice/music/house2.mp3
-Title46=house2.mp3
-File47=/Users/syso/dev/tinyice/music/ladida2 2.mp3
-Title47=ladida2 2.mp3
-File48=/Users/syso/dev/tinyice/music/loop_hqhdho.mp3
-Title48=loop_hqhdho.mp3
-File49=/Users/syso/dev/tinyice/music/lup.mp3
-Title49=lup.mp3
-File50=/Users/syso/dev/tinyice/music/modem.mp3
-Title50=modem.mp3
-File51=/Users/syso/dev/tinyice/music/osasd.mp3
-Title51=osasd.mp3
-File52=/Users/syso/dev/tinyice/music/precious3.mp3
-Title52=precious3.mp3
-File53=/Users/syso/dev/tinyice/music/precious4.mp3
-Title53=precious4.mp3
-File54=/Users/syso/dev/tinyice/music/saliut.mp3
-Title54=saliut.mp3
-File55=/Users/syso/dev/tinyice/music/salut2.mp3
-Title55=salut2.mp3
-File56=/Users/syso/dev/tinyice/music/sd2.mp3
-Title56=sd2.mp3
-File57=/Users/syso/dev/tinyice/music/sess6_bef_edit46.mp3
-Title57=sess6_bef_edit46.mp3
-File58=/Users/syso/dev/tinyice/music/sess6_bef_edit463.mp3
-Title58=sess6_bef_edit463.mp3
-File59=/Users/syso/dev/tinyice/music/sess6_bef_edit49.mp3
-Title59=sess6_bef_edit49.mp3
-File60=/Users/syso/dev/tinyice/music/short.mp3
-Title60=short.mp3
-File61=/Users/syso/dev/tinyice/music/shtuff123.mp3
-Title61=shtuff123.mp3
-File62=/Users/syso/dev/tinyice/music/sj.mp3
-Title62=sj.mp3
-File63=/Users/syso/dev/tinyice/music/snip.mp3
-Title63=snip.mp3
-File64=/Users/syso/dev/tinyice/music/untitled1.mp3
-Title64=untitled1.mp3
-File65=/Users/syso/dev/tinyice/music/untitled12.mp3
-Title65=untitled12.mp3
-File66=/Users/syso/dev/tinyice/music/untitled13.mp3
-Title66=untitled13.mp3
-File67=/Users/syso/dev/tinyice/music/x82.mp3
-Title67=x82.mp3
-File68=/Users/syso/dev/tinyice/music/xaea_3.mp3
-Title68=xaea_3.mp3
-File69=/Users/syso/dev/tinyice/music/xbd.mp3
-Title69=xbd.mp3
-File70=/Users/syso/dev/tinyice/music/xfh.mp3
-Title70=xfh.mp3
-File71=/Users/syso/dev/tinyice/music/young.mp3
-Title71=young.mp3
+NumberOfEntries=0
 Version=2

playlists/foo.pls

@@ -0,0 +1,3 @@
+[playlist]
+NumberOfEntries=0
+Version=2

relay/streamer.go

@@ -262,12 +262,15 @@ func (s *Streamer) SavePlaylist() error {
 	return nil
 }
 
-func (s *Streamer) LoadPlaylist() error {
-	path := filepath.Join("playlists", s.Name+".pls")
+func (s *Streamer) LoadPlaylist(filename string) error {
+	if filename == "" {
+		filename = s.Name + ".pls"
+	}
+	path := filepath.Join("playlists", filename)
 	f, err := os.Open(path)
 	if err != nil {
-		if os.IsNotExist(err) {
-			return s.SavePlaylist() // Create empty
+		if os.IsNotExist(err) && filename == s.Name+".pls" {
+			return s.SavePlaylist() // Create default empty
 		}
 		return err
 	}
@@ -277,9 +280,6 @@ func (s *Streamer) LoadPlaylist() error {
 	defer s.mu.Unlock()
 	s.Playlist = []string{}
 
-	var entries int
-	fmt.Fscanf(f, "[playlist]\nNumberOfEntries=%d\n", &entries)
-
 	// Simple PLS parser
 	scanner := bufio.NewScanner(f)
 	for scanner.Scan() {
@@ -430,7 +430,7 @@ func (sm *StreamerManager) StartStreamer(name, mount, musicDir string, loop bool
 	}
 
 	sm.instances[mount] = s
-	s.LoadPlaylist()
+	s.LoadPlaylist("")
 
 	go sm.runStreamerLoop(ctx, s)
 	return s, nil

server/server.go

@@ -303,6 +303,7 @@ func (s *Server) setupRoutes() *http.ServeMux {
 	mux.HandleFunc("/admin/player/scan", s.handlePlayerScan)
 	mux.HandleFunc("/admin/player/clear-playlist", s.handlePlayerClearPlaylist)
 	mux.HandleFunc("/admin/player/save-playlist", s.handlePlayerSavePlaylist)
+	mux.HandleFunc("/admin/player/load-playlist", s.handlePlayerLoadPlaylist)
 	mux.HandleFunc("/admin/player/reorder", s.handlePlayerReorder)
 	mux.HandleFunc("/admin/player/queue", s.handlePlayerQueue)
 	mux.HandleFunc("/admin/player/shuffle", s.handlePlayerShuffle)
@@ -2020,15 +2021,16 @@ type relayEventInfo struct {
 }
 
 type streamerEventInfo struct {
-	Name        string  `json:"name"`
-	Mount       string  `json:"mount"`
-	State       int     `json:"state"`
-	CurrentSong string  `json:"song"`
-	StartTime   int64   `json:"start_time"`
-	Duration    float64 `json:"duration"`
-	PlaylistPos int     `json:"playlist_pos"`
-	PlaylistLen int     `json:"playlist_len"`
-	Shuffle     bool    `json:"shuffle"`
+	Name         string   `json:"name"`
+	Mount        string   `json:"mount"`
+	State        int      `json:"state"`
+	CurrentSong  string   `json:"song"`
+	StartTime    int64    `json:"start_time"`
+	Duration     float64  `json:"duration"`
+	PlaylistPos  int      `json:"playlist_pos"`
+	PlaylistLen  int      `json:"playlist_len"`
+	Shuffle      bool     `json:"shuffle"`
+	Queue        []relay.PlaylistItem `json:"queue"`
 }
 
 func (s *Server) collectStatsPayload(user *config.User) ([]byte, error) {
@@ -2086,6 +2088,7 @@ func (s *Server) collectStatsPayload(user *config.User) ([]byte, error) {
 				PlaylistPos: stats.PlaylistPos,
 				PlaylistLen: stats.PlaylistLen,
 				Shuffle:     stats.Shuffle,
+				Queue:       st.GetQueueInfo(),
 			})
 		}
 	}
@@ -2509,6 +2512,41 @@ func (s *Server) handleToggleAutoDJ(w http.ResponseWriter, r *http.Request) {
 	http.Redirect(w, r, "/admin#tab-streamer", http.StatusSeeOther)
 }
 
+func (s *Server) handlePlayerLoadPlaylist(w http.ResponseWriter, r *http.Request) {
+	if !s.isCSRFSafe(r) {
+		http.Error(w, "Forbidden", http.StatusForbidden)
+		return
+	}
+	if _, ok := s.checkAuth(r); !ok {
+		return
+	}
+
+	mount := r.FormValue("mount")
+	filename := r.FormValue("file")
+	streamer := s.StreamerM.GetStreamer(mount)
+	if streamer == nil {
+		http.Error(w, "Streamer not found", http.StatusNotFound)
+		return
+	}
+
+	if err := streamer.LoadPlaylist(filename); err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	// Persist new playlist to config
+	playlistCopy := streamer.GetPlaylist()
+	for _, adj := range s.Config.AutoDJs {
+		if adj.Mount == mount {
+			adj.Playlist = playlistCopy
+			s.Config.SaveConfig()
+			break
+		}
+	}
+
+	w.WriteHeader(http.StatusOK)
+}
+
 func (s *Server) handlePlayerReorder(w http.ResponseWriter, r *http.Request) {
 	if !s.isCSRFSafe(r) {
 		http.Error(w, "Forbidden", http.StatusForbidden)
@@ -2690,8 +2728,27 @@ func (s *Server) handlePlayerFiles(w http.ResponseWriter, r *http.Request) {
 		Title string `json:"title"`
 		IsDir bool   `json:"is_dir"`
 		Path  string `json:"path"`
+		IsPLS bool   `json:"is_pls"`
 	}
 	var res []fileEntry
+
+	// If we are at the root, also list available playlists
+	if subDir == "" {
+		if plsEntries, err := os.ReadDir("playlists"); err == nil {
+			for _, f := range plsEntries {
+				if !f.IsDir() && strings.HasSuffix(f.Name(), ".pls") {
+					res = append(res, fileEntry{
+						Name:  f.Name(),
+						Title: "Playlist: " + f.Name(),
+						IsDir: false,
+						Path:  f.Name(),
+						IsPLS: true,
+					})
+				}
+			}
+		}
+	}
+
 	for _, f := range entries {
 		ext := strings.ToLower(filepath.Ext(f.Name()))
 		if f.IsDir() || ext == ".mp3" {
@@ -2704,6 +2761,7 @@ func (s *Server) handlePlayerFiles(w http.ResponseWriter, r *http.Request) {
 				Title: title,
 				IsDir: f.IsDir(),
 				Path:  filepath.Join(subDir, f.Name()),
+				IsPLS: false,
 			})
 		}
 	}