Merge lp:~mterry/update-manager/stop-update into lp:update-manager

[Michael Terry]

mpt added some dialogs recently to the update-manager experience if the user stops an apt update. See https://wiki.ubuntu.com/SoftwareUpdates#Launching

This branch implements those changes (and does a little minor cleanup in UpdatesAvailable by dropping some support for num_updates == 0 which shouldn't ever happen now, after the redesign).

[Michael Vogt (mvo)]

On Mon, Aug 20, 2012 at 02:45:38AM -0000, Michael Terry wrote:
[..]
> @@ -162,7 +163,7 @@
>
> self._start_pane(UpdateProgress(self))
>
> - def start_available(self):
> + def start_available(self, cancelled_update = False):
> self._look_busy()
> self.refresh_cache()
[..]
> === modified file 'UpdateManager/UpdatesAvailable.py'
> --- UpdateManager/UpdatesAvailable.py 2012-06-28 00:09:03 +0000
> +++ UpdateManager/UpdatesAvailable.py 2012-08-20 02:44:22 +0000
> @@ -81,7 +81,7 @@
>
> class UpdatesAvailable(SimpleGtkbuilderApp):
>
> - def __init__(self, app):
> + def __init__(self, app, header = None, desc = None):
> self.window_main = app
> self.datadir = app.datadir
> self.options = app.options

pep8 suggests to use "cancelled_update=False" (no space around the
"=").

Otherwise this looks good, would be nice to have a test, but to get it
in before UIF I'm fine with merging it now.

Thanks,
 Michael

[Michael Vogt (mvo)]

review: Approve

[lp:~mterry/update-manager/stop-update]

2536. By Michael Terry on 2012-08-24

merge from trunk

2537. By Michael Terry on 2012-08-24

merge from trunk again

2538. By Michael Terry on 2012-08-24

fix pep8 and pyflakes issues

2539. By Michael Terry on 2012-08-24

adjust code to make the UpdateManager class slightly easier to unit test; add tests for stop-update code

=== modified file 'UpdateManager/Dialogs.py'
--- UpdateManager/Dialogs.py	2012-07-06 19:30:02 +0000
+++ UpdateManager/Dialogs.py	2012-08-24 23:06:30 +0000
@@ -106,6 +106,18 @@
         self.label_desc.set_visible(bool(label))
 
 
+class StoppedUpdatesDialog(Dialog):
+    def __init__(self, window_main):
+        Dialog.__init__(self, window_main)
+        self.set_header(_("You stopped the check for updates."))
+        self.add_settings_button()
+        self.add_button(_("_Check Again"), self.check)
+        self.focus_button = self.add_button(Gtk.STOCK_OK, self.close)
+
+    def check(self):
+        self.window_main.start_update()
+
+
 class NoUpdatesDialog(Dialog):
     def __init__(self, window_main):
         Dialog.__init__(self, window_main)

=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py	2012-08-24 20:20:11 +0000
+++ UpdateManager/UpdateManager.py	2012-08-24 23:06:30 +0000
@@ -46,6 +46,7 @@
                       ErrorDialog,
                       NeedRestartDialog,
                       NoUpdatesDialog,
+                      StoppedUpdatesDialog,
                       PartialUpgradeDialog,
                       UnsupportedDialog)
 from .InstallProgress import InstallProgress
@@ -162,18 +163,36 @@
 
         self._start_pane(UpdateProgress(self))
 
-    def start_available(self):
+    def start_available(self, cancelled_update=False):
         self._look_busy()
         self.refresh_cache()
 
-        if self.cache.install_count == 0:
+        pane = self._make_available_pane(self.cache.install_count,
+                                         os.path.exists(REBOOT_REQUIRED_FILE),
+                                         cancelled_update)
+        self._start_pane(pane)
+
+    def _make_available_pane(self, install_count, need_reboot,
+                             cancelled_update):
+        if install_count == 0:
             # Need Restart > New Release > No Updates
-            if os.path.exists(REBOOT_REQUIRED_FILE):
-                self._start_pane(NeedRestartDialog(self))
-            elif not self._check_meta_release():
-                self._start_pane(NoUpdatesDialog(self))
+            if need_reboot:
+                return NeedRestartDialog(self)
+            pane = self._check_meta_release()
+            if pane:
+                return pane
+            elif cancelled_update:
+                return StoppedUpdatesDialog(self)
+            else:
+                return NoUpdatesDialog(self)
         else:
-            self._start_pane(UpdatesAvailable(self))
+            header = None
+            desc = None
+            if cancelled_update:
+                header = _("You stopped the check for updates.")
+                desc = _("Updated software is available from "
+                         "a previous check.")
+            return UpdatesAvailable(self, header, desc)
 
     def start_install(self):
         self._start_pane(InstallProgress(self))
@@ -192,7 +211,7 @@
 
     def _check_meta_release(self):
         if self.meta_release is None:
-            return False
+            return None
 
         if self.meta_release.downloading:
             # Block until we get an answer
@@ -202,22 +221,20 @@
         # Check if there is anything to upgrade to or a known-broken upgrade
         next = self.meta_release.upgradable_to
         if not next or next.upgrade_broken:
