proxmox-mirrors/proxmox-backup
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox-backup synced 2025-08-04 12:56:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

system report: factor out getting command output into helper fn

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2023-10-26 17:19:48 +02:00
parent 3b5cb8fd33
commit c55884d1a7
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/server/report.rs
View File

@ -148,6 +148,19 @@ fn get_directory_content(path: impl AsRef<Path>) -> String {
out
}
fn get_command_output(exe: &str, args: &Vec<&str>) -> String {
let output = Command::new(exe)
.env("PROXMOX_OUTPUT_NO_BORDER", "1")
.args(args)
.output();
let output = match output {
Ok(output) => String::from_utf8_lossy(&output.stdout).to_string(),
Err(err) => err.to_string(),
};
let output = output.trim_end();
format!("$ `{exe} {}`\n```\n{output}\n```", args.join(" "))
}
pub fn generate_report() -> String {
let file_contents = files()
.iter()
@ -173,18 +186,7 @@ pub fn generate_report() -> String {
let command_outputs = commands()
.iter()
.map(|(command, args)| {
let output = Command::new(command)
.env("PROXMOX_OUTPUT_NO_BORDER", "1")
.args(args)
.output();
let output = match output {
Ok(output) => String::from_utf8_lossy(&output.stdout).to_string(),
Err(err) => err.to_string(),
};
let output = output.trim_end();
format!("$ `{command} {}`\n```\n{output}\n```", args.join(" "))
})
.map(|(command, args)| get_command_output(command, args))
.collect::<Vec<String>>()
.join("\n\n");