Show dialog boxes to guide the user when run outside of a terminal

Signed-off-by: Davide Cavalca <[email protected]>

Author: davide125

Cargo.lock

@@ -19,3 +19,4 @@ log = "0.4"
 nix = "0.29"
 serde = { version = "1.0", features = ["derive"] }
 xdg = "2.5"
+zenity-dialog = { version = "0.3.6", default-features = false, features = ["info", "error"] }

Cargo.toml

@@ -23,7 +23,9 @@ binfmt-dispatcher parses configuration from several sources:
 Configs are parsed in order and later settings win. A fully commented config is [provided](docs/binfmt-dispatcher.toml.example) and should be fairly self-explanatory.
 
 ## Usage
-When run as an interpreter, binfmt-dispatcher will parse the configs, pick the best interpreter to use based on it and the binary being run, and then run it. If enabled (via the `use_muvm` config setting), binfmt-dispatcher will use [muvm](https://github.com/AsahiLinux/muvm) to execute the interpreter in a microVM if the system page-size is not 4k.
+When run as an interpreter, binfmt-dispatcher will parse the configs, pick the best interpreter to use based on it and the binary being run, and then run it. If enabled (via the `use_muvm` config setting), binfmt-dispatcher will use [muvm](https://github.com/AsahiLinux/muvm) to execute the interpreter in a microVM if the system page-size is not 4k. If the interpreter or any of its dependencies are missing, binfmt-dispatcher will attempt to install them by invoking the package manager.
+
+If run outside of a terminal session, binfmt-dispatcher will assume it's being run as part of a desktop environment (e.g. because a user double clicked on an x86-64 binary in a file manager). If [zenity](https://help.gnome.org/users/zenity/stable/) is installed, dialog boxes will be displayed to provide feedback to the user when necessary. If it's necessary to install any missing dependencies, the package manager will be run inside a terminal emulator via [xdg-terminal-exec](https://github.com/Vladimir-csp/xdg-terminal-exec).
 
 ## License
 This project is [MIT](https://spdx.org/licenses/MIT.html) licensed. See the [LICENSE](LICENSE) file for the full text of the license.

README.md

@@ -5,6 +5,7 @@ use crate::config::ConfigFile;
 
 mod util;
 use crate::util::get_page_size;
+use crate::util::{error_dialog, info_dialog};
 
 use std::env;
 use std::ffi::{OsStr, OsString};
@@ -17,6 +18,14 @@ use std::process::{exit, Command};
 #[allow(unused_imports)]
 use log::{debug, error, info, trace, warn};
 
+fn abort(msg: &str) {
+    error!("{}", msg);
+    if !stdin().is_terminal() {
+        error_dialog(msg);
+    }
+    exit(1)
+}
+
 fn main() {
     // Parse config
     let settings: ConfigFile = config::parse_config().unwrap();
@@ -36,8 +45,7 @@ fn main() {
     let args: Vec<OsString> = env::args_os().skip(1).collect();
     trace!("Args:\n{:#?}", args);
     if args.is_empty() {
-        error!("No arguments passed, re-run with --help to learn more.");
-        exit(1)
+        abort("No arguments passed, re-run with --help to learn more.");
     } else {
         match args[0].to_str().unwrap() {
             "--help" => {
@@ -82,6 +90,9 @@ fn main() {
             "Will attempt to install missing requirements for {}",
             interpreter_name
         );
+        if !stdin().is_terminal() {
+            info_dialog("To run this program, {} needs to be installed.");
+        }
 
         let mut dnf_command;
         if stdin().is_terminal() {
@@ -102,16 +113,16 @@ fn main() {
             Ok(mut child) => {
                 let status = child.wait().expect("Failed to wait on dnf process");
                 if !status.success() {
-                    error!(
+                    debug!(
                         "Failed to install missing requirements: dnf returned {:?}",
                         status
                     );
-                    exit(1);
+                    abort("The installation failed. Please try again.");
                 }
             }
             Err(e) => {
-                error!("Failed to execute dnf: {}", e);
-                exit(1);
+                debug!("Failed to execute dnf: {}", e);
+                abort("The package manager failed to start. Please try again.");
             }
         }
     }
@@ -123,7 +134,10 @@ fn main() {
             // Use muvm if the page-size is not 4k
             use_muvm = size != 4096;
         } else {
-            error!("Failed to get page size");
+            debug!("Failed to get page size");
+            if !stdin().is_terminal() {
+                error_dialog("We were unable to detect the system page size. The program might not execute correctly.");
+            }
             use_muvm = false;
         }
     }
@@ -150,6 +164,5 @@ fn main() {
     let _ = command.exec();
 
     // If exec fails, it will not return; however, we include this to handle the case.
-    error!("Failed to execute binary");
-    exit(1);
+    abort("The program failed to execute.");
 }

src/main.rs

@@ -3,6 +3,12 @@
 use libc::{sysconf, _SC_PAGESIZE};
 use std::os::raw::c_long;
 
+use zenity_dialog::dialog;
+use zenity_dialog::ZenityDialog;
+use zenity_dialog::ZenityOutput;
+
+use log::warn;
+
 pub fn get_page_size() -> Option<usize> {
     unsafe {
         let page_size: c_long = sysconf(_SC_PAGESIZE);
@@ -13,3 +19,35 @@ pub fn get_page_size() -> Option<usize> {
         }
     }
 }
+
+pub fn info_dialog(msg: &str) -> bool {
+    let result = ZenityDialog::new(dialog::Info::new().with_text(msg))
+        .with_title(env!("CARGO_PKG_NAME"))
+        .show();
+
+    if result.is_err() {
+      warn!("Failed to create dialog, is zenity installed?");
+      return false;
+    }
+
+    match result.unwrap() {
+        ZenityOutput::Affirmed { .. } => return true,
+        _ => return false,
+    }
+}
+
+pub fn error_dialog(msg: &str) -> bool {
+    let result = ZenityDialog::new(dialog::Error::new().with_text(msg))
+        .with_title(env!("CARGO_PKG_NAME"))
+        .show();
+
+    if result.is_err() {
+      warn!("Failed to create dialog, is zenity installed?");
+      return false;
+    }
+
+    match result.unwrap() {
+        ZenityOutput::Affirmed { .. } => return true,
+        _ => return false,
+    }
+}