Changeset 1850

Timestamp:

31/10/08 22:36:10 (2 months ago)

Author:

duncan

svm:headrev:

cc3e1ea1-1e01-0410-8d68-8b121e83a9d5:11131

Message:

Updated for play list support
There is a nasty bug in mplayer that corrupts the URLs; to avoid this problem this version downloads the music track to a file and plays it with mplayer.

The program still fails after the first play list with an invalid ticket. Not sure quite what is causing this problem.

Getting last.fm play lists to work correctly is non-trival to say the least, thankfully we have wireshark and http as a filter

Files:

• freevo/src/audio/plugins/lastfm2.py (modified) (28 diffs)

freevo/src/audio/plugins/lastfm2.py

@@ -1 +1 @@
 # -*- coding: iso-8859-1 -*-
 # -----------------------------------------------------------------------
-# 
+#
 # -----------------------------------------------------------------------
 # $Id$
@@ -31 +31 @@
 
 import sys, os, time
-import md5, urllib, urllib2, re
+import md5, urllib, urllib2, httplib, re
+from threading import Thread
 
 import kaa
@@ -39 +40 @@
 import plugin
 import rc
+from event import PLAY_END
 from menu import MenuItem, Menu
+from gui import AlertBox
 from audio.audioitem import AudioItem
 from audio.player import PlayerGUI
@@ -56 +59 @@
 
 
+class LastFMError(Exception):
+    """
+    An exception class for last.fm
+    """
+    @benchmark(benchmarking, benchmarkcall)
+    def __init__(self, why):
+        Exception.__init__(self)
+        self.why = why
+
+    def __str__(self):
+        return self.why
+
+
+
 class PluginInterface(plugin.MainMenuPlugin):
     """
@@ -65 +82 @@
     | LASTFM_USER = '<last fm user name>'
     | LASTFM_PASS = '<last fm password>'
-    | LASTFM_MPLAYER_AF_TRACK = True
     | LASTFM_LOCATIONS = [
     |     ('Last Fm - Neighbours', 'lastfm://user/%s/neighbours' % LASTFM_USER),
@@ -88 +104 @@
             return
         plugin.MainMenuPlugin.__init__(self)
+        self.menuitem = None
+        if not os.path.isdir(config.LASTFM_DIR):
+            os.makedirs(config.LASTFM_DIR, 0777)
+
+
     @benchmark(benchmarking, benchmarkcall)
     def config(self):
@@ -98 +119 @@
             ('LASTFM_PASS', None, 'Password for www.last.fm'),
             ('LASTFM_LANG', 'en', 'Language of last fm metadata (cn,de,en,es,fr,it,jp,pl,ru,sv,tr)'),
-            #('LASTFM_MPLAYER_AF_TRACK', False, 'Set to True if using mplayer\'s -af track'),
+            ('LASTFM_DIR', os.path.join(config.FREEVO_CACHEDIR, 'lastfm'), 'Directory to save lastfm files'),
             ('LASTFM_LOCATIONS', [], 'LastFM locations')
         ]
@@ -106 +127 @@
     def items(self, parent):
         _debug_('items(parent=%r)' % (parent,), 2)
-        return [ LastFMMainMenuItem(parent) ]
-
-
-
-class LastFMError(Exception):
-    @benchmark(benchmarking, benchmarkcall)
-    def __init__(self, why):
-        Exception.__init__(self)
-        self.why = why
+        self.menuitem = LastFMMainMenuItem(parent)
+        return [ self.menuitem ]
+
+
+    @benchmark(benchmarking, benchmarkcall)
+    def shutdown(self):
+        print 'PluginInterface.shutdown'
+        if self.menuitem is not None:
+            self.menuitem.shutdown()
 
 
@@ -120 +141 @@
 class LastFMMainMenuItem(MenuItem):
     """
