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

[Olivier Tilloy]

[Olivier Tilloy (osomon)]

This bundle fixes various bugs in the player OSD:

1) The OSD wasn't really cleared when necessary, despite various attempts to fix that (see https://bugs.launchpad.net/moovida/+bug/432269 among others). The issue was less easy to observe but it was there (hint: a slow network connection helps to reproduce the issue).

2) The default thumbnail for music was that of videos (https://bugs.launchpad.net/moovida/+bug/463733).

3) The posters for TV episodes were never shown in the OSD, despite the fact that we had their URIs in the DB (https://bugs.launchpad.net/moovida/+bug/485933).

With all that the OSD is hopefully less buggy and a tad more useful.

Thanks for the review!

Unmerged revisions

1607. By Olivier Tilloy on 2009-11-26

Removed an outdated FIXME.

1606. By Olivier Tilloy on 2009-11-26

Get, cache and display in the OSD the episode's poster URI if needed.

1605. By Olivier Tilloy on 2009-11-26

Do not re-load default preview artwork, it's already there.

1604. By Olivier Tilloy on 2009-11-26

Fix the default preview artwork for the audio player.

1603. By Olivier Tilloy on 2009-11-26

Clear the OSD when the player is stopped.

=== modified file 'elisa-plugins/elisa/plugins/poblesec/player_audio.py'
--- elisa-plugins/elisa/plugins/poblesec/player_audio.py	2009-05-27 11:57:22 +0000
+++ elisa-plugins/elisa/plugins/poblesec/player_audio.py	2009-11-26 16:45:27 +0000
@@ -50,3 +50,6 @@
                                  'will be used.',
                   }
     default_config = player_default_config()
+
+    default_preview = 'elisa.plugins.poblesec.player.thumbnail.default_album'
+

=== modified file 'elisa-plugins/elisa/plugins/poblesec/player_video.py'
--- elisa-plugins/elisa/plugins/poblesec/player_video.py	2009-11-23 09:55:40 +0000
+++ elisa-plugins/elisa/plugins/poblesec/player_video.py	2009-11-26 16:45:27 +0000
@@ -14,7 +14,8 @@
 # See "LICENSE.Moovida" in the root directory of this distribution package
 # for details on that license.
 
-from elisa.core.utils import locale_helper
+from elisa.core.utils import locale_helper, caching
+
 from elisa.plugins.poblesec.widgets.player.status_display import VideoStatusDisplay,\
                                                         BARS
 from elisa.plugins.poblesec.widgets.player.control_ribbon import ControlRibbon
