Hexor/rexec
1
0
Fork 0
mirror of https://github.com/house-of-vanity/rexec.git synced 2025-07-07 00:54:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Format Rust code using rustfmt

Browse Source
This commit is contained in:
github-actions[bot]
2025-06-27 11:15:11 +00:00
committed by GitHub
parent 94fd8535ca
commit 7a324a04da
1 changed files with 144 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/main.rs
View File

@ -71,7 +71,7 @@ struct Args {
#[arg(
long,
help = "Use embedded SSH client instead of system SSH. Does not support 'live output'.",
default_value_t = false,
default_value_t = false
)]
embedded_ssh: bool,
}
@ -156,7 +156,7 @@ fn shorten_hostname(hostname: &str, common_suffix: &Option<String>) -> String {
Some(suffix) if hostname.ends_with(suffix) => {
let short_name = hostname[..hostname.len() - suffix.len()].to_string();
format!("{}{}", short_name, "*")
},
}
_ => hostname.to_string(),
}
}
@ -290,7 +290,12 @@ fn expand_string(s: &str) -> Vec<Host> {
///
/// # Returns
/// * `Result<i32, String>` - Exit code on success or error message
fn execute_ssh_command(hostname: &str, username: &str, command: &str, common_suffix: &Option<String>) -> Result<i32, String> {
fn execute_ssh_command(
hostname: &str,
username: &str,
command: &str,
common_suffix: &Option<String>,
) -> Result<i32, String> {
let display_name = shorten_hostname(hostname, common_suffix);
// Display execution start message with shortened hostname
@ -298,8 +303,11 @@ fn execute_ssh_command(hostname: &str, username: &str, command: &str, common_suf
// Build the SSH command with appropriate options
let mut ssh_cmd = Command::new("ssh");
ssh_cmd.arg("-o").arg("StrictHostKeyChecking=no")
.arg("-o").arg("BatchMode=yes")
ssh_cmd
.arg("-o")
.arg("StrictHostKeyChecking=no")
.arg("-o")
.arg("BatchMode=yes")
.arg(format!("{}@{}", username, hostname))
.arg(command)
.stdout(Stdio::piped())
@ -320,7 +328,13 @@ fn execute_ssh_command(hostname: &str, username: &str, command: &str, common_suf
for line in reader.lines() {
match line {
Ok(line) => println!("{} {} {} {}", prefix, display_name_stdout.yellow(), prefix, line),
Ok(line) => println!(
"{} {} {} {}",
prefix,
display_name_stdout.yellow(),
prefix,
line
),
Err(_) => break,
}
}
@ -335,7 +349,13 @@ fn execute_ssh_command(hostname: &str, username: &str, command: &str, common_suf
for line in reader.lines() {
match line {
Ok(line) => println!("{} {} {} {}", prefix, display_name_stderr.yellow(), prefix, line),
Ok(line) => println!(
"{} {} {} {}",
prefix,
display_name_stderr.yellow(),
prefix,
line
),
Err(_) => break,
}
}
@ -360,7 +380,11 @@ fn execute_ssh_command(hostname: &str, username: &str, command: &str, common_suf
};
// Display completion message
println!("{} - COMPLETED (Exit code: [{}])", display_name.yellow().bold(), code_string);
println!(
"{} - COMPLETED (Exit code: [{}])",
display_name.yellow().bold(),
code_string
);
Ok(exit_code)
}
@ -377,7 +401,14 @@ fn execute_ssh_command(hostname: &str, username: &str, command: &str, common_suf
/// * `parallel` - Maximum number of parallel connections
/// * `code_only` - Whether to display only exit codes
/// * `common_suffix` - Optional common suffix for hostname display formatting
fn execute_with_massh(hosts: &[(String, IpAddr, usize)], username: &str, command: &str, parallel: i32, code_only: bool, common_suffix: &Option<String>) {
fn execute_with_massh(
hosts: &[(String, IpAddr, usize)],
username: &str,
command: &str,
parallel: i32,
code_only: bool,
common_suffix: &Option<String>,
) {
// Create a lookup table for host data using IP addresses as keys
let mut hosts_and_ips: HashMap<IpAddr, (String, usize)> = HashMap::new();
let mut massh_hosts: Vec<MasshHostConfig> = Vec::new();
@ -589,8 +620,9 @@ fn main() {
// Results are stored with original indices to maintain order
let resolved_ips_with_indices = Arc::new(Mutex::new(Vec::<(String, IpAddr, usize)>::new()));
host_with_indices.par_iter().for_each(|(host, idx)| {
match lookup_host(&host.name) {
host_with_indices
.par_iter()
.for_each(|(host, idx)| match lookup_host(&host.name) {
Ok(ips) if !ips.is_empty() => {
let ip = ips[0];
let mut results = resolved_ips_with_indices.lock().unwrap();
@ -598,12 +630,19 @@ fn main() {
}
Ok(_) => {
let mut results = resolved_ips_with_indices.lock().unwrap();
results.push((host.name.clone(), IpAddr::V4(std::net::Ipv4Addr::new(0, 0, 0, 0)), *idx));
results.push((
host.name.clone(),
IpAddr::V4(std::net::Ipv4Addr::new(0, 0, 0, 0)),
*idx,
));
}
Err(_) => {
let mut results = resolved_ips_with_indices.lock().unwrap();
results.push((host.name.clone(), IpAddr::V4(std::net::Ipv4Addr::new(0, 0, 0, 0)), *idx));
}
results.push((
host.name.clone(),
IpAddr::V4(std::net::Ipv4Addr::new(0, 0, 0, 0)),
*idx,
));
}
});
@ -633,12 +672,18 @@ fn main() {
}
// Find common domain suffix to optimize display
let hostnames: Vec<String> = valid_hosts.iter().map(|(hostname, _, _)| hostname.clone()).collect();
let hostnames: Vec<String> = valid_hosts
.iter()
.map(|(hostname, _, _)| hostname.clone())
.collect();
let common_suffix = find_common_suffix(&hostnames);
// Inform user about display optimization if common suffix found
if let Some(suffix) = &common_suffix {
info!("Common domain suffix found: '{}' (will be displayed as '*')", suffix);
info!(
"Common domain suffix found: '{}' (will be displayed as '*')",
suffix
);
}
// Ask for confirmation before proceeding (unless --noconfirm is specified)
@ -681,7 +726,8 @@ fn main() {
// Execute SSH command in a separate thread
let handle = thread::spawn(move || {
match execute_ssh_command(&hostname, &username, &command, &common_suffix_clone) {
match execute_ssh_command(&hostname, &username, &command, &common_suffix_clone)
{
Ok(_) => (),
Err(e) => error!("Error executing command on {}: {}", hostname, e),
}
@ -699,6 +745,13 @@ fn main() {
}
} else {
// Use the embedded massh library implementation
execute_with_massh(&valid_hosts, &args.username, &args.command, args.parallel, args.code, &common_suffix);
execute_with_massh(
&valid_hosts,
&args.username,
&args.command,
args.parallel,
args.code,
&common_suffix,
);
}
}