-    this is the item for the main menu and creates the list
-    of commands in a submenu.
+    This is the item for the main menu and creates the list of commands in a
+    submenu.
     """
     @benchmark(benchmarking, benchmarkcall)
@@ -153 +174 @@
         menuw.pushmenu(lfm_menu)
         menuw.refresh()
- 
+
+
+    @benchmark(benchmarking, benchmarkcall)
+    def shutdown(self):
+        print 'LastFMMainMenuItem.shutdown'
+        if self.webservices is not None:
+            self.webservices.shutdown()
+
 
 
@@ -162 +190 @@
     and for displaying stdout and stderr of last command run.
     """
+    poll_interval = 4
+    poll_interval = 1
     @benchmark(benchmarking, benchmarkcall)
     def __init__(self, parent, name, station, webservices):
@@ -195 +225 @@
 
 
-    @benchmark(benchmarking, benchmarkcall)
+    @benchmark(benchmarking, True) #benchmarkcall)
     def eventhandler(self, event, menuw=None):
         _debug_('LastFMItem.eventhandler(event=%s, menuw=%r)' % (event, menuw), 2)
@@ -223 +253 @@
             self.menuw = menuw
 
-        if self.feed is None or self.entry > len(self.feed.entries):
+        if self.feed is None or self.entry >= len(self.feed.entries):
             try:
-                self.feed = self.xspf.parse(self.webservices.request_xspf())
+                for i in range(3):
+                    xspf = self.webservices.request_xspf()
+                    if xspf != 'No recs :(':
+                        break
+                    time.sleep(2)
+                else:
+                    if menuw:
+                        AlertBox(text='No recs :(').show()
+                    rc.post_event(PLAY_END)
+                    return
+
+                self.feed = self.xspf.parse(xspf)
+                if self.feed is None:
+                    if menuw:
+                        AlertBox(text=_('Cannot get XSFP')).show()
+                    rc.post_event(PLAY_END)
+                    return
             except LastFMError, why:
-                _debug_('why=%r' % (why,), DWARNING)
+                _debug_(why, DWARNING)
                 if menuw:
-                    AlertBox(text=why).show()
-                rc.post_event(rc.PLAY_END)
+                    AlertBox(text=str(why)).show()
+                rc.post_event(PLAY_END)
             self.entry = 0
 
@@ -238 +284 @@
         self.title = entry.title
         self.length = entry.duration
-        self.image = self.webservices.download_cover(entry.image_url)
-        self.url = entry.location_url
+        basename = entry.artist + '-' + entry.album + '-' + entry.title
+        self.basename = basename.lower().replace(' ', '_').replace('.', '').replace('\'', '').replace(':', '')
+        self.url = os.path.join(config.LASTFM_DIR, self.basename + os.path.splitext(entry.location_url)[1])
+        self.trackpath = os.path.join(config.LASTFM_DIR, self.basename + os.path.splitext(entry.location_url)[1])
+        self.location_url = entry.location_url
+        self.track_downloader = self.webservices.download(self.location_url, self.trackpath)
+        self.stream_name = urllib.unquote_plus(self.feed.feed.title)
+        self.imagepath = os.path.join(config.LASTFM_DIR, self.basename + os.path.splitext(entry.image_url)[1])
+        self.image_downloader = self.webservices.download(entry.image_url, self.imagepath)
+        #self.is_playlist = True
+        # Wait for a bit of the file to be downloaded
+        while self.track_downloader.filesize() < 1024 * 20:
+            if not self.track_downloader.isrunning():
+                rc.post_event(PLAY_END)
+                return
+            time.sleep(0.1)
         self.player = PlayerGUI(self, menuw)
+        if self.timer is not None and self.timer.active():
+            self.timer.stop()
         self.timer = kaa.OneShotTimer(self.timerhandler)
         self.timer.start(entry.duration)
@@ -248 +310 @@
             if menuw:
                 AlertBox(text=error).show()
