fix: resolve form action path corruption and improve playlist loading safety

Author: Datanoise

playlists/foo.pls

@@ -1,3 +1,7 @@
 [playlist]
-NumberOfEntries=0
+NumberOfEntries=2
+File1=/Users/syso/dev/tinyice/music/a_d.mp3
+Title1=a_d.mp3
+File2=/Users/syso/dev/tinyice/music/Lexyyysy42l.mp3
+Title2=Lexyyysy42l.mp3
 Version=2

relay/streamer.go

@@ -272,7 +272,13 @@ func (s *Streamer) LoadPlaylist(filename string) error {
 	if err != nil {
 		if os.IsNotExist(err) {
 			if filename == s.Name+".pls" {
-				return s.SavePlaylist()
+				// Only save if we don't have a playlist in memory either
+				s.mu.RLock()
+				empty := len(s.Playlist) == 0
+				s.mu.RUnlock()
+				if empty {
+					return s.SavePlaylist()
+				}
 			}
 			return nil
 		}
@@ -449,7 +455,12 @@ func (sm *StreamerManager) StartStreamer(name, mount, musicDir string, loop bool
 	}
 
 	sm.instances[mount] = s
-	s.LoadPlaylist("")
+	
+	if lastPlaylist != "" {
+		s.LoadPlaylist(lastPlaylist)
+	} else {
+		s.LoadPlaylist("")
+	}
 
 	go sm.runStreamerLoop(ctx, s)
 	return s, nil

relay/transcode.go

@@ -273,15 +273,11 @@ func EncodeOpus(ctx context.Context, relay *Relay, output *Stream, decoder io.Re
 		case <-ctx.Done():
 			return
 		default:
-			rn, rerr := io.ReadFull(decoder, pcmBuf)
+			_, rerr := io.ReadFull(decoder, pcmBuf)
 			if rerr != nil {
 				return
 			}
 
-			if sentCount == 0 {
-				logrus.Debugf("Opus Encoder: Successfully read first PCM frame (%d bytes)", rn)
-			}
-
 			for i := 0; i < len(pcmSamples); i++ {
 				pcmSamples[i] = int16(pcmBuf[i*2]) | int16(pcmBuf[i*2+1])<<8
 			}

server/server.go

@@ -2536,7 +2536,10 @@ func (s *Server) handlePlayerLoadPlaylist(w http.ResponseWriter, r *http.Request
 		return
 	}
 
-	if err := streamer.LoadPlaylist(filename); err != nil {
+	// Filename from library browser is absolute now
+	playlistName := filepath.Base(filename)
+
+	if err := streamer.LoadPlaylist(playlistName); err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
@@ -2546,7 +2549,7 @@ func (s *Server) handlePlayerLoadPlaylist(w http.ResponseWriter, r *http.Request
 	for _, adj := range s.Config.AutoDJs {
 		if adj.Mount == mount {
 			adj.Playlist = playlistCopy
-			adj.LastPlaylist = filename
+			adj.LastPlaylist = playlistName
 			s.Config.SaveConfig()
 			break
 		}
@@ -2795,21 +2798,33 @@ func (s *Server) handlePlayerPlaylistAction(w http.ResponseWriter, r *http.Reque
 
 	if action == "add" {
 		fullPath := relPath // Already absolute from frontend now
-		logrus.Debugf("AutoDJ %s: Adding song %s to playlist", mount, fullPath)
+		logrus.Infof("AutoDJ %s: Attempting to add %s", mount, fullPath)
 
 		info, err := os.Stat(fullPath)
-		if err == nil {
-			if info.IsDir() {
-				// Add folder recursively
-				filepath.Walk(fullPath, func(p string, i os.FileInfo, e error) error {
-					if e == nil && !i.IsDir() && strings.ToLower(filepath.Ext(p)) == ".mp3" {
-						streamer.AddToPlaylist(p)
-					}
+		if err != nil {
+			logrus.WithError(err).Errorf("AutoDJ %s: Failed to stat path %s", mount, fullPath)
+			http.Error(w, "File not found", http.StatusNotFound)
+			return
+		}
+
+		if info.IsDir() {
+			logrus.Infof("AutoDJ %s: Adding directory %s", mount, fullPath)
+			err := filepath.Walk(fullPath, func(p string, i os.FileInfo, e error) error {
+				if e != nil {
+					logrus.WithError(e).Warnf("AutoDJ %s: Error walking path %s", mount, p)
 					return nil
-				})
-			} else {
-				streamer.AddToPlaylist(fullPath)
+				}
+				if !i.IsDir() && strings.ToLower(filepath.Ext(p)) == ".mp3" {
+					streamer.AddToPlaylist(p)
+				}
+				return nil
+			})
+			if err != nil {
+				logrus.WithError(err).Errorf("AutoDJ %s: Walk failed for %s", mount, fullPath)
 			}
+		} else {
+			logrus.Infof("AutoDJ %s: Adding single file %s", mount, fullPath)
+			streamer.AddToPlaylist(fullPath)
 		}
 	} else if action == "remove" {
 		var idx int

server/templates/admin.html

@@ -745,7 +745,8 @@ <h2>Edit AutoDJ</h2>
                 }
             }, 2000);
 
-            fetch(form.action, {
+            const url = form.getAttribute('action');
+            fetch(url, {
                 method: 'POST',
                 body: formData
             }).then(r => {
@@ -909,14 +910,14 @@ <h2>Edit AutoDJ</h2>
                             </div>
                             <div style="display:flex; gap:0.3rem;">
                                 ${(!e.is_dir && !e.is_pls) ? `
-                                <form action="/admin/player/queue" method="POST" onsubmit="return submitForm(event, false)" style="margin:0;">
+                                <form action="/admin/player/queue" method="POST" onsubmit="console.log('Queueing:', '${e.abs_path}'); return submitForm(event, false)" style="margin:0;">
                                     <input type="hidden" name="csrf" value="${csrfToken}">
                                     <input type="hidden" name="mount" value="${mount}">
                                     <input type="hidden" name="action" value="add">
                                     <input type="hidden" name="path" value="${e.abs_path}">
                                     <button type="submit" class="btn btn-outline btn-sm" style="padding:0.1rem 0.3rem; font-size:0.7rem;" title="Queue Next">QUEUE</button>
                                 </form>` : ''}
-                                <form action="${actionURL}" method="POST" onsubmit="${confirmMsg ? `if(confirm('${confirmMsg}')) ` : ''}return submitForm(event, true)" style="margin:0;">
+                                <form action="${actionURL}" method="POST" onsubmit="console.log('Adding:', '${e.abs_path}'); ${confirmMsg ? `if(confirm('${confirmMsg}')) ` : ''}return submitForm(event, true)" style="margin:0;">
                                     <input type="hidden" name="csrf" value="${csrfToken}">
                                     <input type="hidden" name="mount" value="${mount}">
                                     <input type="hidden" name="action" value="add">
@@ -1089,17 +1090,6 @@ <h2>Edit AutoDJ</h2>
             });
         }
 
-        // Ensure forms redirect back to the current tab
-        document.addEventListener('submit', function(e) {
-            var form = e.target;
-            if (form.method.toLowerCase() === 'post') {
-                var action = form.getAttribute('action');
-                if (action && action.indexOf('#') === -1) {
-                    form.setAttribute('action', action + window.location.hash);
-                }
-            }
-        });
-
         function loadHistory(mount, btn) {
             if (!mount) return;
             document.querySelectorAll('.history-mount-btn').forEach(function(b) { b.classList.remove('active'); });

tinyice.pid

@@ -0,0 +1 @@
+38148