Changeset 1892

Timestamp:

17/11/08 22:37:42 (8 weeks ago)

Author:

duncan

svm:headrev:

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

Message:

Figured out what the problem was with stopping the player menuw is None for the
second and later tracks, initializing the player once fixed this problem.

Files:

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

freevo/src/audio/plugins/lastfm2.py

@@ -30 +30 @@
 
 
-import sys, os, time
+import sys, os, time, traceback
 import md5, urllib, urllib2, httplib, re
 from threading import Thread
@@ -57 +57 @@
 
 # Debugging modules
-import pprint, traceback
+if config.DEBUG_DEBUGGER:
+    import pdb, pprint
 
 
@@ -181 +182 @@
     @benchmark(benchmarking, benchmarkcall)
     def shutdown(self):
-        pprint.pprint(self.__dict__)
         if self.webservices is not None:
             self.webservices.shutdown()
@@ -230 +230 @@
         if event == 'STOP':
             self.stop(self.arg, self.menuw)
-            return
+            return True
         if event == 'PLAY_START':
             pass
@@ -236 +236 @@
             if self.feed is not None and len(self.feed.entries) > 0:
                 self.feed.entries.pop(0)
-            self.stop()
             self.play()
             return False
@@ -314 +313 @@
                         raise LastFMError('Failed to download track', entry.location_url)
                     time.sleep(0.1)
-                self.player = PlayerGUI(self, menuw)
+                if not self.player:
+                    self.player = PlayerGUI(self, menuw)
                 error = self.player.play()
                 if error:
@@ -322 +322 @@
                     pop.destroy()
         except LastFMError, why:
+            traceback.print_exc()
             _debug_('play error: %s' % (why,), DWARNING)
             if menuw:
@@ -480 +481 @@
             return reply
         except urllib2.HTTPError, why:
-            _debug_('%s: %s' % (url, why))
+            _debug_('%s: %s' % (url, why), DWARNING)
             raise LastFMError(why, url)
         except Exception, why:
-            _debug_('%s: %s' % (url, why))
-            raise LastFMError(why, url)
+            _debug_('%s' % (why,), DWARNING)
+            raise LastFMError(why)