Merge lp:~dobey/rhythmbox-ubuntuone/oh-a-store into lp:rhythmbox-ubuntuone

[dobey]

Use the new UbuntuOneUI library for a gtk+ 3.0 based plug-in

This is a fully working Ubuntu One plug-in for Rhythmbox 3.0. It requires lp:~dobey/libubuntuone/split-ui-lib to work. To test you can do the following, inside a branch of lp:~dobey/rhythmbox-ubuntuone/oh-a-store:

bzr branch lp:~dobey/libubuntuone/split-ui-lib
(cd split-ui-lib && ./autogen.sh && make U1_JAVASCRIPT_DIR=`pwd`/data)
./setup.py build
mkdir -p ~/.local/share/rhythmbox/plugins
cp -a ubuntuone ~/.local/share/rhythmbox/plugins
cp build/lib/rhythmbox/plugins/ubuntuone/ubuntuone.plugin ~/.local/share/rhythmbox/plugins/ubuntuone/
LD_PRELOAD=`pwd`/split-ui-lib/libubuntuoneui/.libs/libubuntuoneui-3.0.so.1.0.0 GI_TYPELIB_PATH=`pwd`/split-ui-lib/libubuntuoneui rhythmbox

Then enable the plug-in in Edit->Plugins in rhythmbox, and Ubuntu One should appear in the tree on the left. Once you click on it, you should see the music store come up.

Note: For some reason, the MP3 warning comes up regardless of whether MP3s are playable. I am not sure why this is, but will debug it later, and simply consider it a bug that needs to be fixed before 12.04 freeze. I will open a bug on it.

[lp:~dobey/rhythmbox-ubuntuone/oh-a-store]

108. By dobey on 2012-01-31

Add a FIXME? re: source.delete_thyself() which no longer exists

[Manuel de la Peña (mandel)]

Got it working.

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'setup.py'
--- setup.py	2012-01-19 15:22:32 +0000
+++ setup.py	2012-01-31 15:07:52 +0000
@@ -18,4 +18,3 @@
                   'ubuntuone/MusicStoreWidget.py',
                   ])],
     )
-
 
=== modified file 'ubuntuone/MusicStoreWidget.py'
--- ubuntuone/MusicStoreWidget.py	2012-01-12 21:34:43 +0000
+++ ubuntuone/MusicStoreWidget.py	2012-01-31 15:07:52 +0000
@@ -19,23 +19,19 @@
 import stat
 import urlparse
 
-# pylint: disable=E0611
+# pylint: disable=E0611,F0401
 from gi.repository import Gio, GObject, Gtk, RB
-# pylint: enable=E0611
+from gi.repository.UbuntuOneUI import MusicStore as U1MusicStore
+# pylint: enable=E0611,F0401
 
 from dirspec import basedir
 from gettext import lgettext as _
-#from ubuntuone.gtkwidgets import MusicStore as U1MusicStore
-
-gettext.bindtextdomain("rhythmbox-ubuntuone-music-store", "/usr/share/locale")
-gettext.textdomain("rhythmbox-ubuntuone-music-store")
-
-MUSIC_STORE_WIDGET = Gtk.EventBox()  # keep this around for later
+
+gettext.bindtextdomain("rhythmbox-ubuntuone", "/usr/share/locale")
+gettext.textdomain("rhythmbox-ubuntuone")
+
+MUSIC_STORE_WIDGET = U1MusicStore()
 U1LIBRARYPATH = MUSIC_STORE_WIDGET.get_library_location()
-RB_LIBRARY_LOCATIONS = "/apps/rhythmbox/library_locations"
-PARTNER_LIST = "canonical-partner-maverick.list"
-SOURCES_DIR = "/etc/apt/sources.list.d/"
-PLUGIN_PACKAGENAME = "gstreamer0.10-fluendo-plugins-mp3-partner"
 
 
 class U1EntryType(RB.RhythmDBEntryType):
@@ -66,10 +62,10 @@
     def activate(self, shell):
         """Plugin startup."""
         self.db = shell.get_property("db")
-        group = RB.rb_display_page_group_get_by_id("stores")
+        group = RB.DisplayPageGroup.get_by_id("stores")
 
         icon = Gtk.IconTheme.get_default().load_icon(
-            "ubuntuone", Gtk.IconSize.lookup(Gtk.IconSize.MENU)[0], 0)
+            "ubuntuone", 24, 0)
 
         self.db.register_entry_type(self.entry_type)
 
@@ -93,7 +89,9 @@
     def deactivate(self, shell):
         """Plugin shutdown."""
         # remove source
-        self.source.delete_thyself()
+        # FIXME?: This API changed, but doesn't seem entirely necessary.
+        #         It's not entirely clear which API to use for this now.
+        #self.source.delete_thyself()
         # delete held references
         del self.db
         del self.source
@@ -122,7 +120,7 @@
         library_path = os.path.join(self.u1_library_symlink, subpath)
         # convert path to URI. Don't use urllib for this; Python and
         # glib escape URLs differently. gio does it the glib way.
-        library_uri = Gio.File(library_path).get_uri()
+        library_uri = Gio.File.new_for_path(library_path).get_uri()
         return library_uri
 
     def download_finished(self, source, path):
@@ -198,7 +196,7 @@
     """A Rhythmbox source widget for the U1 Music Store."""
     # gproperties required so that rb.Source is instantiable
     __gproperties__ = {
-      'plugin': (RB.Plugin, 'plugin', 'plugin',
+      'plugin': (GObject.GObject, 'plugin', 'plugin',
                  GObject.PARAM_WRITABLE | GObject.PARAM_CONSTRUCT_ONLY),
       }
     # we have the preview-mp3 signal; we receive it from the widget, and
@@ -286,7 +284,7 @@
     def re_emit_urlloaded(self, widget, url):
         """Handle the url-loaded signal and re-emit it."""
         # pylint: disable=E1101
-        self.signal_emit_by_name("url-loaded", url)
+        self.emit("url-loaded", url)
 
     def do_set_property(self, prop, value):
         """Allow property settings to handle the plug-in call."""
 
=== modified file 'ubuntuone/ubuntuone.py'
--- ubuntuone/ubuntuone.py	2012-01-14 01:59:34 +0000
+++ ubuntuone/ubuntuone.py	2012-01-31 15:07:52 +0000
@@ -20,9 +20,9 @@
 from gi.repository import Gio, GLib, GObject, Peas
 # pylint: enable=E0611
 
-# We aren't actually providing a music store widget at the moment,
-# as libu1 needs to be ported to gtk3 first. We may add it back later.
-#from MusicStoreWidget import U1MusicStoreWidget
+# pylint: disable=W0403
+from MusicStoreWidget import U1MusicStoreWidget
+# pylint: enable=W0403
 
 
 class UbuntuOnePlugin (GObject.GObject, Peas.Activatable):
@@ -43,7 +43,7 @@
         self.rdbconf.connect('changed::locations', self._locations_changed)
 
         # The Music Store itself
-        #self.music_store_widget = U1MusicStoreWidget(plugin=self)
+        self.music_store_widget = U1MusicStoreWidget(plugin=self)
 
     def _locations_changed(self, *args, **kwargs):
         """Handle the locations setting being changed."""
@@ -56,8 +56,8 @@
         """Plug-in startup."""
         # Add the Ubuntu One purchased music directory if not already added
         self._locations_changed()
-        #self.music_store_widget.activate(shell)
+        self.music_store_widget.activate(self.object)
 
     def do_deactivate(self):
         """Plug-in shutdown."""
-        #self.music_store_widget.deactivate(shell)
+        self.music_store_widget.deactivate(self.object)