Merge lp:~ddieter/appcenter/appcenter-notify-restart into lp:~elementary-apps/appcenter/appcenter

[Dieter Debast]

After installing updates or periodically when updating the cache, appcenter checks for the existence of the /var/run/reboot-required file. This file is created by an applications post-installation script to indicate that a reboot is necessary.

If this file exists, appcenter shows a notification and the "Up to Date" text is changed to "Restart required". There's also a "Restart now" button that shows a confirmation dialog and allows the user to restart the device.

[Danielle Foré (danrabbit)]

superseded by https://code.launchpad.net/~nathandyer/appcenter/restart-notification/+merge/320067

Unmerged revisions

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2017-02-10 20:15:32 +0000
+++ src/CMakeLists.txt	2017-02-13 23:26:06 +0000
@@ -23,6 +23,8 @@
     Widgets/AppListRow.vala
     Widgets/AppActionButton.vala
     Widgets/UpdateHeaderRow.vala
+    Widgets/RestartDialog.vala
+    Services/DbusInterfaces.vala
     ${CMAKE_CURRENT_BINARY_DIR}/config.vala
 PACKAGES
     appstream
 
=== modified file 'src/Core/Client.vala'
--- src/Core/Client.vala	2017-02-04 17:18:30 +0000
+++ src/Core/Client.vala	2017-02-13 23:26:06 +0000
@@ -17,6 +17,8 @@
 public class AppCenterCore.Client : Object {
     public signal void updates_available ();
 
+    private const string RESTART_REQUIRED_FILE = "/var/run/reboot-required";
+
     public bool connected { public get; private set; }
     public bool updating_cache { public get; private set; }
     public uint task_count { public get; private set; default = 0; }
@@ -29,6 +31,7 @@
     private GLib.DateTime last_cache_update;
     private uint updates_number = 0U;
     private uint update_cache_timeout_id = 0;
+    private bool restart_required = false;
     private bool refresh_in_progress = false;
 
     private const int SECONDS_BETWEEN_REFRESHES = 60*60*24;
@@ -354,6 +357,25 @@
         task_count--;
         refresh_in_progress = false;
     }
+    
+   public async bool check_restart () {
+        if (FileUtils.test (RESTART_REQUIRED_FILE, FileTest.EXISTS)) {
+            if (!restart_required) {
+                string title = _("Restart Required");
+                string body = _("Please restart your system to finalize updates");
+                var notification = new Notification (title);
+                notification.set_body (body);
+                notification.set_icon (new ThemedIcon ("system-software-install"));
+                notification.set_default_action ("app.open-application");
+                Application.get_default ().send_notification ("restart", notification);
+            }
+
+            restart_required = true;            
+            return true;
+        }
+        
+        return false;
+    }
 
     public uint get_package_count (GLib.GenericArray<weak Pk.Package> package_array) {
         bool os_update_found = false;
@@ -436,6 +458,8 @@
             } else {
                 refresh_in_progress = false; //Stops new timeout while no network.
             }
+
+            check_restart.begin ();
         } else {
             debug ("Too soon to refresh and not forced");
         }
 
