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

tape: API type cleanup, use serde flatten to derive types

Browse Source
This commit is contained in:
Dietmar Maurer
2021-01-30 09:36:54 +01:00
parent 9586ce2f46
commit b5b99a52cd
8 changed files with 97 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/api2/tape/changer.rs
View File

@ -10,7 +10,7 @@ use crate::{
config,
api2::types::{
CHANGER_NAME_SCHEMA,
DriveListEntry,
ChangerListEntry,
MtxEntryKind,
MtxStatusEntry,
ScsiTapeChanger,
@ -25,7 +25,7 @@ use crate::{
ScsiMediaChange,
mtx_status_to_online_set,
},
lookup_drive,
lookup_device_identification,
},
};
@ -144,14 +144,14 @@ pub async fn transfer(
description: "The list of configured changers with model information.",
type: Array,
items: {
type: DriveListEntry,
type: ChangerListEntry,
},
},
)]
/// List changers
pub fn list_changers(
_param: Value,
) -> Result<Vec<DriveListEntry>, Error> {
) -> Result<Vec<ChangerListEntry>, Error> {
let (config, _digest) = config::drive::config()?;
@ -162,21 +162,8 @@ pub fn list_changers(
let mut list = Vec::new();
for changer in changer_list {
let mut entry = DriveListEntry {
name: changer.name,
path: changer.path.clone(),
changer: None,
changer_drivenum: None,
vendor: None,
model: None,
serial: None,
};
if let Some(info) = lookup_drive(&linux_changers, &changer.path) {
entry.vendor = Some(info.vendor.clone());
entry.model = Some(info.model.clone());
entry.serial = Some(info.serial.clone());
}
let info = lookup_device_identification(&linux_changers, &changer.path);
let entry = ChangerListEntry { config: changer, info };
list.push(entry);
}
Ok(list)

19
src/api2/tape/drive.rs
View File

@ -49,7 +49,7 @@ use crate::{
MediaCatalog,
MediaId,
linux_tape_device_list,
lookup_drive,
lookup_device_identification,
file_formats::{
MediaLabel,
MediaSetLabel,
@ -1133,21 +1133,8 @@ pub fn list_drives(
continue;
}
let mut entry = DriveListEntry {
name: drive.name,
path: drive.path.clone(),
changer: drive.changer,
changer_drivenum: drive.changer_drivenum,
vendor: None,
model: None,
serial: None,
};
if let Some(info) = lookup_drive(&linux_drives, &drive.path) {
entry.vendor = Some(info.vendor.clone());
entry.model = Some(info.model.clone());
entry.serial = Some(info.serial.clone());
}
let info = lookup_device_identification(&linux_drives, &drive.path);
let entry = DriveListEntry { config: drive, info };
list.push(entry);
}