Add restart countdown to OOBS

Author: James-Livesey

shell/locales/en_GB.json

@@ -53,6 +53,7 @@
         "oobs_confirm": "Confirm",
         "oobs_continue": "Continue",
         "oobs_finish": "Finish",
+        "oobs_restart": "Restart",
 
         "oobs_l10n_localeVariation": "Language region/variation",
         "oobs_l10n_keyboardLayout": "Keyboard layout",

shell/locales/fr_FR.json

@@ -53,6 +53,7 @@
         "oobs_confirm": "Confirmer",
         "oobs_continue": "Continuer",
         "oobs_finish": "Finir",
+        "oobs_restart": "Redémarrer",
 
         "oobs_l10n_localeVariation": "Région/variation linguistique",
         "oobs_l10n_keyboardLayout": "Disposition du clavier",

shell/oobs/installfinish.html

@@ -15,11 +15,11 @@
             <div>
                 <h1 translate>oobs_installFinish_title</h1>
                 <p translate>oobs_installFinish_description</p>
-                <!-- TODO: Add auto-restart countdown -->
+                <p class="oobs_installFinish_countdown"></p>
             </div>
         </div>
         <aui-buttons aui-mode="end" class="oobs_options">
-            <!-- TODO: Add button for restarting -->
+            <button class="oobs_installFinish_restart" translate>oobs_restart</button>
         </aui-buttons>
     </div>
 </div>

shell/oobs/oobs.css

@@ -79,6 +79,12 @@
     margin-inline-end: 0;
 }
 
+.oobs_installFinish_countdown {
+    text-align: center;
+    font-size: 4rem;
+    font-weight: bold;
+}
+
 @media (max-width: 800px) {
     #oobs .oobs_step {
         padding: 0.5rem;

shell/oobs/oobs.js

@@ -731,6 +731,22 @@ export function init() {
     $g.sel(".oobs_installConfirm_confirm").on("click", function() {
         processInstallation().then(function() {
             selectStep("installfinish");
+
+            var countdownValue = 10;
+
+            $g.sel(".oobs_installFinish_countdown").setText(_format(countdownValue));
+
+            var countdownInterval = setInterval(function countdown() {
+                countdownValue--;
+
+                $g.sel(".oobs_installFinish_countdown").setText(_format(countdownValue));
+
+                if (countdownValue == 0) {
+                    clearInterval(countdownInterval);
+
+                    gShell.call("power_restart");
+                }
+            }, 1_000);
         }).catch(function(error) {
             console.error(error);
 
@@ -740,6 +756,10 @@ export function init() {
         });
     });
 
+    $g.sel(".oobs_installFinish_restart").on("click", function() {
+        gShell.call("power_restart");
+    });
+
     $g.sel(".oobs_userProfile_next").on("click", function() {
         checkDisplayName();
     });

src/ipc.js

@@ -100,6 +100,12 @@ ipcMain.handle("power_shutDown", function(event, data) {
     return Promise.resolve();
 });
 
+ipcMain.handle("power_restart", function(event, data) {
+    system.restart();
+
+    return Promise.resolve();
+});
+
 ipcMain.handle("power_sleep", function(event, data) {
     system.sleep();
 

src/system.js

@@ -194,6 +194,8 @@ exports.getScreenResolution = function() {
 };
 
 exports.shutDown = function() {
+    console.log("Shut down called");
+
     if (!flags.isRealHardware) {
         electron.app.exit(0);
 
@@ -203,7 +205,22 @@ exports.shutDown = function() {
     return exports.executeCommand("sudo", ["shutdown", "-h", "now"]);
 };
 
+exports.restart = function() {
+    console.log("Restart called");
+
+    if (!flags.isRealHardware) {
+        electron.app.relaunch();
+        electron.app.exit(0);
+
+        return Promise.resolve();
+    }
+
+    return exports.executeCommand("sudo", ["reboot"]);
+};
+
 exports.sleep = function() {
+    console.log("Sleep called");
+
     if (!flags.isRealHardware) {
         return Promise.resolve();
     }