Merge lp:~dobey/ubuntuone-installer/fix-aptdaemon into lp:ubuntuone-installer

[dobey]

Add handling of errors for cache update and install
Add a page for displaying error information, and to try again or cancel
Update the entire cache, not only the PPA cache that we aren't adding
Remove the code to add the stable PPA as it is unneeded/unused

[Roberto Alsina (ralsina)]

review: Approve

[Mike McCracken (mikemc)]

review: Approve

=== modified file 'ubuntuone/installer/gui.py'
--- ubuntuone/installer/gui.py	2012-03-13 20:24:31 +0000
+++ ubuntuone/installer/gui.py	2012-05-21 19:06:19 +0000
@@ -20,6 +20,7 @@
 import gettext
 import os
 
+from aptdaemon.enums import EXIT_SUCCESS
 from gi.repository import Gtk, GObject, GLib, Gdk, GdkPixbuf, Pango
 from ubuntuone.installer import (CLIENT_SHELL_PACKAGE,
                                  CONTROL_PANEL_COMMAND,
@@ -163,6 +164,15 @@
         self.__notebook.append_page(self.__progress_page, None)
         self.__progress_page.show()
 
+        # Label widget for error text
+        self.__err_label = Gtk.Label('')
+        self.__err_label.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
+        self.__err_label.set_line_wrap(True)
+
+        self.__error_page = self.__construct_error_page()
+        self.__notebook.append_page(self.__error_page, None)
+        self.__error_page.show()
+
         vbox.pack_start(self.__notebook, False, False, 0)
         self.__notebook.show()
 
@@ -181,13 +191,20 @@
 
         self.__main_button = Gtk.Button.new_with_mnemonic(_(u'I_nstall'))
         self.__main_button.set_image(Gtk.Image.new_from_stock(
-                Gtk.STOCK_OK, Gtk.IconSize.BUTTON))
+                Gtk.STOCK_EXECUTE, Gtk.IconSize.BUTTON))
         self.__main_button.connect('clicked', lambda x: self.emit(
                 'response', Gtk.ResponseType.OK))
         self.__action_area.add(self.__main_button)
         self.__main_button.grab_focus()
         self.__main_button.show()
 
+        # Button for error conditions
+        self.__close_button = Gtk.Button.new_from_stock(Gtk.STOCK_CLOSE)
+        self.__close_button.connect('clicked', lambda x: self.emit(
+                'response', Gtk.ResponseType.CANCEL))
+        self.__action_area.add(self.__close_button)
+
+        # Button for the external link
         self.__lm_button = Gtk.LinkButton.new_with_label(
             'https://one.ubuntu.com/', _(u'Learn more'))
         self.__action_area.add(self.__lm_button)
@@ -336,42 +353,45 @@
 
         return page
 
-    def __get_series(self):
-        """Get the series we're running on."""
-        on_ubuntu = False
-        series = None
-
-        def get_value(keypair):
-            return keypair.split('=')[1].strip()
-
-        try:
-            with open('/etc/lsb-release', 'r') as f:
-                for line in f.readlines():
-                    if line.startswith('DISTRIB_ID'):
-                        on_ubuntu = get_value(line) == u'Ubuntu'
-                    if line.startswith('DISTRIB_CODENAME'):
-                        series = get_value(line)
-            if not on_ubuntu or series is None:
-                raise UnsupportedDistribution(
-                    'This distribution is not supported by Ubuntu One.')
-        except (OSError, IOError, UnsupportedDistribution), error:
-            self.__got_error(error)
-
-        return series
+    def __construct_error_page(self):
+        """A page for showing errors to the user."""
+        page = Gtk.HBox()
+        page.set_border_width(24)
+        page.set_spacing(12)
+        page.show()
+
+        image = Gtk.Image.new_from_stock(Gtk.STOCK_DIALOG_ERROR,
+                                         Gtk.IconSize.DIALOG)
+        image.set_alignment(0.5, 0.0)
+        page.pack_start(image, False, False, 0)
+        image.show()
+
+        # Align and pack the error label
+        self.__err_label.set_alignment(0.0, 0.0)
+        page.pack_start(self.__err_label, True, True, 0)
+        self.__err_label.show()
+
+        return page
 
     def __got_error(self, error):
         """Got an error trying to set up Ubuntu One."""
