remove pbs-tools/src/cli.rs
Code is only used once in src/bin/proxmox_backup_debug/inspect.rs, so move it into that file. Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
This commit is contained in:
parent
689ed51397
commit
0df179c2b4
|
@ -1,16 +0,0 @@
|
||||||
use std::fs::File;
|
|
||||||
use std::io::{self, stdout, Write};
|
|
||||||
use std::path::Path;
|
|
||||||
use std::panic::{RefUnwindSafe, UnwindSafe};
|
|
||||||
|
|
||||||
/// Returns either a new file, if a path is given, or stdout, if no path is given.
|
|
||||||
pub fn outfile_or_stdout<P: AsRef<Path>>(
|
|
||||||
path: Option<P>,
|
|
||||||
) -> io::Result<Box<dyn Write + Send + Sync + Unpin + RefUnwindSafe + UnwindSafe>> {
|
|
||||||
if let Some(path) = path {
|
|
||||||
let f = File::create(path)?;
|
|
||||||
Ok(Box::new(f) as Box<_>)
|
|
||||||
} else {
|
|
||||||
Ok(Box::new(stdout()) as Box<_>)
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,5 +1,4 @@
|
||||||
pub mod cert;
|
pub mod cert;
|
||||||
pub mod cli;
|
|
||||||
pub mod crypt_config;
|
pub mod crypt_config;
|
||||||
pub mod format;
|
pub mod format;
|
||||||
pub mod io;
|
pub mod io;
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
use std::collections::HashSet;
|
use std::collections::HashSet;
|
||||||
use std::fs::File;
|
use std::fs::File;
|
||||||
use std::io::{Read, Seek, SeekFrom};
|
use std::io::{stdout, Read, Seek, SeekFrom, Write};
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
|
use std::panic::{RefUnwindSafe, UnwindSafe};
|
||||||
|
|
||||||
use anyhow::{bail, format_err, Error};
|
use anyhow::{bail, format_err, Error};
|
||||||
use serde_json::{json, Value};
|
use serde_json::{json, Value};
|
||||||
|
@ -14,7 +15,6 @@ use proxmox_router::cli::{
|
||||||
};
|
};
|
||||||
use proxmox_schema::api;
|
use proxmox_schema::api;
|
||||||
|
|
||||||
use pbs_tools::cli::outfile_or_stdout;
|
|
||||||
use pbs_tools::crypt_config::CryptConfig;
|
use pbs_tools::crypt_config::CryptConfig;
|
||||||
use pbs_datastore::dynamic_index::DynamicIndexReader;
|
use pbs_datastore::dynamic_index::DynamicIndexReader;
|
||||||
use pbs_datastore::file_formats::{
|
use pbs_datastore::file_formats::{
|
||||||
|
@ -27,6 +27,17 @@ use pbs_datastore::DataBlob;
|
||||||
use pbs_config::key_config::load_and_decrypt_key;
|
use pbs_config::key_config::load_and_decrypt_key;
|
||||||
use pbs_client::tools::key_source::get_encryption_key_password;
|
use pbs_client::tools::key_source::get_encryption_key_password;
|
||||||
|
|
||||||
|
// Returns either a new file, if a path is given, or stdout, if no path is given.
|
||||||
|
fn outfile_or_stdout<P: AsRef<Path>>(
|
||||||
|
path: Option<P>,
|
||||||
|
) -> std::io::Result<Box<dyn Write + Send + Sync + Unpin + RefUnwindSafe + UnwindSafe>> {
|
||||||
|
if let Some(path) = path {
|
||||||
|
let f = File::create(path)?;
|
||||||
|
Ok(Box::new(f) as Box<_>)
|
||||||
|
} else {
|
||||||
|
Ok(Box::new(stdout()) as Box<_>)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Decodes a blob and writes its content either to stdout or into a file
|
/// Decodes a blob and writes its content either to stdout or into a file
|
||||||
fn decode_blob(
|
fn decode_blob(
|
||||||
|
|
Loading…
Reference in New Issue