-            return False
+            return None
 
         # Check for end-of-life
         if self.meta_release.no_longer_supported:
-            self._start_pane(UnsupportedDialog(self, self.meta_release))
-            return True
+            return UnsupportedDialog(self, self.meta_release)
 
         # Check for new fresh release
         settings = Gio.Settings("com.ubuntu.update-manager")
         if (self.meta_release.new_dist and
                 (self.options.check_dist_upgrades or
                  settings.get_boolean("check-dist-upgrades"))):
-            self._start_pane(DistUpgradeDialog(self, self.meta_release))
-            return True
+            return DistUpgradeDialog(self, self.meta_release)
 
-        return False
+        return None
 
     def _meta_release_wait_idle(self):
         # 'downloading' is changed in a thread, but the signal

=== modified file 'UpdateManager/UpdateProgress.py'
--- UpdateManager/UpdateProgress.py	2012-06-27 22:01:50 +0000
+++ UpdateManager/UpdateProgress.py	2012-08-24 23:06:30 +0000
@@ -35,7 +35,6 @@
                         DeprecationWarning)
 
 import os
-import sys
 
 from .backend import get_backend
 
@@ -72,11 +71,7 @@
             allow_sleep(self.sleep_dev, self.sleep_cookie)
             self.sleep_cookie = self.sleep_dev = None
 
-        # Either launch main dialog and continue or quit altogether
-        if success:
-            self.window_main.start_available()
-        else:
-            sys.exit(0)
+        self.window_main.start_available(not success)
 
     def main(self):
         self.invoke_manager()

=== modified file 'UpdateManager/UpdatesAvailable.py'
--- UpdateManager/UpdatesAvailable.py	2012-06-28 00:09:03 +0000
+++ UpdateManager/UpdatesAvailable.py	2012-08-24 23:06:30 +0000
@@ -81,7 +81,7 @@
 
 class UpdatesAvailable(SimpleGtkbuilderApp):
 
-    def __init__(self, app):
+    def __init__(self, app, header=None, desc=None):
         self.window_main = app
         self.datadir = app.datadir
         self.options = app.options
@@ -99,6 +99,9 @@
         # workaround for LP: #945536
         self.clearing_store = False
 
+        self.custom_header = header
+        self.custom_desc = desc
+
         self.button_close.grab_focus()
         self.dl_size = 0
         self.connected = True
@@ -360,9 +363,6 @@
                 Gtk.MenuItem.new_with_mnemonic(_("_Deselect All"))
             item_select_none.connect("activate", self.select_none_updgrades)
             menu.append(item_select_none)
-            num_updates = self.cache.install_count
-            if num_updates == 0:
-                item_select_none.set_property("sensitive", False)
             item_select_all = Gtk.MenuItem.new_with_mnemonic(_("Select _All"))
             item_select_all.connect("activate", self.select_all_updgrades)
             menu.append(item_select_all)
@@ -462,38 +462,38 @@
         """activate or disable widgets and show dialog texts correspoding to
            the number of available updates"""
         self.refresh_updates_count()
-        num_updates = self.cache.install_count
-
-        if num_updates == 0:
-            text_header = _("The software on this computer is up to date.")
-            self.label_downsize.set_text("\n")
-            if self.cache.keep_count() == 0:
-                self.notebook_details.set_sensitive(False)
-                self.treeview_update.set_sensitive(False)
-            self.button_install.set_sensitive(False)
-            self.unity.set_install_menuitem_visible(False)
-            self.button_close.grab_default()
-            self.textview_changes.get_buffer().set_text("")
-            self.textview_descr.get_buffer().set_text("")
-        else:
-            # show different text on first run (UX team suggestion)
-            firstrun = self.settings.get_boolean("first-run")
-            if firstrun:
-                flavor = self.window_main.meta_release.flavor_name
-                version = self.window_main.meta_release.current_dist_version
-                text_header = _("Updated software has been issued since %s %s "
-                                "was released. Do you want to install "
-                                "it now?") % (flavor, version)
-                self.settings.set_boolean("first-run", False)
-            else:
-                text_header = _("Updated software is available for this "
-                                "computer. Do you want to install it now?")
-            self.notebook_details.set_sensitive(True)
-            self.treeview_update.set_sensitive(True)
-            self.button_install.grab_default()
-            self.treeview_update.set_cursor(Gtk.TreePath.new_from_string("1"),
-                                            None, False)
-        self.label_header.set_markup(text_header)
+
+        text_header = None
+        text_desc = None
+
+        if self.custom_header is not None:
+            text_header = self.custom_header
+            text_desc = self.custom_desc
+        # show different text on first run (UX team suggestion)
+        elif self.settings.get_boolean("first-run"):
+            flavor = self.window_main.meta_release.flavor_name
+            version = self.window_main.meta_release.current_dist_version
+            text_header = _("Updated software has been issued since %s %s "
+                            "was released. Do you want to install "
+                            "it now?") % (flavor, version)
+            self.settings.set_boolean("first-run", False)
+        else:
+            text_header = _("Updated software is available for this "
+                            "computer. Do you want to install it now?")
+
+        self.notebook_details.set_sensitive(True)
+        self.treeview_update.set_sensitive(True)
+        self.button_install.grab_default()
+        self.treeview_update.set_cursor(Gtk.TreePath.new_from_string("1"),
+                                        None, False)
+        self.label_header.set_label(text_header)
+
+        if text_desc is not None:
+            self.label_desc.set_label(text_desc)
+            self.label_desc.show()
+        else:
+            self.label_desc.hide()
+
         return True
 
     # Before we shrink the window, capture the size