=== added directory 'src/Services'
=== added file 'src/Services/DbusInterfaces.vala'
--- src/Services/DbusInterfaces.vala	1970-01-01 00:00:00 +0000
+++ src/Services/DbusInterfaces.vala	2017-02-13 23:26:06 +0000
@@ -0,0 +1,24 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2014-2016 elementary LLC. (https://elementary.io)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* Power and system control */
+[DBus (name = "org.freedesktop.login1.Manager")]
+interface SystemInterface : Object {
+    public abstract void reboot (bool interactive) throws IOError;
+}
+
 
=== modified file 'src/Views/AppListView.vala'
--- src/Views/AppListView.vala	2017-02-04 17:18:30 +0000
+++ src/Views/AppListView.vala	2017-02-13 23:26:06 +0000
@@ -37,6 +37,7 @@
         private Widgets.UpdateHeaderRow updates_header;
         private Widgets.UpdateHeaderRow updated_header;
         private Widgets.AppActionButton update_all_button;
+        private Widgets.AppActionButton restart_button;
         private bool updating_all_apps = false;
         private bool apps_remaining_started = false;
         private GLib.Mutex update_mutex;
@@ -66,11 +67,21 @@
             update_all_button.clicked.connect (on_update_all);
             update_all_button.no_show_all = true;
             action_button_group.add_widget (update_all_button);
+            
+            restart_button = new Widgets.AppActionButton (_("Restart Now"));
+            restart_button.set_suggested_action_header ();
+            restart_button.clicked.connect (() => {
+                var dialog = new Widgets.RestartDialog ();
+                dialog.show_all ();
+            });
+            restart_button.no_show_all = true;
+            action_button_group.add_widget (restart_button);
 
             updates_header = new Widgets.UpdateHeaderRow.updates ();
             updates_header.add_widget (update_all_button);
 
             updated_header = new Widgets.UpdateHeaderRow.updated ();
+            updated_header.add_widget (restart_button);
 
             list_box.add (updates_header);
             list_box.add (updated_header);
@@ -256,12 +267,22 @@
                 }
             }
 
-            updates_header.update (update_numbers, update_real_size, updating_cache);
+            updates_header.update (update_numbers, update_real_size, updating_cache, false);
             update_all_button.visible = !updating_cache && update_numbers > 0;
         }
 
         private void update_updated_grid () {
-            updated_header.update (0, 0, updating_cache);
+            if (!updating_all_apps && !updating_cache) {
+                var client = AppCenterCore.Client.get_default ();
+                client.check_restart.begin ((obj, res) => {
+                    var restart_required = client.check_restart.end (res);
+                    
+                    updated_header.update (0, 0, updating_cache, restart_required);
+                    restart_button.visible = restart_required;
+                });
+            } else {        
+                updated_header.update (0, 0, updating_cache, false);
+            }
         }
     }
 }
 
=== added file 'src/Widgets/RestartDialog.vala'
--- src/Widgets/RestartDialog.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/RestartDialog.vala	2017-02-13 23:26:06 +0000
@@ -0,0 +1,87 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2014-2016 elementary LLC. (https://elementary.io)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace AppCenter.Widgets {
+    public class RestartDialog : Gtk.Dialog {
+        private SystemInterface system_interface;
+
+        public RestartDialog () {
+            Object (title: "", deletable: false, skip_taskbar_hint: true, skip_pager_hint: true, type_hint: Gdk.WindowTypeHint.DIALOG);
+        }
+
+        construct {
+            try {
+                system_interface = Bus.get_proxy_sync (BusType.SYSTEM, "org.freedesktop.login1", "/org/freedesktop/login1");
+            } catch (IOError e) {
+                stderr.printf ("%s\n", e.message);
+            }
+
+            /*
+            * the restart type is currently used by the indicator for what is
+            * labelled shutdown because of unity's implementation of it
+            * apparently. So we got to adjust to that until they fix this.
+            */
+            string icon_name = "system-shutdown";
+            string heading_text = _("Are you sure you want to Restart?");
+            string content_text = _("This will close all open applications and restart this device.");
+            string button_text = _("Restart");
+
+            set_position (Gtk.WindowPosition.CENTER_ALWAYS);
+            set_keep_above (true);
+            stick ();
+            set_resizable (false);
+
+            var heading = new Gtk.Label ("<span weight='bold' size='larger'>" + heading_text + "</span>");
+            heading.get_style_context ().add_class ("larger");
+            heading.use_markup = true;
+            heading.halign = Gtk.Align.START;
+
+            var grid = new Gtk.Grid ();
+            grid.column_spacing = 12;
+            grid.row_spacing = 12;
+            grid.margin_left = grid.margin_right = grid.margin_bottom = 12;
+            grid.attach (new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.DIALOG), 0, 0, 1, 2);
+            grid.attach (heading, 1, 0, 1, 1);
+            grid.attach (new Gtk.Label (content_text), 1, 1, 1, 1);
+
+            var cancel = add_button (_("Cancel"), Gtk.ResponseType.CANCEL) as Gtk.Button;
+            cancel.clicked.connect (() => { destroy (); });
+
+            var confirm = add_button (button_text, Gtk.ResponseType.OK) as Gtk.Button;
+            confirm.get_style_context ().add_class ("destructive-action");
+            confirm.clicked.connect (() => {
+                try {
+                    system_interface.reboot (false);
+                } catch (IOError e) {
+                    stderr.printf ("%s\n", e.message);
+                }
+
+                destroy ();
+            });
+
+            set_default (confirm);
+
+            get_content_area ().add (grid);
+
+            var action_area = get_action_area ();
+            action_area.margin_right = 6;
+            action_area.margin_bottom = 6;
+        }
+    }
+}
+
 
