Merge lp:~dobey/rhythmbox-ubuntuone/libu1-mp3-install into lp:rhythmbox-ubuntuone

[dobey]

Update for new rhythmbox API changes
Remove MP3 codec installation bits as libu1 handles this now

[Roberto Alsina (ralsina)]

+1

review: Approve

[Eric Casteleijn (thisfred)]

Looks good to me.

review: Approve

=== removed directory 'gst'
=== removed file 'gst/__init__.py'
--- gst/__init__.py	2010-11-02 15:50:32 +0000
+++ gst/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-"""Fake gst.py module for testing."""
-
-STATE_NULL = 0
-STATE_PLAYING = 1
-
-
-def parse_launch(*args, **kwargs):
-    """Fake parse_launch."""
-    return
-
-
-def update_registry(*args, **kwargs):
-    """Fake update_registry."""
-    return

=== removed file 'gst/pbutils.py'
--- gst/pbutils.py	2010-11-02 15:50:32 +0000
+++ gst/pbutils.py	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-"""Fake pbutils module for testing."""
-
-
-def is_missing_plugin_message(*args, **kwargs):
-    """Fake is_missing_plugin_message."""
-    return

=== modified file 'rb.py'
--- rb.py	2010-11-02 15:50:32 +0000
+++ rb.py	2011-04-05 21:38:26 +0000
@@ -30,6 +30,9 @@
     """Fake method."""
     return
 
+def rb_display_page_group_get_by_id(*args, **kwargs):
+    """Fake method."""
+    return
 
 def rb_source_group_register(*args, **kwargs):
     """Fake method."""

=== modified file 'umusicstore/MusicStoreWidget.py'
--- umusicstore/MusicStoreWidget.py	2010-12-16 14:40:36 +0000
+++ umusicstore/MusicStoreWidget.py	2011-04-05 21:38:26 +0000
@@ -23,16 +23,11 @@
 import gtk
 import gio
 
-import aptdaemon.client
-import dbus
-import dbus.exceptions
 import gconf
 import gettext
-import gst
-import gst.pbutils
 import os
 # pylint: disable=F0401
-import rb
+import rb as RB
 import rhythmdb
 # pylint: enable=F0401
 import stat
@@ -40,13 +35,6 @@
 import urlparse
 import xdg.BaseDirectory
 
-from aptdaemon import policykit1
-try:
-    from aptdaemon.defer import inline_callbacks
-except ImportError:
-    from defer import inline_callbacks
-from aptdaemon.enums import EXIT_SUCCESS
-from aptdaemon.gtkwidgets import AptProgressBar
 from gettext import lgettext as _
 from ubuntuone.gtkwidgets import MusicStore as U1MusicStore
 
@@ -67,39 +55,39 @@
     def __init__(self):
         rhythmdb.EntryType.__init__(self, name='ubuntuone')
 
-    def can_sync_metadata(self, entry):
+    def do_can_sync_metadata(self, entry):
         """Not a real source, so we can't sync metadata."""
         return False
 
+    def do_sync_metadata(self, entry, changes):
+        """Do nothing."""
+        return
+
 
 class U1MusicStoreWidget(object):
     """The Ubuntu One Music Store."""
-    def __init__(self, plugin, find_file):
+    def __init__(self, plugin):
         self.plugin = plugin
-        self.find_file = find_file
+        self.entry_type = U1EntryType()
 
     def activate(self, shell):
         """Plugin startup."""
         self.db = shell.get_property("db")
-        group = rb.rb_source_group_get_by_name("stores")
-        if not group:
-            group = rb.rb_source_group_register("stores",
-                                                "Stores",
-                                                rb.SOURCE_GROUP_CATEGORY_FIXED)
+        group = RB.rb_display_page_group_get_by_id("stores")
 
         icon = gtk.IconTheme().load_icon(
             "ubuntuone", gtk.icon_size_lookup(gtk.ICON_SIZE_MENU)[0], 0)
 
-        self.entry_type = U1EntryType()
         self.db.register_entry_type(self.entry_type)
 
         self.source = gobject.new(U1Source,
                                   shell=shell,
                                   entry_type=self.entry_type,
-                                  source_group=group,
-                                  icon=icon,
+                                  pixbuf=icon,
                                   plugin=self.plugin)
         shell.register_entry_type_for_source(self.source, self.entry_type)
