Skip to content

Feature/dj clean #296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JaragonCR wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Feature/dj clean #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c95b245
feat: Spotify DJ basic playback — transfer, skip, track rotation
JaragonCR Mar 21, 2026
0ea49c5
feat: DJ interactivity — enable "Switch it up" via LexiconContextReso…
JaragonCR Mar 21, 2026
53c65f5
fix: DJ fresh start — use interactive lexicon reason for non-zeroconf…
JaragonCR Mar 21, 2026
e3a8647
fix: prevent DJ playlist looping after queue exhaustion
JaragonCR Mar 21, 2026
b7c6df4
fix: route Mercury AP playlist events to enable unlimited DJ Switch i…
JaragonCR Mar 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions daemon/api_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,16 @@ func (p *AppPlayer) newApiResponseStatusTrack(media *librespot.Media, position i
albumCoverId = getBestImageIdForSize(track.Album.CoverGroup.Image, p.app.cfg.ImageSize)
}

var trackCoverUrl *string
if p.prodInfo != nil {
trackCoverUrl = p.prodInfo.ImageUrl(albumCoverId)
}
return &ApiResponseStatusTrack{
Uri: librespot.SpotifyIdFromGid(librespot.SpotifyIdTypeTrack, track.Gid).Uri(),
Name: *track.Name,
ArtistNames: artists,
AlbumName: *track.Album.Name,
AlbumCoverUrl: p.prodInfo.ImageUrl(albumCoverId),
AlbumCoverUrl: trackCoverUrl,
Position: position,
Duration: int(*track.Duration),
ReleaseDate: track.Album.Date.String(),
Expand All @@ -238,12 +242,16 @@ func (p *AppPlayer) newApiResponseStatusTrack(media *librespot.Media, position i

albumCoverId := getBestImageIdForSize(episode.CoverImage.Image, p.app.cfg.ImageSize)

var episodeCoverUrl *string
if p.prodInfo != nil {
episodeCoverUrl = p.prodInfo.ImageUrl(albumCoverId)
}
return &ApiResponseStatusTrack{
Uri: librespot.SpotifyIdFromGid(librespot.SpotifyIdTypeEpisode, episode.Gid).Uri(),
Name: *episode.Name,
ArtistNames: []string{*episode.Show.Name},
AlbumName: *episode.Show.Name,
AlbumCoverUrl: p.prodInfo.ImageUrl(albumCoverId),
AlbumCoverUrl: episodeCoverUrl,
Position: position,
Duration: int(*episode.Duration),
ReleaseDate: "",
Expand Down
18 changes: 18 additions & 0 deletions daemon/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"github.com/devgianlu/go-librespot/mpris"
"github.com/devgianlu/go-librespot/player"
"github.com/devgianlu/go-librespot/playplay"
connectpb "github.com/devgianlu/go-librespot/proto/spotify/connectstate"
devicespb "github.com/devgianlu/go-librespot/proto/spotify/connectstate/devices"
"github.com/devgianlu/go-librespot/session"
"github.com/devgianlu/go-librespot/zeroconf"
Expand All @@ -40,6 +41,18 @@ type App struct {
mpris mpris.Server
logoutCh chan *AppPlayer

// DJ cache persists across zeroconf reconnects so that a transfer command
// arriving on a new session can still use the queue from the last cluster push.
djCachedContextUri string
djCachedNextTracks []*connectpb.ContextTrack
djCacheIsOurs bool

// djSectionBuffer holds vibe-section playlist tracks received via hm://playlist/ pushes.
// Each entry is one section (from a different vibe playlist). When the lexicon 15-track
// window is exhausted, djPoll pops the next section from here to keep playback going
// without looping the same 15 tracks.
djSectionBuffer [][]*connectpb.ContextTrack

closed bool
}

Expand Down Expand Up @@ -188,6 +201,10 @@ func (app *App) newAppPlayer(ctx context.Context, creds any) (_ *AppPlayer, err
appPlayer.prefetchTimer = time.NewTimer(math.MaxInt64)
appPlayer.prefetchTimer.Stop()

appPlayer.djPollTimer = time.NewTimer(math.MaxInt64)
appPlayer.djPollTimer.Stop()
appPlayer.djPollAttempts = 0

if appPlayer.sess, err = session.NewSessionFromOptions(ctx, &session.Options{
Log: app.log,
DeviceType: app.deviceType,
Expand All @@ -205,6 +222,7 @@ func (app *App) newAppPlayer(ctx context.Context, creds any) (_ *AppPlayer, err

if appPlayer.player, err = player.NewPlayer(&player.Options{
Spclient: appPlayer.sess.Spclient(),
Mercury: appPlayer.sess.Mercury(),
AudioKey: appPlayer.sess.AudioKey(),
Events: appPlayer.sess.Events(),
Log: app.log,
Expand Down
Loading