-            rc.post_event(rc.PLAY_END)
+            rc.post_event(PLAY_END)
 
 
@@ -257 +319 @@
         """
         if self.timer is None:
-            print 'DJW:timer is None'
+            _debug_('timer is not running', DINFO)
             return
-        poll_interval = 3
-        polling_itme = 600
-        now_playing = self.webservices.now_playing()
-        if now_playing is None:
+        if self.track_downloader is None:
+            _debug_('downloader is not running', DERROR)
+            return
+        if self.track_downloader.isrunning():
+            _debug_('still playing', DINFO)
+            self.timer.start(LastFMItem.poll_interval)
+        else:
             self.entry += 1
-            print 'DJW:', self.entry, len(self.feed.entries)
             self.play(self.arg, self.menuw)
-        else:
-            _debug_('now_playing: still playing=%r' % (now_playing,))
-            #self.timer = kaa.OneShotTimer(self.timerhandler)
-            self.timer.start(poll_interval)
 
 
@@ -278 +338 @@
         """
         _debug_('LastFMItem.stop(arg=%r, menuw=%r)' % (arg, menuw), 1)
-        if self.timer is not None:
+        if self.timer is not None and self.timer.active():
             self.timer.stop()
-            self.timer = None
+        self.timer = None
 
 
@@ -286 +346 @@
     def skip(self):
         """Skip song"""
-        _debug_('skip()', 2)
+        _debug_('skip()', 1)
         self.entry += 1
-        if self.timer is not None:
+        if self.timer is not None and self.timer.active():
             self.timer.stop()
-            self.timer = None
+        self.timer = None
         self.play(self.arg, self.menuw)
 
@@ -297 +357 @@
     def love(self):
         """Send "Love" information to audioscrobbler"""
-        _debug_('love()', 2)
+        _debug_('love()', 1)
         self.webservices.love()
 
@@ -304 +364 @@
     def ban(self):
         """Send "Ban" information to audioscrobbler"""
-        _debug_('ban()', 2)
+        _debug_('ban()', 1)
         self.webservices.ban()
+
+
+
+
+class SmartRedirectHandler(urllib2.HTTPRedirectHandler):
+    def http_error_301(self, req, fp, code, msg, headers):
+        result = urllib2.HTTPRedirectHandler.http_error_301(self, req, fp, code, msg, headers)
+        result.status = code
+        return result
+
+    def http_error_302(self, req, fp, code, msg, headers):
+        result = urllib2.HTTPRedirectHandler.http_error_302(self, req, fp, code, msg, headers)
+        result.status = code
+        return result
+
+
+
+class LastFMDownloader(Thread):
+    """
+    Download the stream to a file
+
+    There is a bad bug im mplayer that corrupts the url passed, so we have to
+    download it to a file and then play it
+    """
+    def __init__(self, url, filename, headers=None):
+        Thread.__init__(self)
+        self.url = url
+        self.filename = filename
+        self.headers = headers
+        self.running = True
+        self.size = 0
+
+
+    def run(self):
+        """
+        Execute a download operation. Stop when finished downloading or
+        requested to stop.
+        """
+        httplib.HTTPConnection.debuglevel = 1
+        request = urllib2.Request(self.url, headers=self.headers)
+        opener = urllib2.build_opener(SmartRedirectHandler())
+        try:
+            httplib.HTTPConnection.debuglevel = 1
+            f = opener.open(request)
+            fd = open(self.filename, 'wb')
+            while self.running:
+                reply = f.read(1024 * 100)
+                fd.write(reply)
+                if len(reply) == 0:
+                    self.running = False
+                    _debug_('%s downloaded' % self.filename)
+                    # what we could do now is to add tags to track
+                    break
+                self.size += len(reply)
+            else:
+                _debug_('%s aborted' % self.filename)
+            fd.close()
+            f.close()
+        except urllib2.HTTPError, why:
+            _debug_('%s: %s' % (self.filename, why), DWARNING)
+        httplib.HTTPConnection.debuglevel = 0
+
+
+    def stop(self):
+        """
+        Stop the download thead running
+        """
+        # this does not stop the download thread
+        self.running = False
+
+
+    def filesize(self):
+        """
+        Get the downloaded file size
+        """
+        return self.size
+
+
+    def isrunning(self):
+        """
+        See if the thread running
+        """
+        return self.running
 
 
@@ -325 +468 @@
             self.base_url = self.cachefd.readline().strip('\n')
             self.base_path = self.cachefd.readline().strip('\n')