-        print error
-        Gtk.main_quit()
+        self.__cancel_button.hide()
+        self.__main_button.show()
+        self.__close_button.show()
+        self.__err_label.set_text(error)
+        self.__notebook.set_current_page(2)
 
     @inline_callbacks
     def __install_u1(self, *args, **kwargs):
         """Install the packages."""
         self.__apt_progress.set_fraction(0.0)
 
-        def finished(*args, **kwargs):
-            GLib.spawn_command_line_async(CONTROL_PANEL_COMMAND)
-            Gtk.main_quit()
+        def finished(transaction, exit_status, *args, **kwargs):
+            if exit_status != EXIT_SUCCESS:
+                self.__got_error(transaction.error_details)
+            else:
+                GLib.spawn_command_line_async(CONTROL_PANEL_COMMAND)
+                Gtk.main_quit()
 
         transaction = yield self.client.install_packages(
             package_names=self.__get_package_list())
@@ -383,23 +403,15 @@
     def __update_cache(self, *args, **kwargs):
         """Update the cache."""
         self.__apt_progress.set_fraction(0.0)
-        transaction = yield self.client.update_cache(
-            sources_list='ubuntuone-stable-ppa.list')
-        transaction.connect('finished', self.__install_u1)
-        self.__apt_progress.set_transaction(transaction)
-        transaction.run()
-
-    @inline_callbacks
-    def __add_stable_ppa(self):
-        """Add the Ubuntu One 'stable' PPA to apt."""
-        transaction = yield self.client.add_repository(
-            src_type='deb',
-            uri='http://ppa.launchpad.net/ubuntuone/stable/ubuntu',
-            dist=self.__get_series(),
-            comps=['main'],
-            comment='added by Ubuntu One installer',
-            sourcesfile='ubuntuone-stable-ppa.list')
-        transaction.connect('finished', self.__update_cache)
+
+        def finished(transaction, exit_status, *args, **kwargs):
+            if exit_status != EXIT_SUCCESS:
+                self.__got_error(transaction.error_details)
+            else:
+                self.__install_u1()
+
+        transaction = yield self.client.update_cache()
+        transaction.connect('finished', finished)
         self.__apt_progress.set_transaction(transaction)
         transaction.run()
 
@@ -408,6 +420,7 @@
         # Hide the buttons
         self.__cancel_button.hide()
         self.__main_button.hide()
+        self.__close_button.hide()
 
         # Switch to the progress page
         self.__notebook.set_current_page(1)

=== modified file 'ubuntuone/installer/tests/test_gui.py'
--- ubuntuone/installer/tests/test_gui.py	2012-02-17 16:01:23 +0000
+++ ubuntuone/installer/tests/test_gui.py	2012-05-21 19:06:19 +0000
@@ -38,15 +38,31 @@
 
     def test_page_switched(self):
         """Test the page switching."""
-        #self.assertEquals(self.dlg.active_page, 0)
+        #self.assertEqual(self.dlg.active_page, 0)
         self.dlg.response(Gtk.ResponseType.OK)
-        self.assertEquals(self.dlg.active_page, 1)
+        self.assertEqual(self.dlg.active_page, 1)
 
     def test_initial_page(self):
         """Test the initial info page."""
-        self.assertEquals(self.dlg.active_page, 0)
+        self.assertEqual(self.dlg.active_page, 0)
 
     def test_progress_page(self):
         """Test the install progresss page."""
         self.dlg.response(Gtk.ResponseType.OK)
-        self.assertEquals(self.dlg.active_page, 1)
+        self.assertEqual(self.dlg.active_page, 1)
+
+    def test_error_page(self):
+        """Test the error page."""
+        error = u'Just an error.'
+        self.dlg._Window__got_error(error)
+        self.assertEqual(self.dlg.active_page, 2)
+        self.assertEqual(error, self.dlg._Window__err_label.get_text())
+
+    def test_update_cache(self):
+        """Test that updating cache succeeds."""
+    test_update_cache.skip = 'Need to test that cache update works.'
+
+    def test_update_cache_without_network(self):
+        """Test that updating cache fails cleanly without network."""
+    test_update_cache_without_network.skip = \
+        'Need to test that we do the right thing on cache update failure.'