cleanup WorkerTaskContext

src/api2/tape/backup.rs

@@ -22,7 +22,7 @@ use pbs_api_types::{
 
 use pbs_datastore::StoreProgress;
 use pbs_datastore::backup_info::{BackupDir, BackupInfo};
-use pbs_tools::{task_log, task_warn};
+use pbs_tools::{task_log, task_warn, task::WorkerTaskContext};
 use pbs_config::CachedUserInfo;
 use proxmox_rest_server::WorkerTask;
 

src/api2/tape/restore.rs

@@ -45,7 +45,7 @@ use pbs_tape::{
     TapeRead, BlockReadError, MediaContentHeader,
     PROXMOX_BACKUP_CONTENT_HEADER_MAGIC_1_0,
 };
-use pbs_tools::{task_log, task_warn};
+use pbs_tools::{task_log, task_warn, task::WorkerTaskContext};
 use proxmox_rest_server::WorkerTask;
 
 use crate::{

src/tape/drive/mod.rs

@@ -30,13 +30,12 @@ use proxmox::{
 
 use pbs_api_types::{VirtualTapeDrive, LtoTapeDrive, Fingerprint};
 use pbs_config::key_config::KeyConfig;
-use pbs_tools::task_log;
+use pbs_tools::{task_log, task::WorkerTaskContext};
 
 use pbs_tape::{
     TapeWrite, TapeRead, BlockReadError, MediaContentHeader,
     sg_tape::TapeAlertFlags,
 };
-use proxmox_rest_server::WorkerTask;
 
 use crate::{
     server::send_load_media_email,
@@ -355,7 +354,7 @@ impl std::fmt::Display for TapeRequestError {
 ///
 /// Returns a handle to the opened drive and the media labels.
 pub fn request_and_load_media(
-    worker: &WorkerTask,
+    worker: &dyn WorkerTaskContext,
     config: &SectionConfigData,
     drive: &str,
     label: &MediaLabel,