Add automatic local freerdp installation and docker/podman support

winapps-cli/Cargo.toml

@@ -7,5 +7,8 @@ default-run = "winapps-cli"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = "4.3.11"
+clap = "4.3"
+time = "0.3"
+tracing = "0.1"
+tracing-subscriber = { version = "0.3", features = ["time"] }
 winapps = { path = "../winapps" }

winapps-cli/src/main.rs

@@ -1,6 +1,6 @@
 use clap::{arg, Command};
+use tracing::info;
 use winapps::freerdp::freerdp_back::Freerdp;
-use winapps::quickemu::{create_vm, kill_vm, start_vm};
 use winapps::{unwrap_or_panic, RemoteClient};
 
 fn cli() -> Command {
@@ -16,19 +16,15 @@ fn cli() -> Command {
                 .about("Connects to app on remote")
                 .arg(arg!(<APP> "App to open")),
         )
-        .subcommand(
-            Command::new("vm")
-                .about("Manage a windows 10 vm using quickemu")
-                .subcommand_required(true)
-                .arg_required_else_help(true)
-                .allow_external_subcommands(true)
-                .subcommand(Command::new("create").about("Create a windows 10 vm using quickget"))
-                .subcommand(Command::new("start").about("Start the vm"))
-                .subcommand(Command::new("kill").about("Kill the running VM")),
-        )
 }
 
 fn main() {
+    tracing_subscriber::fmt()
+        // .with_timer(tracing_subscriber::fmt::time::uptime())
+        .without_time()
+        .with_target(false)
+        .init();
+
     let cli = cli();
     let matches = cli.clone().get_matches();
 
@@ -37,48 +33,20 @@ fn main() {
 
     match matches.subcommand() {
         Some(("check", _)) => {
-            println!("Checking remote connection");
+            info!("Checking remote connection");
 
             client.check_depends(config);
         }
         Some(("connect", _)) => {
-            println!("Connecting to remote");
+            info!("Connecting to remote");
 
             client.run_app(config, None);
         }
         Some(("run", sub_matches)) => {
-            println!("Connecting to app on remote");
+            info!("Connecting to app on remote");
 
             client.run_app(config, sub_matches.get_one::<String>("APP"));
         }
-
-        Some(("vm", command)) => {
-            match command.subcommand() {
-                Some(("create", _)) => {
-                    println!("Creating windows 10 vm..");
-                    create_vm(config);
-                }
-                Some(("start", _)) => {
-                    println!("Starting vm..");
-                    start_vm(config);
-                }
-
-                Some(("kill", _)) => {
-                    println!("Killing vm..");
-                    kill_vm(config);
-                }
-
-                Some((_, _)) => {
-                    unwrap_or_panic!(
-                        cli.about("Command not found, try existing ones!")
-                            .print_help(),
-                        "Couldn't print help"
-                    );
-                }
-                _ => unreachable!(),
-            };
-        }
-
         Some((_, _)) => {
             unwrap_or_panic!(
                 cli.about("Command not found, try existing ones!")

winapps/Cargo.toml

@@ -6,10 +6,18 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.75"
-derive-new = "0.5.9"
-home = "0.5.5"
-serde = { version = "1.0.171", features = ["derive"] }
-thiserror = "1.0.49"
-toml = "0.8.2"
-tracing = "0.1.37"
+anyhow = "1.0"
+sevenz-rust={version="0.2", features=["zstd"]}
+derive-new = "0.5"
+home = "0.5"
+indicatif = { version="0.17", features = ["tokio"] }
+reqwest = { version = "0.12", features = ["stream"] }
+serde = { version = "1.0", features = ["derive"] }
+tempfile = "3.11"
+thiserror = "1.0"
+tokio = { version = "1.37", features = ["full"] }
+tokio-stream = "0.1"
+tokio-util = {version="0.7", features=["io"]}
+toml = "0.8"
+tracing = "0.1"
+tracing-subscriber = "0.3"

winapps/src/freerdp.rs

@@ -1,21 +1,113 @@
 pub mod freerdp_back {
+    use crate::{get_data_dir, unwrap_or_exit, Config, RemoteClient};
+    use indicatif::ProgressBar;
+    use std::cmp::min;
+    use std::fs::File;
     use std::process::{Command, Stdio};
+    use tokio_stream::StreamExt;
     use tracing::{info, warn};
 
-    use crate::{unwrap_or_exit, Config, RemoteClient};
-
     pub struct Freerdp {}
 
+    impl Freerdp {
+        fn get_freerdp() -> Command {
+            tokio::runtime::Builder::new_multi_thread()
+                .enable_all()
+                .build()
+                .unwrap()
+                .block_on(Freerdp::install_freerdp());
+            Command::new(get_data_dir().join("usr/bin/xfreerdp"))
+        }
+
+        async fn install_freerdp() {
+            if get_data_dir().join("usr/bin/xfreerdp").exists() {
+                return;
+            }
+
+            let freerdp_file = "freerdp-3.6.3-1.fc41.x86_64.rpm";
+
+            let bar = ProgressBar::new(1);
+
+            bar.set_style(indicatif::ProgressStyle::with_template(
+                            "{spinner:.green} [{elapsed}] {wide_bar:.cyan/blue} {bytes}/{total_bytes} {bytes_per_sec} {msg} ({eta})",
+                        ).unwrap().progress_chars("#>-"));
+            bar.set_message(format!("Starting {}", freerdp_file));
+
+            bar.tick();
+
+            let response = reqwest::get(
+                "https://kojipkgs.fedoraproject.org/packages/freerdp/3.6.3/1.fc41/x86_64/"
+                    .to_owned()
+                    + freerdp_file,
+            )
+            .await
+            .unwrap();
+
+            let total_size = response.content_length().unwrap_or(0);
+
+            bar.set_length(total_size);
+            bar.set_message(format!("Downloading {}", freerdp_file));
+
+            let mut downloaded: u64 = 0;
+
+            let mut stream = response.bytes_stream().map(|result| {
+                result
+                    .inspect(|result| {
+                        let new = min(downloaded + (result.len() as u64), total_size);
+                        downloaded = new;
+                        bar.set_position(new);
+                    })
+                    .map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))
+            });
+
+            let mut file = tokio::fs::File::create(get_data_dir().join(freerdp_file))
+                .await
+                .unwrap();
+
+            while let Some(item) = stream.next().await {
+                tokio::io::copy(&mut item.unwrap().as_ref(), &mut file)
+                    .await
+                    .unwrap();
+            }
+
+            let mut rpm2cpio = Command::new("rpm2cpio");
+            rpm2cpio.stdin(Stdio::from(
+                File::open(get_data_dir().join(freerdp_file)).unwrap(),
+            ));
+            rpm2cpio.stdout(Stdio::piped());
+            rpm2cpio.stderr(Stdio::null());
+            rpm2cpio.current_dir(get_data_dir());
+
+            let rpm2cpio = unwrap_or_exit!(
+                rpm2cpio.spawn(),
+                "rpm2cpio execution failed! Check if rpm2cpio (rpm) is installed!",
+            );
+
+            let mut cpio = Command::new("cpio");
+            cpio.stdin(Stdio::from(rpm2cpio.stdout.unwrap()));
+            cpio.stdout(Stdio::null());
+            cpio.stderr(Stdio::null());
+            cpio.current_dir(get_data_dir());
+            cpio.arg("-idmv");
+
+            unwrap_or_exit!(
+                cpio.spawn(),
+                "cpio execution failed! Check if cpio is installed!",
+            );
+        }
+    }
+
     impl RemoteClient for Freerdp {
         fn check_depends(&self, config: Config) {
-            let mut xfreerdp = Command::new("xfreerdp");
+            let mut xfreerdp = Freerdp::get_freerdp();
             xfreerdp.stdout(Stdio::null());
             xfreerdp.stderr(Stdio::null());
             xfreerdp.args(["-h"]);
 
             unwrap_or_exit!(
                 xfreerdp.spawn(),
-                "Freerdp execution failed! It needs to be installed!",
+                "Freerdp execution failed! Try to delete {}, to force a reinstall.",
+                get_data_dir().join("usr").display(),
             );
 
             info!("Freerdp found!");
@@ -30,7 +122,7 @@ pub mod freerdp_back {
         }
 
         fn run_app(&self, config: Config, app: Option<&String>) {
-            let mut xfreerdp = Command::new("xfreerdp");
+            let mut xfreerdp = Freerdp::get_freerdp();
             xfreerdp.stdout(Stdio::null());
             xfreerdp.stderr(Stdio::null());
             match app {

winapps/src/lib.rs

@@ -1,6 +1,5 @@
 pub mod errors;
 pub mod freerdp;
-pub mod quickemu;
 
 use crate::errors::WinappsError;
 use derive_new::new;
@@ -27,16 +26,6 @@ pub struct Config {
     host: HostConfig,
     #[new(value = "RemoteConfig::new()")]
     rdp: RemoteConfig,
-    #[new(value = "VmConfig::new()")]
-    vm: VmConfig,
-}
-
-#[derive(new, Debug, Deserialize, Serialize)]
-pub struct VmConfig {
-    #[new(value = "\"windows-10\".to_string()")]
-    short_name: String,
-    #[new(value = "\"windows-10-22H2\".to_string()")]
-    name: String,
 }
 
 #[derive(new, Debug, Deserialize, Serialize)]
@@ -49,11 +38,11 @@ pub struct HostConfig {
 pub struct RemoteConfig {
     #[new(value = "\"127.0.0.1\".to_string()")]
     host: String,
-    #[new(value = "\"WORKGROUP\".to_string()")]
+    #[new(value = "\"\".to_string()")]
     domain: String,
-    #[new(value = "\"Quickemu\".to_string()")]
+    #[new(value = "\"Docker\".to_string()")]
     username: String,
-    #[new(value = "\"quickemu\".to_string()")]
+    #[new(value = "\"\".to_string()")]
     password: String,
 }