Merge lp:~dobey/rhythmbox-ubuntuone/fix-preview into lp:rhythmbox-ubuntuone

[dobey]

Fix the handling of preview playback in the store
Fix the handling of purchased music playback from the My Downloads page

To test this properly, rhythmbox from ppa:ubuntuone/nightlies is currently needed, as there is a fix for a crash when the preview playback ends, which is not yet fixed in the Ubuntu proper packaging.

[Roberto Alsina (ralsina)]

+1

review: Approve

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

[Natalia Bidart (nataliabidart)]

Seems like the GLib adding is not needed:

    23: [W0611] Unused import GLib

review: Needs Fixing

[lp:~dobey/rhythmbox-ubuntuone/fix-preview]

113. By dobey on 2012-03-06

Remove unused import from debugging

[Natalia Bidart (nataliabidart)]

Looks good.

review: Approve

=== modified file 'ubuntuone/MusicStoreWidget.py'
--- ubuntuone/MusicStoreWidget.py	2012-01-31 15:04:32 +0000
+++ ubuntuone/MusicStoreWidget.py	2012-03-06 17:18:19 +0000
@@ -83,6 +83,9 @@
         self.source.connect("download-finished", self.download_finished)
         self.source.connect("url-loaded", self.url_loaded)
 
+        self.source.props.query_model = RB.RhythmDBQueryModel.new_empty(
+            self.db)
+
         # Do these every time
         self.add_u1_library()
 
@@ -127,42 +130,37 @@
         """A file is finished downloading"""
         library_uri = self._udf_path_to_library_uri(path)
         # Import the URI
-        if not self.shell.props.db.entry_lookup_by_location(library_uri):
+        if not self.db.entry_lookup_by_location(library_uri):
             self.db.add_uri(library_uri)
 
     def play_library(self, source, path):
         """Switch to and start playing a song from the library"""
         uri = self._udf_path_to_library_uri(path)
-        entry = self.shell.props.db.entry_lookup_by_location(uri)
+        entry = self.db.entry_lookup_by_location(uri)
         if not entry:
             print "couldn't find entry", uri
             return
         libsrc = self.shell.props.library_source
         artist_view, album_view = libsrc.get_property_views()[0:2]
         song_view = libsrc.get_entry_view()
-        artist = self.shell.props.db.entry_get(entry,
-                                               RB.RhythmDBPropType.ARTIST)
-        album = self.shell.props.db.entry_get(entry,
-                                              RB.RhythmDBPropType.ALBUM)
+        artist = entry.get_string(RB.RhythmDBPropType.ARTIST)
+        album = entry.get_string(RB.RhythmDBPropType.ALBUM)
         self.shell.props.display_page_tree.select(libsrc)
         artist_view.set_selection([artist])
         album_view.set_selection([album])
         song_view.scroll_to_entry(entry)
-        player = self.shell.get_player()
+        player = self.shell.get_property('shell-player')
         player.stop()
         player.play_entry(entry, libsrc)
 
     def play_preview_mp3(self, source, url, title):
         """Play a passed mp3; signal handler for preview-mp3 signal."""
         # create an entry, don't save it, and play it
-        entry = self.shell.props.db.entry_lookup_by_location(url)
-        if entry is None:
-            entry = self.shell.props.db.entry_new(self.entry_type, url)
-        self.shell.props.db.set(entry, RB.RhythmDBPropType.TITLE, title)
-        player = self.shell.get_player()
+        entry = RB.RhythmDBEntry.new(self.db, self.entry_type, url)
+        self.db.entry_set(entry, RB.RhythmDBPropType.TITLE, title)
+        player = self.shell.get_property('shell-player')
         player.stop()
         player.play_entry(entry, self.source)
-        # delete this entry when it finishes playing. Don't know how yet.
 
     def add_u1_library(self):
         """Add the U1 library if not listed in RB and re-add if changed."""