cleanup proxmox_backup::backup module

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

src/api2/tape/backup.rs

@@ -15,7 +15,9 @@ use proxmox::{
     },
 };
 
-use pbs_datastore::{task_log, task_warn};
+use pbs_api_types::{Authid, Userid};
+use pbs_datastore::{task_log, task_warn, StoreProgress};
+use pbs_datastore::backup_info::{BackupDir, BackupInfo};
 use pbs_datastore::task::TaskState;
 
 use crate::{
@@ -42,18 +44,11 @@ use crate::{
             compute_schedule_status,
         },
     },
-    backup::{
-        DataStore,
-        BackupDir,
-        BackupInfo,
-        StoreProgress,
-    },
+    backup::DataStore,
     api2::types::{
-        Authid,
         UPID_SCHEMA,
         JOB_ID_SCHEMA,
         MediaPoolConfig,
-        Userid,
     },
     server::WorkerTask,
     tape::{

src/api2/tape/media.rs

@@ -10,6 +10,8 @@ use proxmox::{
     tools::Uuid,
 };
 
+use pbs_datastore::backup_info::BackupDir;
+
 use crate::{
     config::{
         self,
@@ -34,9 +36,6 @@ use crate::{
         MediaContentEntry,
         VAULT_NAME_SCHEMA,
     },
-    backup::{
-        BackupDir,
-    },
     tape::{
         TAPE_STATUS_DIR,
         Inventory,

src/api2/tape/restore.rs

@@ -28,7 +28,13 @@ use proxmox::{
     },
 };
 
-use pbs_datastore::{task_log, task_warn};
+use pbs_api_types::CryptMode;
+use pbs_datastore::{task_log, task_warn, DataBlob};
+use pbs_datastore::backup_info::BackupDir;
+use pbs_datastore::dynamic_index::DynamicIndexReader;
+use pbs_datastore::fixed_index::FixedIndexReader;
+use pbs_datastore::index::IndexFile;
+use pbs_datastore::manifest::{archive_type, ArchiveType, BackupManifest, MANIFEST_BLOB_NAME};
 use pbs_datastore::task::TaskState;
 
 use crate::{
@@ -51,19 +57,7 @@ use crate::{
             PRIV_TAPE_READ,
         },
     },
-    backup::{
-        ArchiveType,
-        archive_type,
-        IndexFile,
-        MANIFEST_BLOB_NAME,
-        CryptMode,
-        DataStore,
-        DynamicIndexReader,
-        FixedIndexReader,
-        BackupDir,
-        DataBlob,
-        BackupManifest,
-    },
+    backup::DataStore,
     server::{
         lookup_user_email,
         WorkerTask,