=== modified file 'UpdateManager/backend/InstallBackendAptdaemon.py'
--- UpdateManager/backend/InstallBackendAptdaemon.py	2012-06-28 00:10:23 +0000
+++ UpdateManager/backend/InstallBackendAptdaemon.py	2012-08-24 23:06:30 +0000
@@ -125,6 +125,8 @@
         progressbar_slot.add(progressbar)
 
         self.button_cancel = AptCancelButton(trans)
+        if action == self.UPDATE:
+            self.button_cancel.set_label(Gtk.STOCK_STOP)
         self.button_cancel.show()
         button_cancel_slot = builder.get_object("button_cancel_slot")
         button_cancel_slot.add(self.button_cancel)
@@ -225,6 +227,7 @@
             err_dia = AptErrorDialog(trans.error, self.window_main)
             err_dia.run()
             err_dia.hide()
+            sys.exit(0)
         elif status == EXIT_SUCCESS and close_on_done:
             sys.exit(0)
         # tell unity to hide the progress again

=== modified file 'data/gtkbuilder/UpdateManager.ui'
--- data/gtkbuilder/UpdateManager.ui	2012-06-18 21:14:43 +0000
+++ data/gtkbuilder/UpdateManager.ui	2012-08-24 23:06:30 +0000
@@ -40,16 +40,47 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="label_header">
+                  <object class="GtkGrid" id="grid1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="use_underline">True</property>
-                    <property name="wrap">True</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                      <attribute name="scale" value="1.25"/>
-                    </attributes>
+                    <property name="margin_bottom">6</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
+                    <child>
+                      <object class="GtkLabel" id="label_header">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="xalign">0</property>
+                        <property name="wrap">True</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                          <attribute name="scale" value="1.25"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label_desc">
+                        <property name="can_focus">False</property>
+                        <property name="no_show_all">True</property>
+                        <property name="hexpand">True</property>
+                        <property name="xalign">0</property>
+                        <property name="wrap">True</property>
+                        <property name="max_width_chars">20</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -462,8 +493,8 @@
                 <property name="receives_default">True</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
+                <accelerator key="Q" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
                 <accelerator key="W" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
-                <accelerator key="Q" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
               </object>
               <packing>
                 <property name="expand">False</property>

=== added file 'tests/test_stop_update.py'
--- tests/test_stop_update.py	1970-01-01 00:00:00 +0000
+++ tests/test_stop_update.py	2012-08-24 23:06:30 +0000
@@ -0,0 +1,50 @@
+#!/usr/bin/python3
+# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
+
+import logging
+import sys
+import unittest
+from mock import patch
+
+from UpdateManager.UpdateManager import UpdateManager
+from UpdateManager.UpdatesAvailable import UpdatesAvailable
+from UpdateManager import Dialogs
+
+import os
+CURDIR = os.path.dirname(os.path.abspath(__file__))
+
+
+class TestStopUpdate(unittest.TestCase):
+
+    def setUp(self):
+        patcher = patch('UpdateManager.UpdateManager.UpdateManager')
+        self.addCleanup(patcher.stop)
+        self.manager = patcher.start()
+        self.manager._check_meta_release.return_value = False
+        self.manager.datadir = os.path.join(CURDIR, '..', 'data')
+
+    def test_stop_no_updates(self):
+        # install_count, need_reboot, cancelled_update
+        p = UpdateManager._make_available_pane(self.manager, 0, False, True)
+        self.assertIsInstance(p, Dialogs.StoppedUpdatesDialog)
+
+    def test_no_stop_no_updates(self):
+        # install_count, need_reboot, cancelled_update
+        p = UpdateManager._make_available_pane(self.manager, 0, False, False)
+        self.assertNotIsInstance(p, Dialogs.StoppedUpdatesDialog)
+
+    def test_stop_updates(self):
+        # install_count, need_reboot, cancelled_update
+        p = UpdateManager._make_available_pane(self.manager, 1, False, True)
+        self.assertIsInstance(p, UpdatesAvailable)
+        self.assertIsNotNone(p.custom_header)
+
+    def test_no_stop_updates(self):
+        p = UpdateManager._make_available_pane(self.manager, 1, False, False)
+        self.assertIsInstance(p, UpdatesAvailable)
+        self.assertIsNone(p.custom_header)
+
+if __name__ == '__main__':
+    if len(sys.argv) > 1 and sys.argv[1] == "-v":
+        logging.basicConfig(level=logging.DEBUG)
+    unittest.main()