light9 Changeset - 9af29b8a635f

Changeset - 9af29b8a635f

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Drew Perttula - 11 years ago 2014-05-26 20:51:57
drewp@bigasterisk.com

update the workaround for song id corruption
Ignore-this: 181e0edae9961f5fd3123eda4269f86f

2 files changed with 34 insertions and 34 deletions:

light9/ascoltami/playlist.py

light9/showconfig.py

0 comments (0 inline, 0 general)

light9/ascoltami/playlist.py

➞

Show inline comments

@@ @@ -3,41 +3,41 @@ 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
     after the last song in the playlist)."""
 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/dance2013/song1"),
             URIRef("http://light9.bigasterisk.com/show/dance2013/song2"),
             URIRef("http://light9.bigasterisk.com/show/dance2013/song3"),
             URIRef("http://light9.bigasterisk.com/show/dance2013/song4"),
             URIRef("http://light9.bigasterisk.com/show/dance2013/song5"),
             URIRef("http://light9.bigasterisk.com/show/dance2013/song6"),
             URIRef("http://light9.bigasterisk.com/show/dance2013/song7"),
             URIRef("http://light9.bigasterisk.com/show/dance2013/song8"),
             URIRef("http://light9.bigasterisk.com/show/dance2013/song9"),
             URIRef("http://light9.bigasterisk.com/show/dance2013/song10"),
             URIRef("http://light9.bigasterisk.com/show/dance2013/song11"),
             URIRef("http://light9.bigasterisk.com/show/dance2013/song12"),
             URIRef("http://light9.bigasterisk.com/show/dance2013/song13"),
             URIRef("http://light9.bigasterisk.com/show/dance2013/song14"),
             URIRef("http://light9.bigasterisk.com/show/dance2013/song15"),
             URIRef("http://light9.bigasterisk.com/show/dance2013/song16"),
             URIRef("http://light9.bigasterisk.com/show/dance2013/song17"),
             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))
     def nextSong(self, currentSong):
         """Returns the next song in the playlist or raises NoSuchSong if
         we are at the end of the playlist."""
         try:
             currentIndex = self.songs.index(currentSong)
         except IndexError:
             raise ValueError("%r is not in the current playlist (%r)." % \
                 (currentSong, self.playlistUri))

light9/showconfig.py

➞

Show inline comments

@@ @@ -69,41 +69,41 @@ def songFilenameFromURI(uri): @@
     everywhere"""
     assert isinstance(uri, URIRef)
     return uri.split('/')[-1]
 def getSongsFromShow(graph, show):
     playList = graph.value(show, L9['playList'])
     if not playList:
         raise ValueError("%r has no l9:playList" % show)
     songs = [
         # this was graph.items(playlistUri) but i was getting other
         # items from a totally different list! seems like bnode
         # corruption.
         URIRef("http://light9.bigasterisk.com/show/dance2013/song1"),
         URIRef("http://light9.bigasterisk.com/show/dance2013/song2"),
         URIRef("http://light9.bigasterisk.com/show/dance2013/song3"),
         URIRef("http://light9.bigasterisk.com/show/dance2013/song4"),
         URIRef("http://light9.bigasterisk.com/show/dance2013/song5"),
         URIRef("http://light9.bigasterisk.com/show/dance2013/song6"),
         URIRef("http://light9.bigasterisk.com/show/dance2013/song7"),
         URIRef("http://light9.bigasterisk.com/show/dance2013/song8"),
         URIRef("http://light9.bigasterisk.com/show/dance2013/song9"),
         URIRef("http://light9.bigasterisk.com/show/dance2013/song10"),
         URIRef("http://light9.bigasterisk.com/show/dance2013/song11"),
         URIRef("http://light9.bigasterisk.com/show/dance2013/song12"),
         URIRef("http://light9.bigasterisk.com/show/dance2013/song13"),
         URIRef("http://light9.bigasterisk.com/show/dance2013/song14"),
         URIRef("http://light9.bigasterisk.com/show/dance2013/song15"),
         URIRef("http://light9.bigasterisk.com/show/dance2013/song16"),
         URIRef("http://light9.bigasterisk.com/show/dance2013/song17"),
         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
     #songs = list(graph.items(playList))
     return songs
 def curvesDir():
     return path.join(root(),"curves")
 def songFilename(song):
     return path.join(root(), "music", "%s.wav" % song)

0 comments (0 inline, 0 general)