+        shell.append_display_page(self.source, group)
+
         self.shell = shell
         self.source.connect("preview-mp3", self.play_preview_mp3)
         self.source.connect("play-library", self.play_library)
@@ -107,7 +95,6 @@
         self.source.connect("url-loaded", self.url_loaded)
 
         # Do these every time
-        shell.append_source(self.source, None)  # Add the source to the list
         self.add_u1_library()
 
     def deactivate(self, shell):
@@ -176,17 +163,16 @@
             print "couldn't find entry", uri
             return
         libsrc = self.shell.props.library_source
-        artist_view, album_view = libsrc.get_property_views()[0:]
+        artist_view, album_view = libsrc.get_property_views()[0:2]
         song_view = libsrc.get_entry_view()
         artist = self.shell.props.db.entry_get(entry, rhythmdb.PROP_ARTIST)
         album = self.shell.props.db.entry_get(entry, rhythmdb.PROP_ALBUM)
-        self.shell.props.sourcelist.select(libsrc)
+        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.stop()
-        player.play()
         player.play_entry(entry, libsrc)
 
     def play_preview_mp3(self, source, url, title):
@@ -284,11 +270,11 @@
                             gconf.VALUE_STRING, libraries)
 
 
-class U1Source(rb.Source, gobject.GObject):
+class U1Source(RB.Source, gobject.GObject):
     """A Rhythmbox source widget for the U1 Music Store."""
     # gproperties required so that rb.Source is instantiable
     __gproperties__ = {
-      'plugin': (rb.Plugin, 'plugin', 'plugin',
+      'plugin': (RB.Plugin, 'plugin', 'plugin',
                  gobject.PARAM_WRITABLE | gobject.PARAM_CONSTRUCT_ONLY),
       }
     # we have the preview-mp3 signal; we receive it from the widget, and
@@ -306,18 +292,18 @@
     }
 
     def __init__(self):
-        rb.Source.__init__(self, name=_("Ubuntu One"))
+        RB.Source.__init__(self, name=_("Ubuntu One"))
         gobject.GObject.__init__(self)
         self.browser = MUSIC_STORE_WIDGET
         self.__activated = False
+        self.add_music_store_widget()
 
     def do_impl_activate(self):
         """Source startup."""
         if self.__activated:
             return
         self.__activated = True
-        self.test_can_play_mp3()
-        rb.Source.do_impl_activate(self)
+        RB.Source.do_impl_activate(self)
 
     def do_impl_want_uri(self, uri):
         """I want to handle u1ms URLs"""
@@ -332,179 +318,15 @@
         uri_to_use = uri.replace("u1ms://", "http://")
         print "Calling u1musicstore plugin with %s" % uri_to_use
         shell = self.get_property("shell")
-        shell.props.sourcelist.select(self)
+        shell.props.display_page_tree.select(self)
         self.browser.load_store_link(uri_to_use)
         return True
 
