Changeset 1858

Timestamp:

02/11/08 18:36:05 (2 months ago)

Author:

duncan

svm:headrev:

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

Message:

Removed timer functions as these are not needed, because the files have been downloaded
The timer functions were not 100% accurate.
Cleaned up most print messages

Files:

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

freevo/src/audio/plugins/lastfm2.py

@@ -34 +34 @@
 from threading import Thread
 
-import kaa
-from kaa import Timer, OneShotTimer
-
+# Freevo modules
 import config
 import plugin
@@ -57 +55 @@
 benchmarking = config.DEBUG_BENCHMARKING
 benchmarkcall = config.DEBUG_BENCHMARKCALL
+
+# Debugging modules
 import pprint, traceback
+
 
 
@@ -67 +68 @@
     def __init__(self, why):
         Exception.__init__(self)
-        print 'DJW:why:', why, type(why), dir(why)
         self.why = str(why)
 
@@ -133 +133 @@
     @benchmark(benchmarking, benchmarkcall)
     def shutdown(self):
-        print 'PluginInterface.shutdown'
         if self.menuitem is not None:
             self.menuitem.shutdown()
@@ -178 +177 @@
     @benchmark(benchmarking, benchmarkcall)
     def shutdown(self):
-        print 'LastFMMainMenuItem.shutdown'
         if self.webservices is not None:
             self.webservices.shutdown()
@@ -202 +200 @@
         self.xspf = None
         self.feed = None
-        self.timer = None
         self.player = None
         self.arg = None
@@ -230 +227 @@
             self.stop(self.arg, self.menuw)
             return
-        if event == 'PLAYLIST_NEXT':
+        if event == 'PLAY_END':
+            if self.feed is not None and len(self.feed.entries) > 0:
+                self.feed.entries.pop(0)
+            self.play()
+            return False
+        elif event == 'PLAYLIST_NEXT':
             self.skip()
             return True
@@ -252 +254 @@
             self.menuw = menuw
 
-        if self.feed is not None:
-            print 'DJW:len(self.feed.entries):', len(self.feed.entries)
         if self.feed is None or len(self.feed.entries) <= 0:
             try:
@@ -278 +278 @@
                 _debug_(why, DWARNING)
                 if menuw:
-                    print 'DJW:why:', why, type(why), '%r' % str(why)
                     AlertBox(text=str(why)).show()
-                traceback.print_stack()
                 rc.post_event(PLAY_END)
                 return
 
         entry = self.feed.entries[0]
-        print 'DJW:entry:', entry.artist, '/', entry.album, '/', entry.title
+        _debug_('entry "%s / %s / %s" of %s' % (entry.artist, entry.album, entry.title, len(self.feed.entries)))
         self.stream_name = urllib.unquote_plus(self.feed.title)
         self.album = entry.album
@@ -320 +318 @@
             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)
         error = self.player.play()
         if error:
@@ -334 +328 @@
 
     @benchmark(benchmarking, benchmarkcall)
-    def timerhandler(self):
-        """
-        Handle the timer event when at the end of a track
-        """
-        if self.timer is None:
-            _debug_('timer is not running', DINFO)
-            return
-        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.feed.entries.pop(0)
-            self.play(self.arg, self.menuw)
-
-
-    @benchmark(benchmarking, benchmarkcall)
     def stop(self, arg=None, menuw=None):
         """
@@ -358 +333 @@
         """
         _debug_('LastFMItem.stop(arg=%r, menuw=%r)' % (arg, menuw), 1)
-        if self.timer is not None and self.timer.active():
-            self.timer.stop()
-        self.timer = None
 
 
@@ -368 +340 @@
         _debug_('skip()', 1)
         self.feed.entries.pop(0)
-        if self.timer is not None and self.timer.active():
-            self.timer.stop()
-        self.timer = None
         self.play(self.arg, self.menuw)
 
@@ -412 +381 @@
     download it to a file and then play it
     """
+    @benchmark(benchmarking, benchmarkcall)
     def __init__(self, url, filename, headers=None):
         Thread.__init__(self)
@@ -421 +391 @@
 
 
+    @benchmark(benchmarking, benchmarkcall)
     def run(self):
         """
@@ -436 +407 @@
                 if len(reply) == 0:
                     self.running = False
-                    print 'DJW:downloaded %s' % self.filename
-                    _debug_('%s downloaded' % self.filename)
+                    print '%s downloaded' % self.filename
+                    # debugs fail during shutdown
+                    #_debug_('%s downloaded' % self.filename)
                     # what we could do now is to add tags to track
                     break
                 self.size += len(reply)
             else:
-                print 'DJW:aborted %s' % self.filename
+                print '%s download aborted' % self.filename
+                #_debug_('%s download aborted' % self.filename)
                 os.remove(self.filename)
-                #_debug_('%s aborted' % self.filename)
             fd.close()
             f.close()
@@ -453 +425 @@
 
 
+    @benchmark(benchmarking, benchmarkcall)
+    def filesize(self):
+        """
+        Get the downloaded file size
+        """
+        return self.size
+
+
+    @benchmark(benchmarking, benchmarkcall)
     def stop(self):
         """
@@ -461 +442 @@
 
 
-    def filesize(self):
-        """
-        Get the downloaded file size
-        """
-        return self.size
-
-
+    @benchmark(benchmarking, benchmarkcall)
     def isrunning(self):
         """
@@ -505 +480 @@
         Shutdown the lasf.fm webservices
         """
-        print 'LastFMWebServices.shutdown'
         if self.downloader is not None:
             self.downloader.stop()
@@ -511 +485 @@
 
     @benchmark(benchmarking, benchmarkcall)
-    def _urlopen(self, url, data=None, lines=True):
+    def _urlopen(self, url, lines=True):
         """
         Wrapper to see what is sent and received
@@ -522 +496 @@
         @returns: reply from request
         """
-        _debug_('url=%r, data=%r' % (url, data), 1)
+        _debug_('url=%r, lines=%r' % (url, lines), 1)
         request = urllib2.Request(url, headers=LastFMWebServices.headers)
         opener = urllib2.build_opener(SmartRedirectHandler())
-        if lines:
-            reply = []
-            try:
+        try:
+            if lines:
+                reply = []
                 f = opener.open(request)
                 lines = f.readlines()
@@ -534 +508 @@
                 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:
-            reply = ''
-            try:
+                _debug_('reply=%r' % (reply,), 1)
+            else:
+                reply = ''
                 f = opener.open(request)
                 reply = f.read()
-            except urllib2.HTTPError, why:
-                _debug_('%s: %s' % (url, why), DWARNING)
-                raise LastFMError(why)
-            except Exception, why:
-                _debug_('%s: %s' % (url, why), DWARNING)
-                raise LastFMError(why)
-            _debug_('len(reply)=%r' % (len(reply),), 1)
+                _debug_('len(reply)=%r' % (len(reply),), 1)
             return reply
+        except urllib2.HTTPError, why:
+            _debug_('%s: %s' % (url, why))
+            raise LastFMError(why)
+        except Exception, why:
+            _debug_('%s: %s' % (url, why))
+            raise LastFMError(why)