Changeset 1855

Timestamp:

01/11/08 20:41:32 (2 months ago)

Author:

duncan

svm:headrev:

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

Message:

Fixed the problem of stopping at the end of the first play list
The list was been appended to but the index was being reset

Files:

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

freevo/src/audio/plugins/lastfm2.py

@@ -203 +203 @@
         self.xspf = None
         self.feed = None
-        self.entry = None
         self.timer = None
         self.player = None
@@ -221 +220 @@
         self.xspf = LastFMXSPF()
         self.feed = None
-        self.entry = 0
         items = [ (self.play, _('Listen to LastFM Station')) ]
         return items
@@ -254 +252 @@
             self.menuw = menuw
 
-        if self.feed is None or self.entry >= len(self.feed.entries):
+        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:
                 for i in range(3):
@@ -278 +278 @@
                     AlertBox(text=str(why)).show()
                 rc.post_event(PLAY_END)
-            self.entry = 0
-
-        entry = self.feed.entries[self.entry]
+
+        entry = self.feed.entries[0]
         self.stream_name = urllib.unquote_plus(self.feed.feed.title)
         self.album = entry.album
@@ -334 +333 @@
             self.timer.start(LastFMItem.poll_interval)
         else:
-            self.entry += 1
+            self.feed.entries.pop(0)
             self.play(self.arg, self.menuw)
 
@@ -353 +352 @@
         """Skip song"""
         _debug_('skip()', 1)
-        self.entry += 1
+        self.feed.entries.pop(0)
         if self.timer is not None and self.timer.active():
             self.timer.stop()
@@ -378 +377 @@
 class SmartRedirectHandler(urllib2.HTTPRedirectHandler):
     def http_error_301(self, req, fp, code, msg, headers):
-        #print 'DJW:http_error_301'
+        print 'DJW:http_error_301'
         result = urllib2.HTTPRedirectHandler.http_error_301(self, req, fp, code, msg, headers)
         result.status = code
@@ -384 +383 @@
 
     def http_error_302(self, req, fp, code, msg, headers):
-        #print 'DJW:http_error_302'
+        print 'DJW:http_error_302'
         result = urllib2.HTTPRedirectHandler.http_error_302(self, req, fp, code, msg, headers)
         result.status = code
@@ -412 +411 @@
         requested to stop.
         """
-        #print 'DJW:self.url:', self.url, 'self.headers:', self.headers
         request = urllib2.Request(self.url, headers=self.headers)
         opener = urllib2.build_opener(SmartRedirectHandler())
@@ -424 +422 @@
                     self.running = False
                     _debug_('%s downloaded' % self.filename)
-                    #print 'DJW:downloaded %s' % self.filename
+                    print 'DJW:downloaded %s' % self.filename
                     # what we could do now is to add tags to track
                     break