[pve-devel] [PATCH installer 3/7] tui: install progress: split out reboot handling into own function

[Christoph Heiss]

No functional changes.

Signed-off-by: Christoph Heiss <c.heiss at proxmox.com>
---
 .../src/views/install_progress.rs             | 55 ++++++++++---------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/proxmox-tui-installer/src/views/install_progress.rs b/proxmox-tui-installer/src/views/install_progress.rs
index 870c6a3..bd27628 100644
--- a/proxmox-tui-installer/src/views/install_progress.rs
+++ b/proxmox-tui-installer/src/views/install_progress.rs
@@ -80,6 +80,33 @@ fn spawn_low_level_installer() -> io::Result<process::Child> {
         .spawn()
 }
 
+fn prepare_for_reboot(siv: &mut Cursive, success: bool, msg: &str) {
+    let title = if success { "Success" } else { "Failure" };
+
+    // For rebooting, we just need to quit the installer, our caller does the actual reboot.
+    siv.add_layer(
+        Dialog::text(msg)
+            .title(title)
+            .button("Reboot now", Cursive::quit),
+    );
+
+    let autoreboot = siv
+        .user_data::<InstallerState>()
+        .map(|state| state.options.autoreboot)
+        .unwrap_or_default();
+
+    if autoreboot && success {
+        let cb_sink = siv.cb_sink();
+        thread::spawn({
+            let cb_sink = cb_sink.clone();
+            move || {
+                thread::sleep(Duration::from_secs(5));
+                let _ = cb_sink.send(Box::new(Cursive::quit));
+            }
+        });
+    }
+}
+
 fn progress_task(
     counter: Counter,
     cb_sink: CbSink,
@@ -161,33 +188,7 @@ fn progress_task(
                 UiMessage::Finished(success, msg) => {
                     counter.set(100);
                     progress_text.set_content(msg.to_owned());
-                    cb_sink.send(Box::new(move |siv| {
-                        let title = if success { "Success" } else { "Failure" };
-
-                        // For rebooting, we just need to quit the installer,
-                        // our caller does the actual reboot.
-                        siv.add_layer(
-                            Dialog::text(msg)
-                                .title(title)
-                                .button("Reboot now", Cursive::quit),
-                        );
-
-                        let autoreboot = siv
-                            .user_data::<InstallerState>()
-                            .map(|state| state.options.autoreboot)
-                            .unwrap_or_default();
-
-                        if autoreboot && success {
-                            let cb_sink = siv.cb_sink();
-                            thread::spawn({
-                                let cb_sink = cb_sink.clone();
-                                move || {
-                                    thread::sleep(Duration::from_secs(5));
-                                    let _ = cb_sink.send(Box::new(Cursive::quit));
-                                }
-                            });
-                        }
-                    }))
+                    cb_sink.send(Box::new(move |siv| prepare_for_reboot(siv, success, &msg)))
                 }
             }
             .unwrap();
-- 
2.41.0