Mercurial > code > home > repos > light9

changeset 998:08814a44ae4e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
emergency fix to playlist, which was getting other non-song junk because of some bnode corruption problem Ignore-this: c3608bd16c6d5a539e6c96bf737a24ef
author drewp@bigasterisk.com
date Sun, 16 Jun 2013 20:12:46 +0000
parents ac55250fc373
children 995155e1dc74
files light9/ascoltami/playlist.py light9/showconfig.py
diffstat 2 files changed, 45 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/light9/ascoltami/playlist.py	Sun Jun 16 20:12:40 2013 +0000
+++ b/light9/ascoltami/playlist.py	Sun Jun 16 20:12:46 2013 +0000
@@ -1,5 +1,6 @@
 from light9.showconfig import getSongsFromShow, 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
@@ -8,7 +9,28 @@
 class Playlist(object):
     def __init__(self, graph, playlistUri):
         self.graph = graph
-        self.songs = list(graph.items(playlistUri))
+
+        # 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"),
+        ]
+        
     def nextSong(self, currentSong):
         """Returns the next song in the playlist or raises NoSuchSong if 
         we are at the end of the playlist."""
--- a/light9/showconfig.py	Sun Jun 16 20:12:40 2013 +0000
+++ b/light9/showconfig.py	Sun Jun 16 20:12:46 2013 +0000
@@ -74,7 +74,28 @@
     playList = graph.value(show, L9['playList'])
     if not playList:
         raise ValueError("%r has no l9:playList" % show)
-    songs = list(graph.items(playList))
+    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"),
+    ]
 
     return songs