owen/supersonic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring continued - compiles now

Browse Source
This commit is contained in:
Drew Weymouth
2024-05-31 16:37:14 -07:00
parent f67a0c5fc1
commit 0a902aef9f
24 changed files with 154 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/mediaprovider/jellyfin/jellyfinmediaprovider.go
+1 -1
View File
@@ -395,7 +395,7 @@ func toTrack(ch *jellyfin.Song) *mediaprovider.Track {
ID: ch.Id,
CoverArtID: coverArtID,
ParentID: ch.AlbumID,
Name: ch.Name,
Title: ch.Name,
Duration: int(ch.RunTimeTicks / runTimeTicksPerSecond),
TrackNumber: ch.IndexNumber,
DiscNumber: ch.DiscNumber,
backend/mediaprovider/model.go
+42 -7
View File
@@ -86,7 +86,7 @@ type Track struct {
ID string
CoverArtID string
ParentID string
Name string
Title string
Duration int
TrackNumber int
DiscNumber int
@@ -146,21 +146,56 @@ type RadioStation struct {
StreamURL string
}
type MediaItemType int
const (
MediaItemTypeTrack MediaItemType = iota
MediaItemTypeRadioStation
)
type MediaItemMetadata struct {
Type MediaItemType
ID string
Name string
Artists []string
ArtistIDs []string
Album string
AlbumID string
CoverArtID string
Duration int
}
type MediaItem interface {
MediaItemName() string
MediaItemID() string
Metadata() MediaItemMetadata
Copy() MediaItem
}
func (t Track) MediaItemName() string { return t.Name }
func (t Track) MediaItemID() string { return t.ID }
func (t Track) Metadata() MediaItemMetadata {
return MediaItemMetadata{
Type: MediaItemTypeTrack,
ID: t.ID,
Name: t.Title,
Artists: t.ArtistNames,
ArtistIDs: t.ArtistIDs,
Album: t.Album,
AlbumID: t.AlbumID,
CoverArtID: t.CoverArtID,
Duration: t.Duration,
}
}
func (t *Track) Copy() MediaItem {
new := *t
return &new
}
func (r RadioStation) MediaItemName() string { return r.Name }
func (r RadioStation) MediaItemID() string { return r.ID }
func (r RadioStation) Metadata() MediaItemMetadata {
return MediaItemMetadata{
Type: MediaItemTypeRadioStation,
ID: r.ID,
Name: r.Name,
}
}
func (r *RadioStation) Copy() MediaItem {
return r // no need to copy since RadioStations are immutable
}
backend/mediaprovider/subsonic/subsonicmediaprovider.go
+2 -2
View File
@@ -367,7 +367,7 @@ func (s *subsonicMediaProvider) GetLyrics(track *mediaprovider.Track) (*mediapro
return mpLyrics, nil
}
// fallback to legacy getLyrics endpoint
lyrics, err := s.client.GetLyrics(track.Name, track.ArtistNames[0])
lyrics, err := s.client.GetLyrics(track.Title, track.ArtistNames[0])
if err != nil || lyrics == nil || lyrics.Text == "" {
return nil, err
}
@@ -433,7 +433,7 @@ func toTrack(ch *subsonic.Child) *mediaprovider.Track {
ID: ch.ID,
CoverArtID: ch.CoverArt,
ParentID: ch.Parent,
Name: ch.Title,
Title: ch.Title,
Duration: ch.Duration,
TrackNumber: ch.Track,
DiscNumber: ch.DiscNumber,
backend/mpmedia_mac.go
+8 -4
View File
@@ -69,9 +69,13 @@ func InitMPMediaHandler(playbackManager *PlaybackManager, artURLLookup func(trac
mpMediaEventRecipient = mp
C.register_os_remote_commands()
mp.playbackManager.OnSongChange(func(track *NowPlayingMetadata, _ *mediaprovider.Track) {
mp.playbackManager.OnSongChange(func(track mediaprovider.MediaItem, _ *mediaprovider.Track) {
// Asynchronously because artwork fetching can take time
go mp.updateMetadata(track)
var meta mediaprovider.MediaItemMetadata
if track == nil {
meta = track.Metadata()
}
go mp.updateMetadata(&meta)
})
mp.playbackManager.OnStopped(func() {
@@ -95,11 +99,11 @@ func InitMPMediaHandler(playbackManager *PlaybackManager, artURLLookup func(trac
return nil
}
func (mp *MPMediaHandler) updateMetadata(meta *NowPlayingMetadata) {
func (mp *MPMediaHandler) updateMetadata(meta *mediaprovider.MediaItemMetadata) {
var title, artist, artURL string
var duration int
if meta != nil && meta.ID != "" {
title = meta.Title
title = meta.Name
var err error
if artURL, err = mp.artURLLookup(meta.CoverArtID); err != nil {
log.Printf("error fetching art url: %s", err.Error())
backend/mpris.go
+4 -4
View File
@@ -58,11 +58,11 @@ func NewMPRISHandler(playerName string, pm *PlaybackManager) *MPRISHandler {
m.evt.Player.OnSeek(pos)
}
})
pm.OnSongChange(func(tr *NowPlayingMetadata, _ *mediaprovider.Track) {
pm.OnSongChange(func(tr mediaprovider.MediaItem, _ *mediaprovider.Track) {
if tr == nil {
m.curTrackPath = ""
} else {
m.curTrackPath = dbusTrackIDPrefix + encodeTrackId(tr.ID)
m.curTrackPath = dbusTrackIDPrefix + encodeTrackId(tr.Metadata().ID)
}
if m.connErr == nil {
m.evt.Player.OnTitle()
@@ -252,7 +252,7 @@ func (m *MPRISHandler) Metadata() (types.Metadata, error) {
}
status := m.pm.PlayerStatus()
var tr mediaprovider.Track
if np := m.pm.NowPlayingMediaItem(); np != nil && status.State != player.Stopped {
if np := m.pm.NowPlaying(); np != nil && status.State != player.Stopped {
if track, ok := np.(*mediaprovider.Track); ok {
tr = *track
}
@@ -266,7 +266,7 @@ func (m *MPRISHandler) Metadata() (types.Metadata, error) {
return types.Metadata{
TrackId: dbus.ObjectPath(trackObjPath),
Length: secondsToMicroseconds(status.Duration),
Title: tr.Name,
Title: tr.Title,
Album: tr.Album,
Artist: tr.ArtistNames,
DiscNumber: tr.DiscNumber,
backend/playbackengine.go
+6 -32
View File
@@ -60,7 +60,7 @@ type playbackEngine struct {
replayGainCfg ReplayGainConfig
// registered callbacks
onSongChange []func(nowPlaying *NowPlayingMetadata, justScrobbledIfAny *mediaprovider.Track)
onSongChange []func(nowPlaying mediaprovider.MediaItem, justScrobbledIfAny *mediaprovider.Track)
onPlayTimeUpdate []func(float64, float64, bool)
onLoopModeChange []func(LoopMode)
onVolumeChange []func(int)
@@ -122,34 +122,8 @@ func (p *playbackEngine) PlayTrackAt(idx int) error {
return p.setTrack(idx, false)
}
// Gets the curently playing song, if any.
func (p *playbackEngine) NowPlaying() *NowPlayingMetadata {
if p.nowPlayingIdx < 0 || len(p.playQueue) == 0 || p.player.GetStatus().State == player.Stopped {
return nil
}
item := p.playQueue[p.nowPlayingIdx]
if tr, ok := item.(*mediaprovider.Track); ok {
return &NowPlayingMetadata{
Type: MediaTypeTrack,
ID: tr.ID,
Title: tr.Name,
Artists: tr.ArtistNames,
ArtistIDs: tr.ArtistIDs,
Album: tr.Album,
AlbumID: tr.AlbumID,
Duration: float64(tr.Duration),
}
}
return &NowPlayingMetadata{
Type: MediaTypeRadioStation,
ID: item.MediaItemID(),
Title: item.MediaItemName(),
Duration: 0.0,
}
}
// Gets the curently playing song, if any.
func (p *playbackEngine) NowPlayingMediaItem() mediaprovider.MediaItem {
// Gets the curently playing media item, if any.
func (p *playbackEngine) NowPlaying() mediaprovider.MediaItem {
if p.nowPlayingIdx < 0 || len(p.playQueue) == 0 || p.player.GetStatus().State == player.Stopped {
return nil
}
@@ -304,9 +278,9 @@ func (p *playbackEngine) UpdatePlayQueue(tracks []*mediaprovider.Track) error {
newQueue := p.copyTrackSliceToMediaItemSlice(tracks)
newNowPlayingIdx := -1
if p.nowPlayingIdx >= 0 {
nowPlayingID := p.playQueue[p.nowPlayingIdx].MediaItemID()
nowPlayingID := p.playQueue[p.nowPlayingIdx].Metadata().ID
for i, tr := range newQueue {
if tr.MediaItemID() == nowPlayingID {
if tr.Metadata().ID == nowPlayingID {
newNowPlayingIdx = i
break
}
@@ -335,7 +309,7 @@ func (p *playbackEngine) RemoveTracksFromQueue(trackIDs []string) {
nowPlaying := p.NowPlayingIndex()
newNowPlaying := nowPlaying
for i, tr := range p.playQueue {
if _, ok := idSet[tr.MediaItemID()]; ok {
if _, ok := idSet[tr.Metadata().ID]; ok {
if i < nowPlaying {
// if removing a track earlier than the currently playing one (if any),
// decrement new now playing index by one to account for new position in queue
backend/playbackmanager.go
+3 -26
View File
@@ -15,25 +15,6 @@ type PlaybackManager struct {
engine *playbackEngine
}
type MediaType int
const (
MediaTypeTrack MediaType = iota
MediaTypeRadioStation
)
type NowPlayingMetadata struct {
Type MediaType
ID string
Title string
Artists []string
ArtistIDs []string
Album string
AlbumID string
CoverArtID string
Duration int
}
func NewPlaybackManager(
ctx context.Context,
s *ServerManager,
@@ -64,21 +45,17 @@ func (p *PlaybackManager) DisableCallbacks() {
p.engine.callbacksDisabled = true
}
// Gets the curently playing song, if any.
func (p *PlaybackManager) NowPlaying() *NowPlayingMetadata {
// Gets the now playing media item, if any.
func (p *PlaybackManager) NowPlaying() mediaprovider.MediaItem {
return p.engine.NowPlaying()
}
func (p *PlaybackManager) NowPlayingMediaItem() mediaprovider.MediaItem {
return p.engine.NowPlayingMediaItem()
}
func (p *PlaybackManager) NowPlayingIndex() int {
return p.engine.NowPlayingIndex()
}
// Sets a callback that is notified whenever a new song begins playing.
func (p *PlaybackManager) OnSongChange(cb func(nowPlaying *NowPlayingMetadata, justScrobbledIfAny *mediaprovider.Track)) {
func (p *PlaybackManager) OnSongChange(cb func(nowPlaying mediaprovider.MediaItem, justScrobbledIfAny *mediaprovider.Track)) {
p.engine.onSongChange = append(p.engine.onSongChange, cb)
}
backend/savedplayqueue.go
+1 -1
View File
@@ -33,7 +33,7 @@ func SavePlayQueue(serverID string, pm *PlaybackManager, filepath string, server
for _, item := range queue {
if _, ok := item.(*mediaprovider.Track); ok {
// dont' save radio stations in play queue
trackIDs = append(trackIDs, item.MediaItemID())
trackIDs = append(trackIDs, item.Metadata().ID)
}
}