Merge lp:~marcustomlinson/update-manager/update-manager into lp:update-manager

[Marcus Tomlinson]

Display progress on snap updates and error out on failure

[lp:~marcustomlinson/update-manager/update-manager]

2879. By Łukasz Zemczak on 2020-04-16

Adjust dates in hwe-support-status for focal.

[Łukasz Zemczak (sil2100)]

Ok, this looks good. I have one nitpick but we can leave it as-is. Not big of a deal.

review: Approve

[lp:~marcustomlinson/update-manager/update-manager]

2880. By Łukasz Zemczak on 2020-04-16

Display progress on snap updates and error out on failure

=== modified file 'UpdateManager/backend/__init__.py'
--- UpdateManager/backend/__init__.py	2020-04-15 12:37:26 +0000
+++ UpdateManager/backend/__init__.py	2020-04-16 10:38:34 +0000
@@ -204,6 +204,28 @@
 
         return snap_list
 
+    def update_snap_cb(self, client, change, _, user_data):
+        index, count, progress_bar = user_data
+        if not progress_bar:
+            return
+
+        # determine how much of this change has been done
+        task_total = 0
+        task_done = 0
+        for task in change.get_tasks():
+            task_total += task.get_progress_total()
+            task_done += task.get_progress_done()
+
+        task_fraction = task_done / task_total
+
+        # determine how much total progress has been made
+        total_fraction = (task_fraction / count) + (index / count)
+
+        # change.get_tasks() can increase between callbacks so we must
+        # avoid jumping backward in progress here
+        if total_fraction > progress_bar.get_fraction():
+            progress_bar.set_fraction(total_fraction)
+
     def update_snaps(self):
         # update status and progress bar
         def update_status(status):
@@ -215,37 +237,57 @@
 
         update_status(_("Updating snaps"))
 
+        progress_bar = None
         progress_timer = None
+
         progress_bars = self.progressbar_slot.get_children()
         if progress_bars and isinstance(progress_bars[0], Gtk.ProgressBar):
+            progress_bar = progress_bars[0]
             progress_timer = GLib.timeout_add(100, update_progress,
-                                              progress_bars[0])
+                                              progress_bar)
 
         # populate snap_list with deb2snap transitions
         snap_list = self.get_snap_transitions()
 
+        if progress_timer:
+            GLib.source_remove(progress_timer)
+            progress_bar.set_fraction(0)
+
         # (un)install (un)seeded snap(s)
         try:
             client = Snapd.Client()
             client.connect_sync()
+            index = 0
+            count = len(snap_list)
             for snap, snap_object in snap_list.items():
                 command = snap_object['command']
                 if command == 'refresh':
                     update_status(_("Refreshing %s snap" % snap))
-                    client.refresh_sync(snap, snap_object['channel'])
+                    client.refresh_sync(snap, snap_object['channel'],
+                                        self.update_snap_cb,
+                                        progress_callback_data=(index, count,
+                                                                progress_bar))
                 elif command == 'remove':
                     update_status(_("Removing %s snap" % snap))
-                    client.remove_sync(snap)
+                    client.remove_sync(snap, self.update_snap_cb,
+                                       progress_callback_data=(index, count,
+                                                               progress_bar))
                 else:
                     update_status(_("Installing %s snap" % snap))
-                    client.install_sync(snap, snap_object['channel'])
+                    client.install_sync(snap, snap_object['channel'],
+                                        self.update_snap_cb,
+                                        progress_callback_data=(index, count,
+                                                                progress_bar))
+                index += 1
         except GLib.Error as e:
             logging.debug("error updating snaps (%s)" % e)
+            GLib.idle_add(self.window_main.start_error, False,
+                          _("Upgrade only partially completed."),
+                          _("An error occurred while updating snaps. "
+                            "Please check your network connection."))
+            return
 
         # continue with the rest of the updates
-        if progress_timer:
-            GLib.source_remove(progress_timer)
-
         GLib.idle_add(self.window_main.start_available)
 
     def _action_done(self, action, authorized, success, error_string,

=== modified file 'debian/changelog'
--- debian/changelog	2020-04-15 12:37:26 +0000
+++ debian/changelog	2020-04-16 10:38:34 +0000
@@ -1,3 +1,10 @@
+update-manager (1:20.04.7) UNRELEASED; urgency=medium
+
+  * Show progress of snap updates (LP: #1871099).
+  * Display an error message when snap updates fail (LP: #1871100).
+
+ -- Marcus Tomlinson <[e-mail]>  Thu, 16 Apr 2020 09:46:56 +0100
+
 update-manager (1:20.04.6) focal; urgency=medium
 
   * deb2snap: Don't replace debs that were manually installed via