Merge lp:~dobey/rhythmbox-ubuntuone/update-from-trunk into lp:rhythmbox-ubuntuone/stable-3-0

[dobey]

Fix the handling of preview playback in the store
Fix the handling of purchased music playback from the My Downloads page
Add a .desktop file for registering rhythmbox as the u1ms:// url handler when rhythmbox-ubuntuone is installed
Fix the url handling API inside the plug-in to align with new Rhythmbox API

[Manuel de la Peña (mandel)]

Looks god!

review: Approve

[lp:~dobey/rhythmbox-ubuntuone/update-from-trunk]

112. By dobey on 2012-03-07

Fix the handling of preview playback in the store
Fix the handling of purchased music playback from the My Downloads page
Add a .desktop file for registering rhythmbox as the u1ms:// url handler when rhythmbox-ubuntuone is installed
Fix the url handling API inside the plug-in to align with new Rhythmbox API

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2012-02-02 19:27:36 +0000
+++ MANIFEST.in	2012-03-07 16:22:17 +0000
@@ -1,4 +1,5 @@
 include COPYING COPYING.LIB MANIFEST.in README
 include run-tests
+include rhythmbox-ubuntuone.desktop.in
 recursive-include po *.po POTFILES.in
 recursive-include ubuntuone *.py *.in

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-01-14 01:59:34 +0000
+++ po/POTFILES.in	2012-03-07 16:22:17 +0000
@@ -1,3 +1,4 @@
+rhythmbox-ubuntuone.desktop.in
 ubuntuone/ubuntuone.py
 ubuntuone/MusicStoreWidget.py
 [type: gettext/ini]ubuntuone/ubuntuone.plugin.in

=== added file 'rhythmbox-ubuntuone.desktop.in'
--- rhythmbox-ubuntuone.desktop.in	1970-01-01 00:00:00 +0000
+++ rhythmbox-ubuntuone.desktop.in	2012-03-07 16:22:17 +0000
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Ubuntu One Music Store
+_Comment=Purchase music on Ubuntu One in Rhythmbox
+Exec=rhythmbox %U
+Terminal=false
+Type=Application
+Icon=rhythmbox
+Categories=GNOME;GTK;AudioVideo;
+MimeType=x-scheme-handler/u1ms
+StartupNotify=true
+X-Ubuntu-Gettext-Domain=rhythmbox-ubuntuone
+NoDisplay=true

=== modified file 'setup.cfg'
--- setup.cfg	2012-01-14 01:59:34 +0000
+++ setup.cfg	2012-03-07 16:22:17 +0000
@@ -1,2 +1,2 @@
 [build_i18n]
-desktop_files=[("lib/rhythmbox/plugins/ubuntuone", ("ubuntuone/ubuntuone.plugin.in",))]
+desktop_files=[("lib/rhythmbox/plugins/ubuntuone", ("ubuntuone/ubuntuone.plugin.in",)), ("share/applications", ("rhythmbox-ubuntuone.desktop.in",))]

=== modified file 'ubuntuone/MusicStoreWidget.py'
--- ubuntuone/MusicStoreWidget.py	2012-01-31 15:04:32 +0000
+++ ubuntuone/MusicStoreWidget.py	2012-03-07 16:22:17 +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()
 
@@ -99,7 +102,6 @@
 
     def url_loaded(self, source, url):
         """A URL is loaded in the plugin"""
-        print "URL loaded:", url
         if urlparse.urlparse(url)[2] == "https":
             pass
         else:
@@ -127,42 +129,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."""
@@ -233,17 +230,20 @@
             return 100
         return 0
 
-    def do_impl_add_uri(self, uri, title, genre):
+    def do_impl_add_uri(self, uri, title, genre, callback=None,
+                        callback_data=None, destroy_data=None):
         """Handle a u1ms URL"""
         if not uri.startswith("u1ms://"):
-            return False
+            return
         uri_to_use = uri.replace("u1ms://", "http://")
-        print "Calling u1musicstore plugin with %s" % uri_to_use
         # pylint: disable=E1101
         shell = self.get_property("shell")
         shell.props.display_page_tree.select(self)
         self.browser.load_store_link(uri_to_use)
-        return True
+        if callback is not None:
+            callback(callback_data)
+            if destroy_data is not None:
+                destroy_data(callback_data)
 
     def add_music_store_widget(self):
         """Display the music store widget in Rhythmbox."""

=== modified file 'ubuntuone/ubuntuone.plugin.in'
--- ubuntuone/ubuntuone.plugin.in	2012-01-14 01:59:34 +0000
+++ ubuntuone/ubuntuone.plugin.in	2012-03-07 16:22:17 +0000
@@ -9,3 +9,5 @@
 Copyright=Copyright © 2009-2012 Canonical
 Website=http://one.ubuntu.com/
 
+[RB]
+InitiallyEnabled=true