cleanup proxmox_backup::backup module

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

src/bin/proxmox-backup-proxy.rs

@@ -462,10 +462,8 @@ async fn schedule_datastore_garbage_collection() {
 
 async fn schedule_datastore_prune() {
 
+    use pbs_datastore::prune::PruneOptions;
     use proxmox_backup::{
-        backup::{
-            PruneOptions,
-        },
         config::datastore::{
             self,
             DataStoreConfig,

src/bin/proxmox-file-restore.rs

@@ -16,7 +16,13 @@ use proxmox::api::{
 use pxar::accessor::aio::Accessor;
 use pxar::decoder::aio::Decoder;
 
+use pbs_api_types::CryptMode;
+use pbs_datastore::{CryptConfig, CATALOG_NAME};
+use pbs_datastore::backup_info::BackupDir;
+use pbs_datastore::catalog::{CatalogReader, DirEntryAttribute};
+use pbs_datastore::dynamic_index::{BufferedDynamicReader, LocalDynamicReadAt};
 use pbs_datastore::index::IndexFile;
+use pbs_datastore::key_derivation::decrypt_key;
 use pbs_client::{BackupReader, RemoteChunkReader};
 use pbs_client::pxar::{create_zip, extract_sub_dir, extract_sub_dir_seq};
 use pbs_client::tools::{
@@ -29,10 +35,6 @@ use pbs_client::tools::{
 };
 
 use proxmox_backup::api2::{helpers, types::ArchiveEntry};
-use proxmox_backup::backup::{
-    decrypt_key, BackupDir, BufferedDynamicReader, CatalogReader, CryptConfig, CryptMode,
-    DirEntryAttribute, LocalDynamicReadAt, CATALOG_NAME,
-};
 use proxmox_backup::tools;
 
 mod proxmox_file_restore;

src/bin/proxmox_file_restore/block_driver.rs

@@ -11,8 +11,9 @@ use serde_json::{json, Value};
 use proxmox::api::{api, cli::*};
 
 use pbs_client::BackupRepository;
+use pbs_datastore::backup_info::BackupDir;
+use pbs_datastore::manifest::BackupManifest;
 
-use proxmox_backup::backup::{BackupDir, BackupManifest};
 use proxmox_backup::api2::types::ArchiveEntry;
 
 use super::block_driver_qemu::QemuBlockDriver;

src/bin/proxmox_file_restore/block_driver_qemu.rs

@@ -11,9 +11,9 @@ use serde_json::json;
 use proxmox::tools::fs::lock_file;
 
 use pbs_client::{DEFAULT_VSOCK_PORT, BackupRepository, VsockClient};
+use pbs_datastore::backup_info::BackupDir;
 
 use proxmox_backup::api2::types::ArchiveEntry;
-use proxmox_backup::backup::BackupDir;
 use proxmox_backup::tools;
 
 use super::block_driver::*;

src/bin/proxmox_restore_daemon/api.rs

@@ -20,12 +20,12 @@ use proxmox::api::{
 use proxmox::{identity, list_subdirs_api_method, sortable};
 
 use pbs_client::pxar::{create_archive, Flags, PxarCreateOptions, ENCODER_MAX_ENTRIES};
+use pbs_datastore::catalog::DirEntryAttribute;
 use pbs_tools::fs::read_subdir;
 use pbs_tools::json::required_string_param;
 use pbs_tools::zip::zip_directory;
 
 use proxmox_backup::api2::types::*;
-use proxmox_backup::backup::DirEntryAttribute;
 
 use pxar::encoder::aio::TokioWriter;
 

src/bin/proxmox_tape/encryption_key.rs

@@ -11,6 +11,7 @@ use proxmox::{
     sys::linux::tty,
 };
 
+use pbs_api_types::Fingerprint;
 use pbs_datastore::Kdf;
 use pbs_datastore::paperkey::{PaperkeyFormat, generate_paper_key};
 
@@ -24,7 +25,6 @@ use proxmox_backup::{
             PASSWORD_HINT_SCHEMA,
         },
     },
-    backup::Fingerprint,
     config::tape_encryption_keys::{
         load_key_configs,
         complete_key_fingerprint,

src/bin/sg-tape-cmd.rs

@@ -18,9 +18,10 @@ use proxmox::{
     tools::Uuid,
 };
 
+use pbs_api_types::Fingerprint;
+
 use proxmox_backup::{
     config,
-    backup::Fingerprint,
     api2::types::{
         LTO_DRIVE_PATH_SCHEMA,
         DRIVE_NAME_SCHEMA,