+            self.downloader = None
         except IOError, why:
             self._login()
+
+
+    @benchmark(benchmarking, benchmarkcall)
+    def shutdown(self):
+        """
+        Shutdown the lasf.fm webservices
+        """
+        print 'LastFMWebServices.shutdown'
+        if self.downloader is not None:
+            self.downloader.stop()
 
 
@@ -341 +495 @@
         @returns: reply from request
         """
-        _debug_('url=%r, data=%r' % (url, data), 1)
-        print 'DJW:url=%r, data=%r' % (url, data)
-        if lines:
-            reply = []
-            try:
-                lines = urllib.urlopen(url, data).readlines()
-                if lines is None:
-                    return []
-                for line in lines:
-                    reply.append(line.strip('\n'))
-            except Exception, why:
-                _debug_('%s: %s' % (url, why), DWARNING)
-                raise
-            _debug_('reply=%r' % (reply,), 1)
-            #DJW#
-            import pprint
-            if len(reply) == 1:
-                print 'DJW:reply', reply
+        httplib.HTTPConnection.debuglevel = 1
+        try:
+            _debug_('url=%r, data=%r' % (url, data), 1)
+            request = urllib2.Request(url)
+            opener = urllib2.build_opener(SmartRedirectHandler())
+            if lines:
+                reply = []
+                try:
+                    f = opener.open(request)
+                    lines = f.readlines()
+                    if lines is None:
+                        return []
+                    for line in lines:
+                        reply.append(line.strip('\n'))
+                except httplib.BadStatusLine, why:
+                    print 'BadStatusLine:', why
+                    reply = None
+                except AttributeError, why:
+                    reply = None
+                except Exception, why:
+                    _debug_('%s: %s' % (url, why), DWARNING)
+                    raise
+                _debug_('reply=%r' % (reply,), 1)
+                return reply
             else:
-                print 'DJW:reply:', len(reply), 'lines'
-                pprint.pprint(lines)
-            #DJW#
-            return reply
-        else:
-            reply = ''
-            try:
-                reply = urllib.urlopen(url, data).read()
-            except Exception, why:
-                _debug_('%s: %s' % (url, why), DWARNING)
-                raise
-            _debug_('reply=%r' % (reply,), 1)
-            return reply
+                reply = ''
+                try:
+                    f = opener.open(request)
+                    reply = f.read()
+                except Exception, why:
+                    _debug_('%s: %s' % (url, why), DWARNING)
+                    raise
+                _debug_('len(reply)=%r' % (len(reply),), 1)
+                return reply
+        finally:
+            httplib.HTTPConnection.debuglevel = 0
 
 
@@ -413 +571 @@
         if not self.session:
             self._login()
-        request_url = 'http://%s%s/xspf.php?sk=%s&discovery=0&desktop=%s' % \
+        #request_url = 'http://%s%s/xspf.php?sk=%s&discovery=0&desktop=%s' % \
+        request_url = 'http://%s%s/xspf.php?sk=%s&discovery=1&desktop=%s' % \
             (self.base_url, self.base_path, self.session, LastFMWebServices._version)
         return self._urlopen(request_url, lines=False)
@@ -453 +612 @@
 
     @benchmark(benchmarking, benchmarkcall)
-    def download_cover(self, image_url):
-        """
-        Download album cover to freevo cache directory
-        XXX don't need to save a file, can use the image directly using imlib2
-        """
-        _debug_('download_cover(image_url=%r)' % (image_url,), 2)
-
-        os.system('rm -f %s' % os.path.join(config.FREEVO_CACHEDIR, 'lfmcover_*.jpg'))
+    def download(self, url, filename):
+        """
+        Download album cover or track to last.fm directory.
+
+        Add the session as a cookie to the request
+
+        @param url: location of item to download
+        @param filename: path to downloaded file
+        """
+        _debug_('download(url=%r, filename=%r)' % (url, filename), 1)
         if not self.session:
             self._login()
-        try:
-            pic_file = self._urlopen(image_url, lines=False)
-            filename = os.path.join(config.FREEVO_CACHEDIR, 'lfmcover_'+str(time.time())+'.jpg')
-            save = open(filename, 'w')
-            try:
-                print >>save, pic_file
-                return filename
-            finally:
-                save.close()
-        except IOError:
-            return None
+        headers = {
+            'Session': self.session,
+        }
+        self.downloader = LastFMDownloader(url, filename, headers)
+        self.downloader.start()
+        return self.downloader
 
 
@@ -525 +681 @@
         * AUTH1: md5( md5(password) + Timestamp), An md5 sum of an md5 sum of the password, plus the timestamp as salt.
         * AUTH2: Second possible Password. The client uses md5( md5(toLower(password)) + Timestamp)
-        * PLAYER: See Appendix 
-        """
-        return True
+        * PLAYER: See Appendix
+        """
+        timestamp = time.strftime('%s', time.gmtime(time.time()))
+        username = config.LASTFM_USER
+        password = config.LASTFM_PASS
+        auth = md5.new(md5.new(password).hexdigest()+timestamp).hexdigest()
+        auth2 = md5.new(md5.new(password.lower()).hexdigest()+timestamp).hexdigest()
+        url = 'http://ws.audioscrobbler.com//ass/pwcheck.php?' + \
+            'time=%s&' % timestamp + \
+            'username=%s&' % username + \
+            'auth=%s&' % auth + \
+            'auth2=%s&' % auth2 + \
+            'defaultplayer=fvo'
+        return self._urlopen(url)
 
 
@@ -537 +704 @@
     XSPF is documented at U{http://www.xspf.org/quickstart/}
     """
