Merge lp:~chipaca/rhythmbox-ubuntuone/fix-634545 into lp:rhythmbox-ubuntuone

[John Lenton]

Fix the mp3 plugin install code wrt aptdaemon changes (fixes LP:634545)

This makes the rb plugin able to download the mp3 plugin once again (fixes LP:634545)

[Manuel de la Peña (mandel)]

Code goos look, I have tried in my system with no partners repo, no gstreamer-plugins-ugly etc.. and works as expected.

Some tests for this at some point would be nice ;)

review: Approve

[Rodrigo Moya (rodrigo-moya)]

Works good for me also, after upgrading some apt-related packages

review: Approve

=== modified file 'umusicstore/MusicStoreWidget.py'
--- umusicstore/MusicStoreWidget.py	2010-09-09 14:46:24 +0000
+++ umusicstore/MusicStoreWidget.py	2010-09-15 22:00:02 +0000
@@ -20,12 +20,16 @@
 import gtk, gobject, os, urllib, gconf, stat, urlparse, gio
 import gst, gst.pbutils
 import aptdaemon.client
+from aptdaemon import policykit1
+from aptdaemon.defer import inline_callbacks
 from aptdaemon.enums import *
 from aptdaemon.gtkwidgets import AptErrorDialog, \
                                  AptProgressBar
+from commands import getstatusoutput
 import rb, rhythmdb
 from ubuntuone.gtkwidgets import MusicStore as U1MusicStore
 import xdg.BaseDirectory
+import dbus
 import dbus.exceptions
 
 import gettext
@@ -36,6 +40,9 @@
 MUSIC_STORE_WIDGET = U1MusicStore() # keep this around for later
 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(rhythmdb.EntryType):
     def __init__(self):
@@ -340,7 +347,8 @@
             ', 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 /var/lib/dpkg/info/gstreamer0.10-fluendo-plugins-mp3-partner.templates
+        # EULA text copied from
+        # /var/lib/dpkg/info/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.)
@@ -373,56 +381,74 @@
         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:
-            self.ac.add_repository("deb","http://archive.canonical.com/", "lucid", ["partner"])
-        except dbus.exceptions.DBusException, e:
-            if e.get_dbus_name() == "org.freedesktop.PolicyKit.Error.NotAuthorized":
-                # user cancelled, so exit from here so they can press the button again
-                return
-        self.ac.update_cache(reply_handler=self._finish_updating_packages,
-                        error_handler=self._on_error)
-    
-    def _finish_updating_packages(self, transaction):
-        """Now that partner is added, install our mp3 codec package."""
-        self.update_progress = AptProgressBar(transaction)
-        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)
-        transaction.run(reply_handler=lambda: True, 
-                        error_handler=self._on_error)
-        self.ac.install_packages(["gstreamer0.10-fluendo-plugins-mp3-partner"],
-                        reply_handler=self._run_transaction,
-                        error_handler=self._on_error)
+            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, defer=True)
+            yield trans.run(defer=True)
+            trans = yield self.ac.update_cache(sources_list=SOURCES_DIR
+                                               + PARTNER_LIST,
+                                               defer=True)
+            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:
+            self._on_error(e)
 
-    def _run_transaction(self, transaction):
-        """Show progress of aptdaemon package installation."""
+    @inline_callbacks
+    def _package_update_finished(self, transaction, exit_code):
+        """Packagelist update complete; kick off the install"""
         self.update_progress.hide()
-        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)
-        transaction.run(reply_handler=lambda: True, 
-                        error_handler=self._on_error)
-        transaction.connect("finished", self._finished)
+        if exit_code != EXIT_SUCCESS:
+            self._on_error(transaction)
+            return
+        try:
+            trans = yield self.ac.install_packages([PLUGIN_PACKAGENAME],
+                                                   defer=True)
+            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:
+            self._on_error(e)
 
-    def _finished(self, trans, exit_code):
+    def _package_install_finished(self, trans, exit_code):
         """Aptdaemon package installation finished; show music store."""
-        if exit_code == 0 or exit_code == 2: # 0: success, 2: already installed
+        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 "
-                "gstreamer0.10-fluendo-plugins-mp3-partner package.")
+            self._on_error("Could not find the %r package" % PLUGIN_PACKAGENAME)
 
     def _on_error(self, error):
         """Error handler for aptdaemon."""
@@ -432,8 +458,10 @@
             '%s</span>' % problem_installing)
         self.install_label_body.set_text(_('Check your internet connection and '
             'try again.'))
-        if getattr(self, "install_progress"):
-            self.install_progress.hide()
+        for widget in ("install_progress", "update_progress"):
+            widget = getattr(self, widget, None)
+            if widget is not None:
+                widget.hide()
         self.install_hbtn.show()
 
     def add_music_store_widget(self):