gr8 stuff

tpetr · Feb 2, 2011 · e85fc94 · e85fc94
1 parent 5b189dd
commit e85fc94
Show file tree

Hide file tree

Showing 8 changed files with 3,001 additions and 5 deletions.
diff --git a/lib/BeautifulSoup.py b/lib/BeautifulSoup.py
@@ -0,0 +1 @@
+../src/BeautifulSoup-3.2.0/BeautifulSoup.py
diff --git a/muxlist/mix/views.py b/muxlist/mix/views.py
@@ -38,7 +38,7 @@ def send_current_song(group_name, user):
     conn.start()
     conn.connect()
     conn.subscribe(destination='/user/%s' % user.id, ack='auto')
-    msg = json.dumps({'type': 'song', 'user': playing_user.username, 'artist': track.artist.name, 'title': track.title, 'url': track.get_location().url, 'time': track.length - r.ttl('%s_current' % group_name)})
+    msg = json.dumps({'type': 'song', 'user': playing_user.username, 'artist': track.artist.name, 'album': track.album.name, 'cover_art': track.album.image, 'title': track.title, 'url': track.get_location().url, 'time': track.length - r.ttl('%s_current' % group_name)})
     conn.send(msg, destination='/user/%s' % user.id)
 
 def send_next_song(group_name):
@@ -76,7 +76,7 @@ def send_next_song(group_name):
     conn.start()
     conn.connect()
     conn.subscribe(destination='/mix/%s' % group_name, ack='auto')
-    msg = json.dumps({'type': 'song', 'user': user.username, 'artist': track.artist.name, 'title': track.title, 'url': track.get_location().url})
+    msg = json.dumps({'type': 'song', 'user': user.username, 'artist': track.artist.name, 'album': track.album.name, 'cover_art': track.album.image, 'title': track.title, 'url': track.get_location().url})
     conn.send(msg, destination='/mix/%s' % group_name)
 
 @receiver(track_uploaded, sender=None)

diff --git a/muxlist/music/forms.py b/muxlist/music/forms.py
@@ -78,9 +78,9 @@ def save(self, user):
             if album_name != '':
                 album, created = Album.objects.get_or_create(artist=artist, name=album_name)
                 if created:
-                    r = urllib2.urlopen('http://ws.audioscrobbler.com/2.0/?method=album.getinfo&api_key=b25b959554ed76058ac220b7b2e0a026&artist=%s&album=%s')
+                    r = urllib2.urlopen('http://ws.audioscrobbler.com/2.0/?method=album.getinfo&api_key=72553de16666cad1c8f7e319292e9123&artist=%s&album=%s' % (artist_name.replace(' ', '%20'), album_name.replace(' ', '%20')))
                     bs = BeautifulSoup(r.read())
-                    album.image = bs.image[1]
+                    album.image = bs.album.image.nextSibling.nextSibling.nextSibling.nextSibling.contents[0]
                     album.save()
             else:
                 album = None