Merge lp:~osomon/moovida/element_redirections into lp:moovida

[Olivier Tilloy]

[Olivier Tilloy (osomon)]

This branch fixes wrong handling of stream redirections in the general case where the "new-location" attribute of the message contains a full URI rather than just a filename.

Both cases are now handled gracefully, although it's unclear whether the latter is valid (it can be observed for Apple trailers so we need to support it anyway).

As a side effect, the fix improves the situation regarding bug #494713: for some mms:// streams Moovida previously crashed after entering an infinite loop of redirections, it now fails gracefully (reporting an error message to the user). It can be verified with e.g. mms://stream.amaonline.com/keyefm.

I also fixed this annoying issue that the Player was not logging anything.

[Michał Sawicz (saviq)]

This merge indeed fixes this issue. I couldn't find any regressions and everything behaved as expected.

review: Approve (code functional)

=== modified file 'elisa-plugins/elisa/plugins/poblesec/player_video.py'
--- elisa-plugins/elisa/plugins/poblesec/player_video.py	2010-01-08 11:38:15 +0000
+++ elisa-plugins/elisa/plugins/poblesec/player_video.py	2010-01-28 17:33:18 +0000
@@ -425,7 +425,7 @@
         """
         return self.animated.opacity > 0
 
-class Player(gobject.GObject, Loggable):
+class Player(Loggable, gobject.GObject):
 
     STOPPED = 0
     PLAYING = 1
@@ -656,16 +656,16 @@
             decoder = pbutils.get_decoder_description(mimetype)
             self.emit('player-missing-decoder', mimetype, decoder)
         elif message.structure.get_name() == 'redirect':
-            self.info("redirect")
-            # we got a new location for current uri. Only the filename
-            # of the uri is concerned. So we build a new uri with
-            # updated filename and reset the pipeline state.
-            current_uri = MediaUri(self.pipeline.get_property('uri'))
-            filename = current_uri.filename
-            idx = unicode(current_uri).find(filename)
-            new_filename = message.structure['new-location']
-            new_uri = current_uri[:idx] + new_filename
-            self.pipeline.set_property('uri', new_uri)
+            new_location = message.structure['new-location']
+            if '://' not in new_location:
+                # The new location is not a full URI, it differs only from the
+                # original one by the filename. It is not clear whether this is
+                # valid, but it can be observed for e.g. some Apple trailers.
+                uri = MediaUri(self.pipeline.get_property('uri'))
+                uri.path = uri.path[:uri.path.rfind('/')+1] + new_location
+                new_location = unicode(uri)
+            self.info('Redirected to %s' % new_location)
+            self.pipeline.set_property('uri', new_location)
             self.pipeline.set_state(gst.STATE_NULL)
             self.pipeline.set_state(gst.STATE_PLAYING)