feat: Replaced the Exec popup with a fully functional terminal emulator (#348)
Linux / build (push) Waiting to run
MacOS / build (push) Waiting to run
Windows / build (push) Waiting to run

* feat: Replaced the `Exec` popup with a fully functional terminal emulator

closes #340

* fix: colors and fmt for terminal

* feat: Handle exit and cd on terminal

* fix: Fmt pah
This commit is contained in:
Christian Visintin
2025-06-10 13:17:20 +02:00
committed by GitHub
parent 81ae0035c3
commit c0b32a1847
19 changed files with 1099 additions and 137 deletions
+107 -21
View File
@@ -2,41 +2,127 @@
//!
//! `filetransfer_activiy` is the module which implements the Filetransfer activity, which is the main activity afterall
use std::path::PathBuf;
use std::str::FromStr;
// locals
use super::{FileTransferActivity, LogLevel};
/// Terminal command
#[derive(Debug, Clone, PartialEq, Eq)]
enum Command {
Cd(String),
Exec(String),
Exit,
}
impl FromStr for Command {
type Err = String;
fn from_str(s: &str) -> Result<Self, Self::Err> {
let mut parts = s.split_whitespace();
match parts.next() {
Some("cd") => {
if let Some(path) = parts.next() {
Ok(Command::Cd(path.to_string()))
} else {
Err("cd command requires a path".to_string())
}
}
Some("exit") | Some("logout") => Ok(Command::Exit),
Some(cmd) => Ok(Command::Exec(cmd.to_string())),
None => Err("".to_string()),
}
}
}
impl FileTransferActivity {
pub(crate) fn action_local_exec(&mut self, input: String) {
match self.host_bridge.exec(input.as_str()) {
Ok(output) => {
// Reload files
self.log(LogLevel::Info, format!("\"{input}\": {output}"));
}
self.action_exec(false, input);
}
pub(crate) fn action_remote_exec(&mut self, input: String) {
self.action_exec(true, input);
}
fn action_exec(&mut self, remote: bool, cmd: String) {
if cmd.is_empty() {
self.print_terminal("".to_string());
}
let cmd = match Command::from_str(&cmd) {
Ok(cmd) => cmd,
Err(err) => {
// Report err
self.log_and_alert(
LogLevel::Error,
format!("Could not execute command \"{input}\": {err}"),
);
self.log(LogLevel::Error, format!("Invalid command: {err}"));
self.print_terminal(err);
return;
}
};
match cmd {
Command::Cd(path) => {
self.action_exec_cd(remote, path);
}
Command::Exec(executable) => {
self.action_exec_executable(remote, executable);
}
Command::Exit => {
self.action_exec_exit();
}
}
}
pub(crate) fn action_remote_exec(&mut self, input: String) {
match self.client.as_mut().exec(input.as_str()) {
Ok((rc, output)) => {
// Reload files
self.log(
LogLevel::Info,
format!("\"{input}\" (exitcode: {rc}): {output}"),
);
fn action_exec_exit(&mut self) {
self.browser.toggle_terminal(false);
self.umount_exec();
}
fn action_exec_cd(&mut self, remote: bool, input: String) {
let new_dir = if remote {
let dir_path: PathBuf =
self.remote_to_abs_path(PathBuf::from(input.as_str()).as_path());
self.remote_changedir(dir_path.as_path(), true);
dir_path
} else {
let dir_path: PathBuf =
self.host_bridge_to_abs_path(PathBuf::from(input.as_str()).as_path());
self.host_bridge_changedir(dir_path.as_path(), true);
dir_path
};
self.update_browser_file_list();
// update prompt and print the new directory
self.update_terminal_prompt();
self.print_terminal(new_dir.display().to_string());
}
/// Execute a [`Command::Exec`] command
fn action_exec_executable(&mut self, remote: bool, cmd: String) {
let res = if remote {
self.client
.as_mut()
.exec(cmd.as_str())
.map(|(_, output)| output)
.map_err(|e| e.to_string())
} else {
self.host_bridge
.exec(cmd.as_str())
.map_err(|e| e.to_string())
};
match res {
Ok(output) => {
self.print_terminal(output);
}
Err(err) => {
// Report err
self.log_and_alert(
self.log(
LogLevel::Error,
format!("Could not execute command \"{input}\": {err}"),
format!("Could not execute command \"{cmd}\": {err}"),
);
self.print_terminal(err);
}
}
}