=== modified file 'src/Widgets/UpdateHeaderRow.vala'
--- src/Widgets/UpdateHeaderRow.vala	2016-09-17 19:28:03 +0000
+++ src/Widgets/UpdateHeaderRow.vala	2017-02-13 23:26:06 +0000
@@ -70,8 +70,8 @@
             grid.add (widget);
         }
 
-        public void update (uint _update_numbers, uint64 _update_real_size, bool _is_updating) {
-            grid.update (_update_numbers, _update_real_size, _is_updating);
+        public void update (uint _update_numbers, uint64 _update_real_size, bool _is_updating, bool _restart_required) {
+            grid.update (_update_numbers, _update_real_size, _is_updating, _restart_required);
             changed (); /* Triggers resort */
         }
         /** ---------------- **/
@@ -81,19 +81,21 @@
             public uint update_numbers {get; protected set; default = 0;}
             public uint64 update_real_size {get; protected set; default = 0;}
             public bool is_updating {get; protected set; default = false;}
+            public bool restart_required {get; protected set; default = false;}
 
             construct {
                 margin = 12;
                 column_spacing = 12;
             }
 
-            protected void store_data (uint _update_numbers, uint64 _update_real_size, bool _is_updating) {
+            protected void store_data (uint _update_numbers, uint64 _update_real_size, bool _is_updating, bool _restart_required) {
                 update_numbers = _update_numbers;
                 update_real_size = _update_real_size;
                 is_updating = _is_updating;
+                restart_required = _restart_required;
             }
 
-            public abstract void update (uint _update_numbers, uint64 _update_real_size, bool _is_updating);
+            public abstract void update (uint _update_numbers, uint64 _update_real_size, bool _is_updating, bool _restart_required);
         }
 
         /** Header to show at top of list if there are updates available **/
@@ -114,8 +116,8 @@
                 add (update_size_label);
             }
 
-            public override void update (uint _update_numbers, uint64 _update_real_size, bool _is_updating) {
-                store_data (_update_numbers,  _update_real_size, _is_updating);
+            public override void update (uint _update_numbers, uint64 _update_real_size, bool _is_updating, bool _restart_required) {
+                store_data (_update_numbers,  _update_real_size, _is_updating, _restart_required);
 
                 if (!is_updating) {
                     updates_label.label = ngettext ("%u Update Available", "%u Updates Available", update_numbers).printf (update_numbers);
@@ -147,8 +149,8 @@
                 add (spinner);
             }
 
-            public override void update (uint _update_numbers, uint64 _update_real_size, bool _is_updating) {
-                store_data (_update_numbers,  _update_real_size, _is_updating);
+            public override void update (uint _update_numbers, uint64 _update_real_size, bool _is_updating, bool _restart_required) {
+                store_data (_update_numbers,  _update_real_size, _is_updating, _restart_required);
 
                 if (is_updating) {
                     halign = Gtk.Align.CENTER;
@@ -158,11 +160,15 @@
                     label.label = _("Searching for updates…");
                     label.get_style_context ().remove_class ("h4");
                 } else {
-                    halign = Gtk.Align.START;
+                    halign = Gtk.Align.FILL;
                     spinner.stop ();
                     spinner.no_show_all = true;
                     spinner.hide ();
-                    label.label = _("Up to Date");
+                    if (restart_required) {
+                        label.label = _("Restart required");
+                    } else {
+                        label.label = _("Up to Date");
+                    }
                     label.get_style_context ().add_class ("h4");
                 }
             }