use chrono::{Local, Utc, TimeZone};
use std::path::{Path, PathBuf};
use std::collections::{HashSet, HashMap};
-use std::io::Write;
+use std::io::{BufReader, Write, Seek, SeekFrom};
+use std::os::unix::fs::OpenOptionsExt;
+
use proxmox::tools::fs::{file_get_contents, file_get_json, file_set_contents, image_size};
use proxmox_backup::tools;
use proxmox_backup::api_schema::router::*;
use proxmox_backup::client::*;
use proxmox_backup::backup::*;
-use proxmox_backup::pxar;
+use proxmox_backup::pxar::{ self, catalog::* };
//use proxmox_backup::backup::image_index::*;
//use proxmox_backup::config::datastore;
use serde_json::{json, Value};
//use hyper::Body;
-use std::sync::Arc;
+use std::sync::{Arc, Mutex};
use regex::Regex;
use xdg::BaseDirectories;
result
}
-fn backup_directory<P: AsRef<Path>>(
+
async fn backup_directory<P: AsRef<Path>>(
client: &BackupClient,
dir_path: P,
archive_name: &str,
verbose: bool,
skip_lost_and_found: bool,
crypt_config: Option<Arc<CryptConfig>>,
+ catalog: Arc<Mutex<CatalogBlobWriter<std::fs::File>>>,
) -> Result<BackupStats, Error> {
- let pxar_stream = PxarBackupStream::open(dir_path.as_ref(), device_set, verbose, skip_lost_and_found)?;
- let chunk_stream = ChunkStream::new(pxar_stream, chunk_size);
+ let pxar_stream = PxarBackupStream::open(dir_path.as_ref(), device_set, verbose, skip_lost_and_found, catalog)?;
+ let mut chunk_stream = ChunkStream::new(pxar_stream, chunk_size);
- let (tx, rx) = mpsc::channel(10); // allow to buffer 10 chunks
+ let (mut tx, rx) = mpsc::channel(10); // allow to buffer 10 chunks
let stream = rx
- .map_err(Error::from)
- .and_then(|x| x); // flatten
+ .map_err(Error::from);
// spawn chunker inside a separate task so that it can run parallel
- tokio::spawn(
- tx.send_all(chunk_stream.then(|r| Ok(r)))
- .map_err(|_| {}).map(|_| ())
- );
+ tokio::spawn(async move {
+ let _ = tx.send_all(&mut chunk_stream).await;
+ });
- let stats = client.upload_stream(archive_name, stream, "dynamic", None, crypt_config).wait()?;
+ let stats = client
+ .upload_stream(archive_name, stream, "dynamic", None, crypt_config)
+ .await?;
Ok(stats)
}
-fn backup_image<P: AsRef<Path>>(
+
async fn backup_image<P: AsRef<Path>>(
client: &BackupClient,
image_path: P,
archive_name: &str,
let path = image_path.as_ref().to_owned();
- let file = tokio::fs::File::open(path).wait()?;
+ let file = tokio::fs::File::open(path).await?;
let stream = tokio::codec::FramedRead::new(file, tokio::codec::BytesCodec::new())
.map_err(Error::from);
let stream = FixedChunkStream::new(stream, chunk_size.unwrap_or(4*1024*1024));
- let stats = client.upload_stream(archive_name, stream, "fixed", Some(image_size), crypt_config).wait()?;
+ let stats = client
+ .upload_stream(archive_name, stream, "fixed", Some(image_size), crypt_config)
+ .await?;
Ok(stats)
}
let path = format!("api2/json/admin/datastore/{}/groups", repo.store());
- let mut result = client.get(&path, None).wait()?;
+ let mut result = async_main(async move {
+ client.get(&path, None).await
+ })?;
record_repository(&repo);
args["backup-id"] = group.backup_id().into();
}
- let result = client.get(&path, Some(args)).wait()?;
+ let result = async_main(async move {
+ client.get(&path, Some(args)).await
+ })?;
record_repository(&repo);
let path = format!("api2/json/admin/datastore/{}/snapshots", repo.store());
- let result = client.delete(&path, Some(json!({
- "backup-type": snapshot.group().backup_type(),
- "backup-id": snapshot.group().backup_id(),
- "backup-time": snapshot.backup_time().timestamp(),
- }))).wait()?;
+ let result = async_main(async move {
+ client.delete(&path, Some(json!({
+ "backup-type": snapshot.group().backup_type(),
+ "backup-id": snapshot.group().backup_id(),
+ "backup-time": snapshot.backup_time().timestamp(),
+ }))).await
+ })?;
record_repository(&repo);
Ok(result)
}
+fn api_login(
+ param: Value,
+ _info: &ApiMethod,
+ _rpcenv: &mut dyn RpcEnvironment,
+) -> Result<Value, Error> {
+
+ let repo = extract_repository_from_value(¶m)?;
+
+ let client = HttpClient::new(repo.host(), repo.user())?;
+ async_main(async move { client.login().await })?;
+
+ record_repository(&repo);
+
+ Ok(Value::Null)
+}
+
+fn api_logout(
+ param: Value,
+ _info: &ApiMethod,
+ _rpcenv: &mut dyn RpcEnvironment,
+) -> Result<Value, Error> {
+
+ let repo = extract_repository_from_value(¶m)?;
+
+ delete_ticket_info(repo.host(), repo.user())?;
+
+ Ok(Value::Null)
+}
+
+fn dump_catalog(
+ param: Value,
+ _info: &ApiMethod,
+ _rpcenv: &mut dyn RpcEnvironment,
+) -> Result<Value, Error> {
+
+ let repo = extract_repository_from_value(¶m)?;
+
+ let path = tools::required_string_param(¶m, "snapshot")?;
+ let snapshot = BackupDir::parse(path)?;
+
+ let keyfile = param["keyfile"].as_str().map(|p| PathBuf::from(p));
+
+ let crypt_config = match keyfile {
+ None => None,
+ Some(path) => {
+ let (key, _) = load_and_decrtypt_key(&path, get_encryption_key_password)?;
+ Some(Arc::new(CryptConfig::new(key)?))
+ }
+ };
+
+ let client = HttpClient::new(repo.host(), repo.user())?;
+
+ async_main(async move {
+ let client = client.start_backup_reader(
+ repo.store(),
+ &snapshot.group().backup_type(),
+ &snapshot.group().backup_id(),
+ snapshot.backup_time(), true).await?;
+
+ let blob_file = std::fs::OpenOptions::new()
+ .read(true)
+ .write(true)
+ .custom_flags(libc::O_TMPFILE)
+ .open("/tmp")?;
+
+ let mut blob_file = client.download("catalog.blob", blob_file).await?;
+
+ blob_file.seek(SeekFrom::Start(0))?;
+
+ let reader = BufReader::new(blob_file);
+ let mut catalog_reader = CatalogBlobReader::new(reader, crypt_config)?;
+
+ catalog_reader.dump()?;
+
+ record_repository(&repo);
+
+ Ok::<(), Error>(())
+ })?;
+
+ Ok(Value::Null)
+}
+
fn list_snapshot_files(
param: Value,
_info: &ApiMethod,
let path = format!("api2/json/admin/datastore/{}/files", repo.store());
- let mut result = client.get(&path, Some(json!({
- "backup-type": snapshot.group().backup_type(),
- "backup-id": snapshot.group().backup_id(),
- "backup-time": snapshot.backup_time().timestamp(),
- }))).wait()?;
+ let mut result = async_main(async move {
+ client.get(&path, Some(json!({
+ "backup-type": snapshot.group().backup_type(),
+ "backup-id": snapshot.group().backup_id(),
+ "backup-time": snapshot.backup_time().timestamp(),
+ }))).await
+ })?;
record_repository(&repo);
let path = format!("api2/json/admin/datastore/{}/gc", repo.store());
- let result = client.post(&path, None).wait()?;
+ let result = async_main(async move { client.post(&path, None).await })?;
record_repository(&repo);
}
};
- let client = client.start_backup(repo.store(), backup_type, &backup_id, backup_time, verbose).wait()?;
+ async_main(async move {
+ let client = client
+ .start_backup(repo.store(), backup_type, &backup_id, backup_time, verbose)
+ .await?;
+
+ let mut file_list = vec![];
+
+ // fixme: encrypt/sign catalog?
+ let catalog_file = std::fs::OpenOptions::new()
+ .write(true)
+ .read(true)
+ .custom_flags(libc::O_TMPFILE)
+ .open("/tmp")?;
+
+ let catalog = Arc::new(Mutex::new(CatalogBlobWriter::new_compressed(catalog_file)?));
+ let mut upload_catalog = false;
+
+ for (backup_type, filename, target, size) in upload_list {
+ match backup_type {
+ BackupType::CONFIG => {
+ println!("Upload config file '{}' to '{:?}' as {}", filename, repo, target);
+ let stats = client
+ .upload_blob_from_file(&filename, &target, crypt_config.clone(), true)
+ .await?;
+ file_list.push((target, stats));
+ }
+ BackupType::LOGFILE => { // fixme: remove - not needed anymore ?
+ println!("Upload log file '{}' to '{:?}' as {}", filename, repo, target);
+ let stats = client
+ .upload_blob_from_file(&filename, &target, crypt_config.clone(), true)
+ .await?;
+ file_list.push((target, stats));
+ }
+ BackupType::PXAR => {
+ upload_catalog = true;
+ println!("Upload directory '{}' to '{:?}' as {}", filename, repo, target);
+ catalog.lock().unwrap().start_directory(std::ffi::CString::new(target.as_str())?.as_c_str())?;
+ let stats = backup_directory(
+ &client,
+ &filename,
+ &target,
+ chunk_size_opt,
+ devices.clone(),
+ verbose,
+ skip_lost_and_found,
+ crypt_config.clone(),
+ catalog.clone(),
+ ).await?;
+ file_list.push((target, stats));
+ catalog.lock().unwrap().end_directory()?;
+ }
+ BackupType::IMAGE => {
+ println!("Upload image '{}' to '{:?}' as {}", filename, repo, target);
+ let stats = backup_image(
+ &client,
+ &filename,
+ &target,
+ size,
+ chunk_size_opt,
+ verbose,
+ crypt_config.clone(),
+ ).await?;
+ file_list.push((target, stats));
+ }
+ }
+ }
- let mut file_list = vec![];
+ // finalize and upload catalog
+ if upload_catalog {
+ let mutex = Arc::try_unwrap(catalog)
+ .map_err(|_| format_err!("unable to get catalog (still used)"))?;
+ let mut catalog_file = mutex.into_inner().unwrap().finish()?;
- for (backup_type, filename, target, size) in upload_list {
- match backup_type {
- BackupType::CONFIG => {
- println!("Upload config file '{}' to '{:?}' as {}", filename, repo, target);
- let stats = client.upload_blob_from_file(&filename, &target, crypt_config.clone(), true).wait()?;
- file_list.push((target, stats));
- }
- BackupType::LOGFILE => { // fixme: remove - not needed anymore ?
- println!("Upload log file '{}' to '{:?}' as {}", filename, repo, target);
- let stats = client.upload_blob_from_file(&filename, &target, crypt_config.clone(), true).wait()?;
- file_list.push((target, stats));
- }
- BackupType::PXAR => {
- println!("Upload directory '{}' to '{:?}' as {}", filename, repo, target);
- let stats = backup_directory(
- &client,
- &filename,
- &target,
- chunk_size_opt,
- devices.clone(),
- verbose,
- skip_lost_and_found,
- crypt_config.clone(),
- )?;
- file_list.push((target, stats));
- }
- BackupType::IMAGE => {
- println!("Upload image '{}' to '{:?}' as {}", filename, repo, target);
- let stats = backup_image(
- &client,
- &filename,
- &target,
- size,
- chunk_size_opt,
- verbose,
- crypt_config.clone(),
- )?;
- file_list.push((target, stats));
- }
+ let target = "catalog.blob";
+
+ catalog_file.seek(SeekFrom::Start(0))?;
+
+ let stats = client.upload_blob(catalog_file, target).await?;
+ file_list.push((target.to_owned(), stats));
}
- }
- if let Some(rsa_encrypted_key) = rsa_encrypted_key {
- let target = "rsa-encrypted.key";
- println!("Upload RSA encoded key to '{:?}' as {}", repo, target);
- let stats = client.upload_blob_from_data(rsa_encrypted_key, target, None, false, false).wait()?;
- file_list.push((format!("{}.blob", target), stats));
-
- // openssl rsautl -decrypt -inkey master-private.pem -in rsa-encrypted.key -out t
- /*
- let mut buffer2 = vec![0u8; rsa.size() as usize];
- let pem_data = file_get_contents("master-private.pem")?;
- let rsa = openssl::rsa::Rsa::private_key_from_pem(&pem_data)?;
- let len = rsa.private_decrypt(&buffer, &mut buffer2, openssl::rsa::Padding::PKCS1)?;
- println!("TEST {} {:?}", len, buffer2);
- */
- }
+ if let Some(rsa_encrypted_key) = rsa_encrypted_key {
+ let target = "rsa-encrypted.key";
+ println!("Upload RSA encoded key to '{:?}' as {}", repo, target);
+ let stats = client
+ .upload_blob_from_data(rsa_encrypted_key, target, None, false, false)
+ .await?;
+ file_list.push((format!("{}.blob", target), stats));
+
+ // openssl rsautl -decrypt -inkey master-private.pem -in rsa-encrypted.key -out t
+ /*
+ let mut buffer2 = vec![0u8; rsa.size() as usize];
+ let pem_data = file_get_contents("master-private.pem")?;
+ let rsa = openssl::rsa::Rsa::private_key_from_pem(&pem_data)?;
+ let len = rsa.private_decrypt(&buffer, &mut buffer2, openssl::rsa::Padding::PKCS1)?;
+ println!("TEST {} {:?}", len, buffer2);
+ */
+ }
- // create index.json
- let file_list = file_list.iter()
- .fold(vec![], |mut acc, (filename, stats)| {
- acc.push(json!({
- "filename": filename,
- "size": stats.size,
- "csum": proxmox::tools::digest_to_hex(&stats.csum),
- }));
- acc
- });
+ // create index.json
+ let file_list = file_list.iter()
+ .fold(vec![], |mut acc, (filename, stats)| {
+ acc.push(json!({
+ "filename": filename,
+ "size": stats.size,
+ "csum": proxmox::tools::digest_to_hex(&stats.csum),
+ }));
+ acc
+ });
- let index = json!({
- "backup-type": backup_type,
- "backup-id": backup_id,
- "backup-time": backup_time.timestamp(),
- "files": file_list,
- });
+ let index = json!({
+ "backup-type": backup_type,
+ "backup-id": backup_id,
+ "backup-time": backup_time.timestamp(),
+ "files": file_list,
+ });
- println!("Upload index.json to '{:?}'", repo);
- let index_data = serde_json::to_string_pretty(&index)?.into();
- client.upload_blob_from_data(index_data, "index.json.blob", crypt_config.clone(), true, true).wait()?;
+ println!("Upload index.json to '{:?}'", repo);
+ let index_data = serde_json::to_string_pretty(&index)?.into();
+ client
+ .upload_blob_from_data(index_data, "index.json.blob", crypt_config.clone(), true, true)
+ .await?;
- client.finish().wait()?;
+ client.finish().await?;
- let end_time = Local::now();
- let elapsed = end_time.signed_duration_since(start_time);
- println!("Duration: {}", elapsed);
+ let end_time = Local::now();
+ let elapsed = end_time.signed_duration_since(start_time);
+ println!("Duration: {}", elapsed);
- println!("End Time: {}", end_time.to_rfc3339_opts(chrono::SecondsFormat::Secs, false));
+ println!("End Time: {}", end_time.to_rfc3339_opts(chrono::SecondsFormat::Secs, false));
- Ok(Value::Null)
+ Ok(Value::Null)
+ })
}
fn complete_backup_source(arg: &str, param: &HashMap<String, String>) -> Vec<String> {
_info: &ApiMethod,
_rpcenv: &mut dyn RpcEnvironment,
) -> Result<Value, Error> {
+ async_main(restore_do(param))
+}
+async fn restore_do(param: Value) -> Result<Value, Error> {
let repo = extract_repository_from_value(¶m)?;
let verbose = param["verbose"].as_bool().unwrap_or(false);
let result = client.get(&path, Some(json!({
"backup-type": group.backup_type(),
"backup-id": group.backup_id(),
- }))).wait()?;
+ }))).await?;
let list = result["data"].as_array().unwrap();
if list.len() == 0 {
format!("{}.blob", archive_name)
};
- let client = client.start_backup_reader(repo.store(), &backup_type, &backup_id, backup_time, true).wait()?;
-
- use std::os::unix::fs::OpenOptionsExt;
+ let client = client
+ .start_backup_reader(repo.store(), &backup_type, &backup_id, backup_time, true)
+ .await?;
let tmpfile = std::fs::OpenOptions::new()
.write(true)
.custom_flags(libc::O_TMPFILE)
.open("/tmp")?;
- if server_archive_name.ends_with(".blob") {
+ const INDEX_BLOB_NAME: &str = "index.json.blob";
- let writer = Vec::with_capacity(1024*1024);
- let blob_data = client.download(&server_archive_name, writer).wait()?;
- let blob = DataBlob::from_raw(blob_data)?;
- blob.verify_crc()?;
+ let index_data = client.download(INDEX_BLOB_NAME, Vec::with_capacity(64*1024)).await?;
+ let blob = DataBlob::from_raw(index_data)?;
+ blob.verify_crc()?;
+ let backup_index_data = blob.decode(crypt_config.clone())?;
+ let backup_index: Value = serde_json::from_slice(&backup_index_data[..])?;
- let raw_data = match crypt_config {
- Some(ref crypt_config) => blob.decode(Some(crypt_config))?,
- None => blob.decode(None)?,
- };
+ if server_archive_name == INDEX_BLOB_NAME {
+ if let Some(target) = target {
+ file_set_contents(target, &backup_index_data, None)?;
+ } else {
+ let stdout = std::io::stdout();
+ let mut writer = stdout.lock();
+ writer.write_all(&backup_index_data)
+ .map_err(|err| format_err!("unable to pipe data - {}", err))?;
+ }
+
+ } else if server_archive_name.ends_with(".blob") {
+ let mut tmpfile = client.download(&server_archive_name, tmpfile).wait()?;
+ tmpfile.seek(SeekFrom::Start(0))?;
+ let mut reader = DataBlobReader::new(tmpfile, crypt_config)?;
if let Some(target) = target {
- file_set_contents(target, &raw_data, None)?;
+ let mut writer = std::fs::OpenOptions::new()
+ .write(true)
+ .create(true)
+ .create_new(true)
+ .open(target)
+ .map_err(|err| format_err!("unable to create target file {:?} - {}", target, err))?;
+ std::io::copy(&mut reader, &mut writer)?;
} else {
let stdout = std::io::stdout();
let mut writer = stdout.lock();
- writer.write_all(&raw_data)
+ std::io::copy(&mut reader, &mut writer)
.map_err(|err| format_err!("unable to pipe data - {}", err))?;
}
} else if server_archive_name.ends_with(".didx") {
- let tmpfile = client.download(&server_archive_name, tmpfile).wait()?;
+ let tmpfile = client.download(&server_archive_name, tmpfile).await?;
let index = DynamicIndexReader::new(tmpfile)
.map_err(|err| format_err!("unable to read dynamic index '{}' - {}", archive_name, err))?;
.map_err(|err| format_err!("unable to pipe data - {}", err))?;
}
} else if server_archive_name.ends_with(".fidx") {
- let tmpfile = client.download(&server_archive_name, tmpfile).wait()?;
+ let tmpfile = client.download(&server_archive_name, tmpfile).await?;
let index = FixedIndexReader::new(tmpfile)
.map_err(|err| format_err!("unable to read fixed index '{}' - {}", archive_name, err))?;
Some(path) => {
let (key, _created) = load_and_decrtypt_key(&path, get_encryption_key_password)?;
let crypt_config = CryptConfig::new(key)?;
- Some(crypt_config)
+ Some(Arc::new(crypt_config))
}
};
let data = file_get_contents(logfile)?;
- let blob = if let Some(ref crypt_config) = crypt_config {
- DataBlob::encode(&data, Some(crypt_config), true)?
- } else {
- DataBlob::encode(&data, None, true)?
- };
+ let blob = DataBlob::encode(&data, crypt_config, true)?;
let raw_data = blob.into_inner();
let body = hyper::Body::from(raw_data);
- let result = client.upload("application/octet-stream", body, &path, Some(args)).wait()?;
-
- Ok(result)
+ async_main(async move {
+ client.upload("application/octet-stream", body, &path, Some(args)).await
+ })
}
fn prune(
param["backup-type"] = group.backup_type().into();
param["backup-id"] = group.backup_id().into();
- let _result = client.post(&path, Some(param)).wait()?;
+ let _result = async_main(async move { client.post(&path, Some(param)).await })?;
record_repository(&repo);
let path = format!("api2/json/admin/datastore/{}/status", repo.store());
- let result = client.get(&path, None).wait()?;
+ let result = async_main(async move { client.get(&path, None).await })?;
let data = &result["data"];
record_repository(&repo);
}
// like get, but simply ignore errors and return Null instead
-fn try_get(repo: &BackupRepository, url: &str) -> Value {
+async fn try_get(repo: &BackupRepository, url: &str) -> Value {
let client = match HttpClient::new(repo.host(), repo.user()) {
Ok(v) => v,
_ => return Value::Null,
};
- let mut resp = match client.get(url, None).wait() {
+ let mut resp = match client.get(url, None).await {
Ok(v) => v,
_ => return Value::Null,
};
}
fn complete_backup_group(_arg: &str, param: &HashMap<String, String>) -> Vec<String> {
+ async_main(async { complete_backup_group_do(param).await })
+}
+
+async fn complete_backup_group_do(param: &HashMap<String, String>) -> Vec<String> {
let mut result = vec![];
let path = format!("api2/json/admin/datastore/{}/groups", repo.store());
- let data = try_get(&repo, &path);
+ let data = try_get(&repo, &path).await;
if let Some(list) = data.as_array() {
for item in list {
}
fn complete_group_or_snapshot(arg: &str, param: &HashMap<String, String>) -> Vec<String> {
+ async_main(async { complete_group_or_snapshot_do(arg, param).await })
+}
- let mut result = vec![];
-
- let repo = match extract_repository_from_map(param) {
- Some(v) => v,
- _ => return result,
- };
+async fn complete_group_or_snapshot_do(arg: &str, param: &HashMap<String, String>) -> Vec<String> {
if arg.matches('/').count() < 2 {
- let groups = complete_backup_group(arg, param);
+ let groups = complete_backup_group_do(param).await;
+ let mut result = vec![];
for group in groups {
result.push(group.to_string());
result.push(format!("{}/", group));
return result;
}
- let mut parts = arg.split('/');
- let query = tools::json_object_to_query(json!({
- "backup-type": parts.next().unwrap(),
- "backup-id": parts.next().unwrap(),
- })).unwrap();
+ complete_backup_snapshot_do(param).await
+}
- let path = format!("api2/json/admin/datastore/{}/snapshots?{}", repo.store(), query);
+fn complete_backup_snapshot(_arg: &str, param: &HashMap<String, String>) -> Vec<String> {
+ async_main(async { complete_backup_snapshot_do(param).await })
+}
+
+async fn complete_backup_snapshot_do(param: &HashMap<String, String>) -> Vec<String> {
- let data = try_get(&repo, &path);
+ let mut result = vec![];
+
+ let repo = match extract_repository_from_map(param) {
+ Some(v) => v,
+ _ => return result,
+ };
+
+ let path = format!("api2/json/admin/datastore/{}/snapshots", repo.store());
+
+ let data = try_get(&repo, &path).await;
if let Some(list) = data.as_array() {
for item in list {
}
fn complete_server_file_name(_arg: &str, param: &HashMap<String, String>) -> Vec<String> {
+ async_main(async { complete_server_file_name_do(param).await })
+}
+
+async fn complete_server_file_name_do(param: &HashMap<String, String>) -> Vec<String> {
let mut result = vec![];
let path = format!("api2/json/admin/datastore/{}/files?{}", repo.store(), query);
- let data = try_get(&repo, &path);
+ let data = try_get(&repo, &path).await;
if let Some(list) = data.as_array() {
for item in list {
}
fn complete_archive_name(arg: &str, param: &HashMap<String, String>) -> Vec<String> {
-
complete_server_file_name(arg, param)
- .iter().map(|v| strip_server_file_expenstion(&v)).collect()
+ .iter()
+ .map(|v| strip_server_file_expenstion(&v))
+ .collect()
}
fn complete_chunk_size(_arg: &str, _param: &HashMap<String, String>) -> Vec<String> {
StringSchema::new("Path to encryption key. All data will be encrypted using this key."))
))
.arg_param(vec!["snapshot", "logfile"])
- .completion_cb("snapshot", complete_group_or_snapshot)
+ .completion_cb("snapshot", complete_backup_snapshot)
.completion_cb("logfile", tools::complete_file_name)
.completion_cb("keyfile", tools::complete_file_name)
.completion_cb("repository", complete_repository);
))
.arg_param(vec!["snapshot"])
.completion_cb("repository", complete_repository)
- .completion_cb("snapshot", complete_group_or_snapshot);
+ .completion_cb("snapshot", complete_backup_snapshot);
let garbage_collect_cmd_def = CliCommand::new(
ApiMethod::new(
))
.arg_param(vec!["snapshot"])
.completion_cb("repository", complete_repository)
- .completion_cb("snapshot", complete_group_or_snapshot);
+ .completion_cb("snapshot", complete_backup_snapshot);
+
+ let catalog_cmd_def = CliCommand::new(
+ ApiMethod::new(
+ dump_catalog,
+ ObjectSchema::new("Dump catalog.")
+ .required("snapshot", StringSchema::new("Snapshot path."))
+ .optional("repository", REPO_URL_SCHEMA.clone())
+ ))
+ .arg_param(vec!["snapshot"])
+ .completion_cb("repository", complete_repository)
+ .completion_cb("snapshot", complete_backup_snapshot);
let prune_cmd_def = CliCommand::new(
ApiMethod::new(
))
.completion_cb("repository", complete_repository);
+ let login_cmd_def = CliCommand::new(
+ ApiMethod::new(
+ api_login,
+ ObjectSchema::new("Try to login. If successful, store ticket.")
+ .optional("repository", REPO_URL_SCHEMA.clone())
+ ))
+ .completion_cb("repository", complete_repository);
+
+ let logout_cmd_def = CliCommand::new(
+ ApiMethod::new(
+ api_logout,
+ ObjectSchema::new("Logout (delete stored ticket).")
+ .optional("repository", REPO_URL_SCHEMA.clone())
+ ))
+ .completion_cb("repository", complete_repository);
+
let cmd_def = CliCommandMap::new()
.insert("backup".to_owned(), backup_cmd_def.into())
.insert("upload-log".to_owned(), upload_log_cmd_def.into())
.insert("forget".to_owned(), forget_cmd_def.into())
+ .insert("catalog".to_owned(), catalog_cmd_def.into())
.insert("garbage-collect".to_owned(), garbage_collect_cmd_def.into())
.insert("list".to_owned(), list_cmd_def.into())
+ .insert("login".to_owned(), login_cmd_def.into())
+ .insert("logout".to_owned(), logout_cmd_def.into())
.insert("prune".to_owned(), prune_cmd_def.into())
.insert("restore".to_owned(), restore_cmd_def.into())
.insert("snapshots".to_owned(), snapshots_cmd_def.into())
.insert("status".to_owned(), status_cmd_def.into())
.insert("key".to_owned(), key_mgmt_cli().into());
- hyper::rt::run(futures::future::lazy(move || {
- run_cli_command(cmd_def.into());
- Ok(())
- }));
+ run_cli_command(cmd_def.into());
+}
+fn async_main<F: Future>(fut: F) -> <F as Future>::Output {
+ let rt = tokio::runtime::Runtime::new().unwrap();
+ let ret = rt.block_on(fut);
+ rt.shutdown_now();
+ ret
}
projects / proxmox-backup.git / blobdiff