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

tape: cleanup MediaLocation type for direct use with API

Browse Source
This commit is contained in:
Dietmar Maurer
2020-12-16 10:45:58 +01:00
parent 7680525eec
commit c1c2c8f635
7 changed files with 101 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,6 @@ use proxmox_backup::{
self,
types::{
MEDIA_POOL_NAME_SCHEMA,
MediaLocationKind,
MediaStatus,
MediaListEntry,
},
@ -72,19 +71,6 @@ async fn list_media(
_ => unreachable!(),
};
fn render_location(_value: &Value, record: &Value) -> Result<String, Error> {
let record: MediaListEntry = serde_json::from_value(record.clone())?;
Ok(match record.location {
MediaLocationKind::Online => {
record.location_hint.unwrap_or(String::from("-"))
}
MediaLocationKind::Offline => String::from("offline"),
MediaLocationKind::Vault => {
format!("V({})", record.location_hint.unwrap_or(String::from("-")))
}
})
}
fn render_status(_value: &Value, record: &Value) -> Result<String, Error> {
let record: MediaListEntry = serde_json::from_value(record.clone())?;
Ok(match record.status {
@ -115,7 +101,7 @@ async fn list_media(
.column(ColumnConfig::new("media-set-name"))
.column(ColumnConfig::new("seq-nr"))
.column(ColumnConfig::new("status").renderer(render_status))
.column(ColumnConfig::new("location").renderer(render_location))
.column(ColumnConfig::new("location"))
.column(ColumnConfig::new("uuid"))
.column(ColumnConfig::new("media-set-uuid"))
;