tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update proxmox dependency to 0.1.12

Browse Source
This commit is contained in:
Dietmar Maurer 2020-01-31 06:59:17 +01:00
parent 43592f290d
commit 93fbb4ef0a
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -34,7 +34,7 @@ pam = "0.7"
pam-sys = "0.5" pam-sys = "0.5"
percent-encoding = "2.1" percent-encoding = "2.1"
pin-utils = "0.1.0-alpha" pin-utils = "0.1.0-alpha"
proxmox = { version = "0.1.10", features = [ "sortable-macro", "api-macro" ] } proxmox = { version = "0.1.12", features = [ "sortable-macro", "api-macro" ] }
#proxmox = { git = "ssh://gitolite3@proxdev.maurer-it.com/rust/proxmox", version = "0.1.2", features = [ "sortable-macro", "api-macro" ] } #proxmox = { git = "ssh://gitolite3@proxdev.maurer-it.com/rust/proxmox", version = "0.1.2", features = [ "sortable-macro", "api-macro" ] }
#proxmox = { path = "../proxmox/proxmox", features = [ "sortable-macro", "api-macro" ] } #proxmox = { path = "../proxmox/proxmox", features = [ "sortable-macro", "api-macro" ] }
regex = "1.2" regex = "1.2"

25
src/bin/proxmox-backup-manager.rs
View File

@ -94,18 +94,14 @@ fn list_remotes(param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result<Value,
_ => unreachable!(), _ => unreachable!(),
}; };
let mut column_config = Vec::new();
column_config.push(ColumnConfig::new("name"));
column_config.push(ColumnConfig::new("host"));
column_config.push(ColumnConfig::new("userid"));
column_config.push(ColumnConfig::new("fingerprint"));
column_config.push(ColumnConfig::new("comment"));
let options = TableFormatOptions::new() let options = TableFormatOptions::new()
.noborder(false) .noborder(false)
.noheader(false) .noheader(false)
.column_config(column_config); .column(ColumnConfig::new("name"))
.column(ColumnConfig::new("host"))
.column(ColumnConfig::new("userid"))
.column(ColumnConfig::new("fingerprint"))
.column(ColumnConfig::new("comment"));
format_and_print_result_full(&mut data, info.returns, &output_format, &options); format_and_print_result_full(&mut data, info.returns, &output_format, &options);
@ -288,16 +284,13 @@ async fn task_list(param: Value) -> Result<Value, Error> {
let mut data = result["data"].take(); let mut data = result["data"].take();
let schema = api2::node::tasks::API_RETURN_SCHEMA_LIST_TASKS; let schema = api2::node::tasks::API_RETURN_SCHEMA_LIST_TASKS;
let mut column_config = Vec::new();
column_config.push(ColumnConfig::new("starttime").right_align(false).renderer(render_epoch));
column_config.push(ColumnConfig::new("endtime").right_align(false).renderer(render_epoch));
column_config.push(ColumnConfig::new("upid"));
column_config.push(ColumnConfig::new("status").renderer(render_status));
let options = TableFormatOptions::new() let options = TableFormatOptions::new()
.noborder(false) .noborder(false)
.noheader(false) .noheader(false)
.column_config(column_config); .column(ColumnConfig::new("starttime").right_align(false).renderer(render_epoch))
.column(ColumnConfig::new("endtime").right_align(false).renderer(render_epoch))
.column(ColumnConfig::new("upid"))
.column(ColumnConfig::new("status").renderer(render_status));
format_and_print_result_full(&mut data, schema, &output_format, &options); format_and_print_result_full(&mut data, schema, &output_format, &options);