fix: resolve duplicate JS declaration and restore admin dashboard functionality

Author: Datanoise

go.mod

@@ -10,6 +10,7 @@ require (
 
 require (
 	github.com/braheezy/shine-mp3 v0.1.0 // indirect
+	github.com/dhowden/tag v0.0.0-20240417053706-3d75831295e8 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/go-audio/audio v1.0.0 // indirect
 	github.com/go-audio/riff v1.0.0 // indirect

go.sum

@@ -2,6 +2,8 @@ github.com/braheezy/shine-mp3 v0.1.0 h1:N2wZhv6ipCFduTSftaPNdDgZ5xFmQAPvB7JcqA4s
 github.com/braheezy/shine-mp3 v0.1.0/go.mod h1:0H/pmcpFAd+Fnrj6Pc7du7wL36U/HqtfcgPJuCgc1L4=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dhowden/tag v0.0.0-20240417053706-3d75831295e8 h1:OtSeLS5y0Uy01jaKK4mA/WVIYtpzVm63vLVAPzJXigg=
+github.com/dhowden/tag v0.0.0-20240417053706-3d75831295e8/go.mod h1:apkPC/CR3s48O2D7Y++n1XWEpgPNNCjXYga3PPbJe2E=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/glebarez/go-sqlite v1.22.0 h1:uAcMJhaA6r3LHMTFgP0SifzgXg46yJkgxqyuyec+ruQ=

relay/relay.go

@@ -247,6 +247,12 @@ func (r *Relay) GetStream(mount string) (*Stream, bool) {
 	return s, ok
 }
 
+func (r *Relay) UpdateMetadata(mount, song string) {
+	if st, ok := r.GetStream(mount); ok {
+		st.SetCurrentSong(song, r)
+	}
+}
+
 // IsOgg returns true if the stream is Ogg-based (Ogg/Vorbis, Ogg/Opus, etc)
 func (s *Stream) IsOgg() bool {
 	ct := strings.ToLower(s.ContentType)

relay/streamer.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/DatanoiseTV/tinyice/config"
+	"github.com/dhowden/tag"
 	"github.com/hajimehoshi/go-mp3"
 	"github.com/sirupsen/logrus"
 )
@@ -352,13 +353,25 @@ func (sm *StreamerManager) streamFile(ctx context.Context, s *Streamer, path str
 	}
 	defer f.Close()
 
+	// Extract metadata
+	songTitle := filepath.Base(path)
+	if m, err := tag.ReadFrom(f); err == nil {
+		if m.Artist() != "" && m.Title() != "" {
+			songTitle = fmt.Sprintf("%s - %s", m.Artist(), m.Title())
+		} else if m.Title() != "" {
+			songTitle = m.Title()
+		}
+	}
+	// Seek back to start after reading tags
+	f.Seek(0, 0)
+
 	decoder, err := mp3.NewDecoder(f)
 	if err != nil {
 		return err
 	}
 
 	s.mu.Lock()
-	s.CurrentFile = filepath.Base(path)
+	s.CurrentFile = songTitle
 	s.CurrentFileTime = time.Now()
 	s.CurrentFileDuration = time.Duration(decoder.Length()) * time.Second / (44100 * 2 * 2) // Rough estimate for 44.1kHz 16bit stereo
 	s.mu.Unlock()
@@ -368,6 +381,7 @@ func (sm *StreamerManager) streamFile(ctx context.Context, s *Streamer, path str
 	if s.InjectMetadata {
 		output.CurrentSong = s.CurrentFile
 		output.Name = s.Name
+		sm.relay.UpdateMetadata(s.OutputMount, s.CurrentFile)
 	}
 	output.Bitrate = fmt.Sprintf("%d", s.Bitrate)
 

server/templates/admin.html

@@ -805,7 +805,6 @@ <h2>Edit AutoDJ</h2>
             });
         }
 
-        const csrfToken = "{{.CSRFToken}}";
         function showTab(id, updateHash) { 
             document.querySelectorAll('.tab-content').forEach(function(t) { t.classList.remove('active'); }); 
             document.querySelectorAll('.nav-link').forEach(function(t) { t.classList.remove('active'); });