-    def test_can_play_mp3(self):
-        """Can the user play mp3s? Start a GStreamer pipeline to check."""
-        mp3pth = os.path.realpath(os.path.join(
-            os.path.split(__file__)[0], "empty.mp3"))
-        uri = "file://%s" % urllib.quote("%s" % mp3pth)
-        self.install_pipeline = gst.parse_launch(
-          'uridecodebin uri=%s ! fakesink' % uri)
-        bus = self.install_pipeline.get_bus()
-        bus.add_signal_watch()
-        bus.connect("message::element", self._got_element_msg)
-        bus.connect("message::eos", self._got_end_of_stream)
-        self.install_pipeline.set_state(gst.STATE_PLAYING)
-
-    def _got_element_msg(self, bus, msg):
-        """Handler for element messages from the check-mp3 pipeline.
-           GStreamer throws a "plugin-missing" element message if the
-           user does not have the right codecs to play a file."""
-        plugin_missing = gst.pbutils.is_missing_plugin_message(msg)
-        if plugin_missing:
-            self.install_pipeline.set_state(gst.STATE_NULL)
-            self.install_mp3_playback()
-
-    def _got_end_of_stream(self, bus, msg):
-        """Handler for end of stream from the check-mp3 pipeline.
-           If we reach the end of the stream, mp3 playback is enabled."""
-        self.install_pipeline.set_state(gst.STATE_NULL)
-        if os.environ.get("U1INSTALLMP3ANYWAY", None) is not None:
-            # override the decision not to install the package
-            self.install_mp3_playback()
-        else:
-            self.add_music_store_widget()
-
-    def install_mp3_playback(self):
-        """Use aptdaemon to install the Fluendo mp3 playback codec package."""
-        self.install_box = gtk.Alignment(xscale=0.0, yscale=0.0, xalign=0.5,
-            yalign=0.5)
-        self.install_vbox = gtk.VBox()
-        self.install_label_head = gtk.Label()
-        self.install_label_head.set_use_markup(True)
-        not_installed = _("MP3 plugins are not installed")
-        self.install_label_head.set_markup('<span weight="bold" size="larger">'
-            '%s</span>' % not_installed)
-        self.install_label_head.set_alignment(0.0, 0.5)
-        self.install_label_body = gtk.Label()
-        self.install_label_body.set_text(_('To listen to your purchased songs'
-            ', you need to install MP3 plugins. Click below to install them.'))
-        self.install_label_body.set_alignment(0.0, 0.5)
-        self.install_label_eula = gtk.Label()
-        # EULA text copied from
-        # gstreamer0.10-fluendo-plugins-mp3-partner.templates
-        # The partner package shows the EULA itself on installations, but
-        #  aptdaemon installations work like DEBIAN_FRONTEND=noninteractive
-        # so we show the EULA here. (This also avoids a popup window.)
-        # EULA text is not translatable; do not wrap it with gettext!
-        self.install_label_eula.set_markup(
-            "<small>MPEG Layer-3 audio decoding technology notice\n"
-            "MPEG Layer-3 audio decoding technology licensed "
-            "from Fraunhofer IIS and Thomson\n"
-            "This product cannot be installed in product other than Personal "
-            "Computers sold for general purpose usage, and not for set-top "
-            "boxes, embedded PC, PC which are sold and customized for "
-            "mainly audio or multimedia playback and/or registration, "
-            "unless the seller has received a license by Fraunhofer IIS"
-            "and Thomson and pay the relevant royalties to them.</small>")
-        self.install_label_eula.set_alignment(0.0, 0.5)
-        self.install_label_eula.set_size_request(400, 200)
-        self.install_label_eula.set_line_wrap(True)
-        self.install_hbtn = gtk.HButtonBox()
-        self.install_hbtn.set_layout(gtk.BUTTONBOX_END)
-        self.install_button = gtk.Button(label=_("Install MP3 plugins"))
-        self.install_button.connect("clicked", self._start_mp3_install)
-        self.install_hbtn.add(self.install_button)
-        self.install_vbox.pack_start(self.install_label_head, expand=False)
-        self.install_vbox.pack_start(self.install_label_body, expand=False,
-            padding=12)
-        self.install_vbox.pack_start(self.install_hbtn, expand=False)
-        self.install_vbox.pack_start(self.install_label_eula, expand=False,
-            padding=12)
-        self.install_box.add(self.install_vbox)
-        self.install_box.show_all()
-        self.add(self.install_box)
-
-    @inline_callbacks
-    def _authenticate_for_add_and_install(self):
-        """Authenticate with aptdaemon"""
-        bus = dbus.SystemBus()
-        name = bus.get_unique_name()
-        action = policykit1.PK_ACTION_INSTALL_PACKAGES_FROM_NEW_REPO
-        flags = policykit1.CHECK_AUTH_ALLOW_USER_INTERACTION
-        yield policykit1.check_authorization_by_name(name, action, flags=flags)
-
-    @inline_callbacks
-    def _start_mp3_install(self, btn):
-        """Add the 'partner' repository and update the package list from it."""
-        self.ac = aptdaemon.client.AptClient()
-        try:
-            yield self._authenticate_for_add_and_install()
-            trans = yield self.ac.add_repository(
-                src_type="deb",
-                uri="http://archive.canonical.com/",
-                dist="maverick",
-                comps=["partner"],
-                comment="added by U1MusicStoreWidget",
-                sourcesfile=PARTNER_LIST)
-            yield trans.run(defer=True)
-            trans = yield self.ac.update_cache(sources_list=SOURCES_DIR
-                                               + PARTNER_LIST)
-            self.update_progress = AptProgressBar(trans)
-            self.update_progress.show()
-            self.install_label_head.set_text("")
-            self.install_label_body.set_text(_("Finding MP3 plugins"))
-            self.install_label_eula.hide()
-            self.install_hbtn.hide()
-            self.install_vbox.pack_start(self.update_progress, expand=False)
-            trans.connect("finished", self._package_update_finished)
-            yield trans.run(defer=True)
-        except Exception, e:  # pylint: disable=W0703
-            self._on_error(e)
-
-    @inline_callbacks
-    def _package_update_finished(self, transaction, exit_code):
-        """Packagelist update complete; kick off the install"""
-        self.update_progress.hide()
-        if exit_code != EXIT_SUCCESS:
-            self._on_error(transaction)
-            return
-        try:
-            trans = yield self.ac.install_packages([PLUGIN_PACKAGENAME])
-            self.install_progress = AptProgressBar(transaction)
-            self.install_progress.show()
-            self.install_label_head.set_text("")
-            self.install_label_body.set_text(_("Installing MP3 plugins"))
-            self.install_label_eula.hide()
-            self.install_hbtn.hide()
-            self.install_vbox.pack_start(self.install_progress, expand=False)
-            trans.connect("finished", self._package_install_finished)
-            yield trans.run(defer=True)
-        except Exception, e:  # pylint: disable=W0703
-            self._on_error(e)
-
-    def _package_install_finished(self, trans, exit_code):
-        """Aptdaemon package installation finished; show music store."""
-        if exit_code == EXIT_SUCCESS:
-            self.remove(self.install_box)
-            gst.update_registry()
-            self.add_music_store_widget()
-        else:
-            self._on_error(
-                "Could not find the %r package" % PLUGIN_PACKAGENAME)
-
-    def _on_error(self, error):
-        """Error handler for aptdaemon."""
-        print error
-        problem_installing = _("There was a problem installing, sorry")
-        self.install_label_head.set_markup('<span weight="bold" size="larger">'
-            '%s</span>' % problem_installing)
-        self.install_label_body.set_text(_('Check your internet connection '
-                                           'and try again.'))
-        for widget_name in ("install_progress", "update_progress"):
-            widget = getattr(self, widget_name, None)
-            if widget is not None:
-                widget.hide()
-        self.install_hbtn.show()
-
     def add_music_store_widget(self):
         """Display the music store widget in Rhythmbox."""
         self.add(self.browser)
