Album separators in playlist views (#190)

* Album separators in playlist views

Tracks with album metadata now display grouped under dimmed
separator headers in both the main playlist and the playlist
manager. Scroll logic accounts for separator rows consuming
budget—cursor stays visible across album boundaries.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* Suppress album separators for Spotify playlist tracks

Spotify playlists typically have every track from a different album,
causing a separator on every row. Gate separator rendering behind
an isStreamingPlaylistTrack check so library-style providers (local,
Navidrome, Jellyfin, Plex) keep separators while Spotify skips them.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* Dedupe album-separator row counting

Extract albumSeparatorRows as the single source of truth for both
playlistScroll (scroll.go) and renderPlMgrTracks (view_overlays.go).

The playlist manager's inline scroll-row counter was missing the
isStreamingPlaylistTrack exclusion that its renderer applied, so
mixed Spotify+local playlists could mis-scroll. Routing both paths
through one helper fixes the inconsistency.

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Co-authored-by: Bjarne Øverli <bjarne.oeverli@gmail.com>

Author: 3 people

docs/playlists.md

@@ -141,6 +141,8 @@ Press `p` from any view to open the playlist manager:
 6. **Play all**: press `Enter` on the track list to load all tracks into the player
 7. **New playlist**: select "+ New Playlist...", type a name, and press Enter
 
+Tracks with an `album` field are grouped by album with visual separator headers in both the playlist manager and the main player view.
+
 The directory `~/.config/cliamp/playlists/` is created automatically on first use. Removing the last track from a playlist auto-deletes the file.
 
 ### Creating Playlists Manually

site/index.html

@@ -1522,7 +1522,7 @@
       <div class="feature">
         <div class="feature-icon">☰</div>
         <div class="feature-name">Playlists</div>
-        <p>TOML playlists, M3U/M3U8/PLS support, built-in playlist manager.</p>
+        <p>TOML playlists, M3U/M3U8/PLS support, playlist manager with album grouping.</p>
       </div>
       <div class="feature">
         <div class="feature-icon">→</div>

ui/model/scroll.go

@@ -66,10 +66,10 @@ func (m Model) playlistScroll(visible int) int {
 	if m.plCursor < scroll {
 		return m.plCursor
 	}
-	if m.plCursor-scroll+1 <= visible {
-		return scroll
+	for scroll < m.plCursor && albumSeparatorRows(tracks, scroll, m.plCursor) > visible {
+		scroll++
 	}
-	return m.plCursor - visible + 1
+	return scroll
 }
 
 func (m Model) mainFrameFixedLines(includeTransient bool) int {

ui/model/view.go

@@ -623,12 +623,24 @@ func (m Model) renderPlaylist() string {
 	currentIdx := m.playlist.Index()
 	scroll := m.playlistScroll(budget)
 
-	// budget is the number of rendered lines available for tracks.
-	// The loop below counts every appended line against this budget
-	// so the playlist never overflows its area.
-	lines := make([]string, 0, budget) // tracks
+	lines := make([]string, 0, budget)
 	numWidth := len(fmt.Sprintf("%d", len(tracks)))
+	prevAlbum := ""
+	if scroll > 0 {
+		prevAlbum = tracks[scroll-1].Album
+	}
 	for i := scroll; i < len(tracks) && len(lines) < budget; i++ {
+		if album := tracks[i].Album; album != "" && album != prevAlbum && !isStreamingPlaylistTrack(tracks[i].Path) {
+			if len(lines)+1 >= budget {
+				break
+			}
+			lines = append(lines, m.albumSeparator(album, tracks[i].Year))
+		}
+		prevAlbum = tracks[i].Album
+		if len(lines) >= budget {
+			break
+		}
+
 		prefix := "  "
 		style := playlistItemStyle
 

ui/model/view_helpers.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 	"unicode/utf8"
 
+	"cliamp/playlist"
 	"cliamp/ui"
 )
 
@@ -55,6 +56,36 @@ func helpKey(key, label string) string {
 	return helpKeyStyle.Render(" "+key+" ") + helpStyle.Render(" "+label)
 }
 
+// isStreamingPlaylistTrack reports whether path is a streaming-provider URI
+// whose Album metadata may not represent a real album grouping (so separators
+// would be misleading).
+func isStreamingPlaylistTrack(path string) bool {
+	return strings.HasPrefix(path, "spotify:track:")
+}
+
+// albumSeparatorRows counts rendered rows between scroll and cursor (inclusive)
+// in a playlist view that emits an album-separator row whenever the album
+// changes. Streaming tracks are treated as not contributing a separator,
+// matching the renderer.
+func albumSeparatorRows(tracks []playlist.Track, scroll, cursor int) int {
+	if len(tracks) == 0 || scroll < 0 || cursor < scroll || cursor >= len(tracks) {
+		return 0
+	}
+	rows := 0
+	prevAlbum := ""
+	if scroll > 0 {
+		prevAlbum = tracks[scroll-1].Album
+	}
+	for i := scroll; i <= cursor; i++ {
+		if album := tracks[i].Album; album != "" && album != prevAlbum && !isStreamingPlaylistTrack(tracks[i].Path) {
+			rows++
+		}
+		prevAlbum = tracks[i].Album
+		rows++
+	}
+	return rows
+}
+
 // albumSeparator builds a full-width album divider line.
 func (m Model) albumSeparator(album string, year int) string {
 	prefix := "── "

ui/model/view_nav.go

@@ -197,7 +197,7 @@ func (m Model) renderNavTrackList() []string {
 		for i := scroll; i < len(m.navBrowser.tracks) && rendered < maxVisible; i++ {
 			t := m.navBrowser.tracks[i]
 
-			if album := t.Album; album != "" && album != prevAlbum {
+			if album := t.Album; album != "" && album != prevAlbum && !isStreamingPlaylistTrack(t.Path) {
 				lines = append(lines, m.albumSeparator(album, t.Year))
 				if rendered >= maxVisible {
 					break

ui/model/view_overlays.go

@@ -155,16 +155,38 @@ func (m Model) renderPlMgrTracks() []string {
 	}
 
 	maxVisible := 12
+	tracks := m.plManager.tracks
 	scroll := scrollStart(m.plManager.cursor, maxVisible)
+	for scroll < m.plManager.cursor && albumSeparatorRows(tracks, scroll, m.plManager.cursor) > maxVisible {
+		scroll++
+	}
 
-	for i := scroll; i < len(m.plManager.tracks) && i < scroll+maxVisible; i++ {
-		name := truncate(m.plManager.tracks[i].DisplayName(), ui.PanelWidth-8)
+	rendered := 0
+	prevAlbum := ""
+	if scroll > 0 {
+		prevAlbum = tracks[scroll-1].Album
+	}
+
+	for i := scroll; i < len(tracks) && rendered < maxVisible; i++ {
+		if album := tracks[i].Album; album != "" && album != prevAlbum && !isStreamingPlaylistTrack(tracks[i].Path) {
+			if rendered+1 >= maxVisible {
+				break
+			}
+			lines = append(lines, m.albumSeparator(album, tracks[i].Year))
+			rendered++
+		}
+		prevAlbum = tracks[i].Album
+		if rendered >= maxVisible {
+			break
+		}
+		name := truncate(tracks[i].DisplayName(), ui.PanelWidth-8)
 		label := fmt.Sprintf("%d. %s", i+1, name)
 		lines = append(lines, cursorLine(label, i == m.plManager.cursor))
+		rendered++
 	}
 
-	if len(m.plManager.tracks) > maxVisible {
-		lines = append(lines, "", dimStyle.Render(fmt.Sprintf("  %d/%d tracks", m.plManager.cursor+1, len(m.plManager.tracks))))
+	if len(tracks) > maxVisible {
+		lines = append(lines, "", dimStyle.Render(fmt.Sprintf("  %d/%d tracks", m.plManager.cursor+1, len(tracks))))
 	}
 
 	lines = append(lines, "", helpKey("↑↓", "Navigate ")+helpKey("Enter", "Play all ")+helpKey("a", "Add track ")+helpKey("d", "Remove ")+helpKey("Esc", "Back"))