@@ -425,6 +426,14 @@
         """
         return self.animated.opacity > 0
 
+    def clear(self):
+        """
+        Clear the status widget.
+        """
+        self.status.clear()
+        self.cover_overlay.cover.clear()
+
+
 class Player(gobject.GObject, Loggable):
 
     STOPPED = 0
@@ -1062,6 +1071,8 @@
     PlayerClass = Player
     PlayerOsdClass = PlayerOsd
 
+    default_preview = 'elisa.plugins.poblesec.player.thumbnail.default_movie'
+
     def __init__(self):
         super(PlayerController, self).__init__()
 
@@ -1189,21 +1200,14 @@
         return True
 
     def _on_current_model_changed(self, player, model):
-        default_video_icon = 'elisa.plugins.poblesec.player.thumbnail.default_movie'
-        default_music_album_icon = 'elisa.plugins.poblesec.player.thumbnail.default_album'
-
         self.info("Played model changed to %r", model)
 
         # internal functions
         def dfr_error(failure, source):
             self.warning("failure in %s : %s" % (source, failure))
 
-        def got_artwork(file_path, default_resource=None):
+        def got_artwork(file_path):
             if not file_path:
-                # no artwork found
-                if default_resource:
-                    self.frontend.load_from_theme(default_resource,
-                                                  self.player_osd.status.preview)
                 return
 
             self.player_osd.status.preview.set_from_file(file_path)
@@ -1216,21 +1220,11 @@
 
         osd_details = self.player_osd.status.status_display_details
 
-        # clear the OSD
-        osd_details.title.label = ""
-        osd_details.details.label = ""
-        osd_details.details_2.label = ""
+        self.player_osd.clear()
         self.background.clear()
-        self.player_osd.cover_overlay.cover.clear()
 
-        # FIXME: by default we display the video icon, this is fine in
-        # the case of video playable_models but not for audio
-        # playable_models. There's no way to make the difference
-        # between and audio-only and video playable model, the correct
-        # solution would be to fix all the plugins that directly give
-        # PlayableModel instances to the player and instead, create
-        # VideoModels or TrackModels.
-        self.frontend.load_from_theme(default_video_icon,
+        # Load default preview
+        self.frontend.load_from_theme(self.default_preview,
                                       self.player_osd.status.preview)
 
         # we want to update the layout for dynamic changes
@@ -1242,7 +1236,7 @@
             def got_artist(artist, album):
                 osd_details.details_2.label = artist
                 dfr = self.album_helper.get_image(album, None)
-                dfr.addCallback(got_artwork, default_music_album_icon)
+                dfr.addCallback(got_artwork)
                 dfr.addErrback(dfr_error, "in got_artwork")
                 return dfr
 
@@ -1267,22 +1261,29 @@
         elif isinstance(model, VideoModel):
             osd_details.title.label = model.title or ''
             dfr = model.get_poster()
-            dfr.addCallback(got_artwork, default_video_icon)
+            dfr.addCallback(got_artwork)
         elif isinstance(model, Video):
             # a model from database
             osd_details.title.label = model.name
-            got_artwork(model.thumbnail_uri, default_video_icon)
+            got_artwork(model.thumbnail_uri)
         elif isinstance(model, Movie):
             # a movie model from database
             osd_details.title.label = model.title
             poster = getattr(model, 'thumbnail_path', None)
             if poster:
-                got_artwork(poster, default_video_icon)
+                got_artwork(poster)
         elif isinstance(model, TVEpisode):
             # a TV Episode model from database
             poster = getattr(model, 'thumbnail_path', None)
             if poster:
-                got_artwork(poster, default_video_icon)
+                got_artwork(poster)
+            else:
+                poster_uri = model.poster_uri
+                if poster_uri:
+                    cache_path = caching.get_pictures_cache_path()
+                    dfr = caching.get_and_cache_to_file(MediaUri(poster_uri),
+                                                        cache_path)
+                    dfr.addCallback(got_artwork)
 
             def got_tvshow(tvshow, season):
                 osd_details.details.label = tvshow.name
@@ -1395,6 +1396,7 @@
                                                 (player_position / gst.SECOND)
             self.show_on_screen_display()
         elif status == player.STOPPED:
+            self.player_osd.clear()
             self.background.clear()
             self.exit()
         return True

=== modified file 'elisa-plugins/elisa/plugins/poblesec/widgets/player/status_display.py'
--- elisa-plugins/elisa/plugins/poblesec/widgets/player/status_display.py	2009-07-27 12:16:25 +0000
+++ elisa-plugins/elisa/plugins/poblesec/widgets/player/status_display.py	2009-11-26 16:45:27 +0000
@@ -74,6 +74,14 @@
         self.left.width = 0.50
         self.right.width = 0.50
 
+    def clear(self):
+        """
+        Clear the position and duration labels.
+        """
+        self.left.label = ''
+        self.right.label = ''
+
+
 BARS = enum.Enum("SEEKING_BAR", "VOLUME_BAR", "BUFFERING_BAR")
 
 
@@ -259,7 +267,7 @@
 
     """
     right part of the status widget
-    with the scroll bar, title, details and player status
+    with the progress bar, title, details and player status
     """
 
     def create_widgets(self):
@@ -300,6 +308,17 @@
         self.pack_start(self.progress_bars)
         self.progress_bars.visible = True
 
+    def clear(self):
+        """
+        Clear the progress bar, the title and details labels.
+        """
+        self.title.label = ''
+        self.details.label = ''
+        self.details_2.label = ''
+        self.progress_bars.seeking_bar.current_index = 0
+        self.progress_bars.seeking_bar_label.clear()
+        self.progress_bars.buffering_bar.stop_animation()
+
 
 class StatusDisplay(HBox):
     """
@@ -492,8 +511,13 @@
         
         pbc.volume_bar_label.label = "%s %s%%" % (_('Volume'), int(volume_level))
 
+    def clear(self):
+        """
+        Clear the preview image and the status details.
+        """
+        self.preview.clear()
+        self.status_display_details.clear()
 
-                
     @classmethod
     def _demo_widget(cls, *args, **kwargs):
         widget = cls()