-        self.show_all()
-        self.browser.set_no_show_all(True)
+        self.browser.show()
+        self.show()
         self.browser.set_property("visible", True)
         self.browser.connect("preview-mp3",
                              self.re_emit_preview)
@@ -542,3 +364,4 @@
             self.__plugin = value
         else:
             raise AttributeError('unknown property %s' % prop.name)
+

=== modified file 'umusicstore/__init__.py'
--- umusicstore/__init__.py	2010-11-02 15:50:32 +0000
+++ umusicstore/__init__.py	2011-04-05 21:38:26 +0000
@@ -17,7 +17,7 @@
 # Authored by Stuart Langridge <[e-mail]>
 
 import gconf
-import rb
+import rb as RB
 
 from .MusicStoreWidget import U1MusicStoreWidget
 from .U1MSLinks import U1MSLinkProvider
@@ -26,15 +26,14 @@
     "/apps/rhythmbox/plugins/umusicstore/first_time_flag"
 
 
-class U1MusicStorePlugin (rb.Plugin):
+class U1MusicStorePlugin (RB.Plugin):
     """The Ubuntu One Music Store."""
 
     def __init__(self):
-        rb.Plugin.__init__(self)
+        RB.Plugin.__init__(self)
 
         # The Music Store itself
-        self.music_store_widget = U1MusicStoreWidget(
-            plugin=self, find_file=self.find_file)
+        self.music_store_widget = U1MusicStoreWidget(plugin=self)
 
         # The Links button
         self.music_store_links_provider = U1MSLinkProvider(
@@ -48,10 +47,12 @@
         # Select the source if it's the first time
         conf_client = gconf.client_get_default()
         if not conf_client.get_bool(U1_FIRST_TIME_FLAG_ENTRY):
-            shell.props.sourcelist.select(self.music_store_widget.source)
+            shell.props.display_page_tree.select(
+                self.music_store_widget.source)
             conf_client.set_bool(U1_FIRST_TIME_FLAG_ENTRY, True)
 
     def deactivate(self, shell):
         """Plugin shutdown."""
         self.music_store_widget.deactivate(shell)
         self.music_store_links_provider.deactivate(shell)
+

=== removed file 'umusicstore/empty.mp3'
Binary files umusicstore/empty.mp3	2010-02-02 19:30:32 +0000 and umusicstore/empty.mp3	1970-01-01 00:00:00 +0000 differ