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

tape: rename changer_id to label_text

Browse Source
This commit is contained in:
Dietmar Maurer
2021-01-13 13:26:59 +01:00
parent 9738dd545f
commit 8446fbca85
19 changed files with 171 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/bin/proxmox-tape.rs
View File

@ -42,7 +42,7 @@ use proxmox_backup::{
},
tape::{
open_drive,
complete_media_changer_id,
complete_media_label_text,
complete_media_set_uuid,
file_formats::{
PROXMOX_BACKUP_CONTENT_HEADER_MAGIC_1_0,
@ -210,7 +210,7 @@ async fn eject_media(
schema: DRIVE_NAME_SCHEMA,
optional: true,
},
"changer-id": {
"label-text": {
schema: MEDIA_LABEL_SCHEMA,
},
},
@ -243,7 +243,7 @@ async fn load_media(
schema: DRIVE_NAME_SCHEMA,
optional: true,
},
"changer-id": {
"label-text": {
schema: MEDIA_LABEL_SCHEMA,
},
},
@ -351,7 +351,7 @@ async fn unload_media(
schema: DRIVE_NAME_SCHEMA,
optional: true,
},
"changer-id": {
"label-text": {
schema: MEDIA_LABEL_SCHEMA,
},
},
@ -411,7 +411,7 @@ async fn read_label(
};
let options = default_table_format_options()
.column(ColumnConfig::new("changer-id"))
.column(ColumnConfig::new("label-text"))
.column(ColumnConfig::new("uuid"))
.column(ColumnConfig::new("ctime").renderer(render_epoch))
.column(ColumnConfig::new("pool"))
@ -487,7 +487,7 @@ async fn inventory(
};
let options = default_table_format_options()
.column(ColumnConfig::new("changer-id"))
.column(ColumnConfig::new("label-text"))
.column(ColumnConfig::new("uuid"))
;
@ -950,9 +950,9 @@ fn main() {
.insert(
"load-media",
CliCommand::new(&API_METHOD_LOAD_MEDIA)
.arg_param(&["changer-id"])
.arg_param(&["label-text"])
.completion_cb("drive", complete_drive_name)
.completion_cb("changer-id", complete_media_changer_id)
.completion_cb("label-text", complete_media_label_text)
)
.insert(
"load-media-from-slot",
@ -968,9 +968,9 @@ fn main() {
.insert(
"export-media",
CliCommand::new(&API_METHOD_EXPORT_MEDIA)
.arg_param(&["changer-id"])
.arg_param(&["label-text"])
.completion_cb("drive", complete_drive_name)
.completion_cb("changer-id", complete_media_changer_id)
.completion_cb("label-text", complete_media_label_text)
)
;

4
src/bin/proxmox_tape/changer.rs
View File

@ -233,7 +233,7 @@ async fn get_status(
_ => unreachable!(),
};
let render_changer_id = |value: &Value, _record: &Value| -> Result<String, Error> {
let render_label_text = |value: &Value, _record: &Value| -> Result<String, Error> {
if value.is_null() {
return Ok(String::new());
}
@ -250,7 +250,7 @@ async fn get_status(
.sortby("entry-id", false)
.column(ColumnConfig::new("entry-kind"))
.column(ColumnConfig::new("entry-id"))
.column(ColumnConfig::new("changer-id").renderer(render_changer_id))
.column(ColumnConfig::new("label-text").renderer(render_label_text))
.column(ColumnConfig::new("loaded-slot"))
;

14
src/bin/proxmox_tape/media.rs
View File

@ -21,7 +21,7 @@ use proxmox_backup::{
tape::media::MediaContentListFilter,
},
tape::{
complete_media_changer_id,
complete_media_label_text,
complete_media_uuid,
complete_media_set_uuid,
},
@ -41,14 +41,14 @@ pub fn media_commands() -> CommandLineInterface {
.insert(
"destroy",
CliCommand::new(&api2::tape::media::API_METHOD_DESTROY_MEDIA)
.arg_param(&["changer-id"])
.completion_cb("changer-id", complete_media_changer_id)
.arg_param(&["label-text"])
.completion_cb("label-text", complete_media_label_text)
)
.insert(
"content",
CliCommand::new(&API_METHOD_LIST_CONTENT)
.completion_cb("pool", complete_pool_name)
.completion_cb("changer-id", complete_media_changer_id)
.completion_cb("label-text", complete_media_label_text)
.completion_cb("media", complete_media_uuid)
.completion_cb("media-set", complete_media_set_uuid)
)
@ -116,8 +116,8 @@ async fn list_media(
.sortby("pool", false)
.sortby("media-set-uuid", false)
.sortby("seq-nr", false)
.sortby("changer-id", false)
.column(ColumnConfig::new("changer-id"))
.sortby("label-text", false)
.column(ColumnConfig::new("label-text"))
.column(ColumnConfig::new("pool"))
.column(ColumnConfig::new("media-set-name"))
.column(ColumnConfig::new("seq-nr"))
@ -165,7 +165,7 @@ fn list_content(
.sortby("seq-nr", false)
.sortby("snapshot", false)
.sortby("backup-time", false)
.column(ColumnConfig::new("changer-id"))
.column(ColumnConfig::new("label-text"))
.column(ColumnConfig::new("pool"))
.column(ColumnConfig::new("media-set-name"))
.column(ColumnConfig::new("seq-nr"))