diff --git a/light9/ascoltami/playlist.py b/light9/ascoltami/playlist.py --- a/light9/ascoltami/playlist.py +++ b/light9/ascoltami/playlist.py @@ -1,6 +1,5 @@ -from light9.showconfig import getSongsFromShow, songOnDisk +from light9.showconfig import songOnDisk from light9.namespaces import L9 -from rdflib import URIRef class NoSuchSong(ValueError): """Raised when a song is requested that doesn't exist (e.g. one @@ -9,29 +8,7 @@ class NoSuchSong(ValueError): class Playlist(object): def __init__(self, graph, playlistUri): self.graph = graph - - # this should be fixed to share with getSongsFromShow. See note in that one for why I had to stop using graph.items - self.songs = [ - URIRef("http://light9.bigasterisk.com/show/dance2014/song1"), - URIRef("http://light9.bigasterisk.com/show/dance2014/song2"), - URIRef("http://light9.bigasterisk.com/show/dance2014/song3"), - URIRef("http://light9.bigasterisk.com/show/dance2014/song4"), - URIRef("http://light9.bigasterisk.com/show/dance2014/song5"), - URIRef("http://light9.bigasterisk.com/show/dance2014/song6"), - URIRef("http://light9.bigasterisk.com/show/dance2014/song7"), - URIRef("http://light9.bigasterisk.com/show/dance2014/song8"), - URIRef("http://light9.bigasterisk.com/show/dance2014/song9"), - URIRef("http://light9.bigasterisk.com/show/dance2014/song10"), - URIRef("http://light9.bigasterisk.com/show/dance2014/song11"), - URIRef("http://light9.bigasterisk.com/show/dance2014/song12"), - URIRef("http://light9.bigasterisk.com/show/dance2014/song13"), - URIRef("http://light9.bigasterisk.com/show/dance2014/song14"), - URIRef("http://light9.bigasterisk.com/show/dance2014/song15"), - URIRef("http://light9.bigasterisk.com/show/dance2014/song16"), - URIRef("http://light9.bigasterisk.com/show/dance2014/song17"), - ] - # probably fixed with the patch in https://github.com/RDFLib/rdflib/issues/305 - #self.songs = list(graph.items(playlistUri)) + self.songs = list(graph.items(playlistUri)) def nextSong(self, currentSong): """Returns the next song in the playlist or raises NoSuchSong if