-    _LASTFM_NS = 'http://www.audioscrobbler.net/dtd/xspf-lastfm/'
+    _LASTFM_NS = 'http://www.audioscrobbler.net/dtd/xspf-lastfm'
 
     @benchmark(benchmarking, benchmarkcall)
@@ -564 +731 @@
             for track_elem in tracklist.findall('track'):
                 track = feedparser.FeedParserDict()
+                track_map = dict((c, p) for p in track_elem.getiterator() for c in p)
                 title = track_elem.find('title')
                 track.title = title is not None and title.text or u''
@@ -576 +744 @@
                 duration_ms = track_elem.find('duration')
                 track.duration = duration_ms is not None and int(float(duration_ms.text)/1000.0+0.5) or 0
+                trackauth = track_elem.find('{%s}trackauth' % LastFMXSPF._LASTFM_NS)
+                track.trackauth = trackauth is not None and trackauth.text or u''
                 self.entries.append(track)
         return self
+
+
+
+if __name__ == '__main__':
+    """
+    To run this test harness need to have defined in local_conf.py:
+
+        - LASTFM_USER
+        - LASTFM_PASS
+        - LASTFM_LANG
+    """
+
+    station = 'lastfm://globaltags/jazz'
+    station_url = urllib.quote_plus(station)
+    webservices = LastFMWebServices()
+    print webservices.test_user_pass()
+    print webservices._login()
+    print webservices.adjust_station(station_url)
+    print webservices.request_xspf()
+    print 'sleep(10)'
+    time.sleep(10)
+    for i in range(3):
+        xspf = self.webservices.request_xspf()
+        print xspf
+        if xspf != 'No recs :(':
+            break
+        time.sleep(2)
+    else:
+        print 'Failed to get second playlist'