move src/backup/datastore.rs into pbs_datastore crate

src/api2/admin/datastore.rs

@@ -39,7 +39,7 @@ use pbs_api_types::{ Authid, BackupContent, Counts, CryptMode,
 
 };
 use pbs_client::pxar::create_zip;
-use pbs_datastore::{BackupDir, BackupGroup, StoreProgress, CATALOG_NAME};
+use pbs_datastore::{check_backup_owner, DataStore, BackupDir, BackupGroup, StoreProgress, CATALOG_NAME};
 use pbs_datastore::backup_info::BackupInfo;
 use pbs_datastore::cached_chunk_reader::CachedChunkReader;
 use pbs_datastore::catalog::{ArchiveEntry, CatalogReader};
@@ -59,8 +59,8 @@ use proxmox_rest_server::{WorkerTask, formatter};
 
 use crate::api2::node::rrd::create_value_from_rrd;
 use crate::backup::{
-    check_backup_owner, verify_all_backups, verify_backup_group, verify_backup_dir, verify_filter,
-    DataStore, LocalChunkReader,
+    verify_all_backups, verify_backup_group, verify_backup_dir, verify_filter,
+    LocalChunkReader,
 };
 
 use crate::server::jobstate::Job;

src/api2/backup/environment.rs

@@ -10,14 +10,14 @@ use proxmox::tools::digest_to_hex;
 use proxmox::tools::fs::{replace_file, CreateOptions};
 use proxmox::api::{RpcEnvironment, RpcEnvironmentType};
 
-use pbs_datastore::DataBlob;
+use pbs_datastore::{DataStore, DataBlob};
 use pbs_datastore::backup_info::{BackupDir, BackupInfo};
 use pbs_datastore::dynamic_index::DynamicIndexWriter;
 use pbs_datastore::fixed_index::FixedIndexWriter;
 use pbs_api_types::Authid;
 use proxmox_rest_server::{WorkerTask, formatter::*};
 
-use crate::backup::{verify_backup_dir_with_lock, DataStore};
+use crate::backup::verify_backup_dir_with_lock;
 
 use hyper::{Body, Response};
 

src/api2/backup/mod.rs

@@ -19,15 +19,13 @@ use pbs_api_types::{
 };
 use pbs_tools::fs::lock_dir_noblock_shared;
 use pbs_tools::json::{required_array_param, required_integer_param, required_string_param};
-use pbs_datastore::PROXMOX_BACKUP_PROTOCOL_ID_V1;
+use pbs_config::CachedUserInfo;
+use pbs_datastore::{DataStore, PROXMOX_BACKUP_PROTOCOL_ID_V1};
 use pbs_datastore::backup_info::{BackupDir, BackupGroup, BackupInfo};
 use pbs_datastore::index::IndexFile;
 use pbs_datastore::manifest::{archive_type, ArchiveType};
 use proxmox_rest_server::{WorkerTask, H2Service};
 
-use crate::backup::DataStore;
-use pbs_config::CachedUserInfo;
-
 mod environment;
 use environment::*;
 

src/api2/backup/upload_chunk.rs

@@ -12,13 +12,11 @@ use proxmox::{sortable, identity};
 use proxmox::api::{ApiResponseFuture, ApiHandler, ApiMethod, RpcEnvironment};
 use proxmox::api::schema::*;
 
-use pbs_datastore::DataBlob;
+use pbs_datastore::{DataStore, DataBlob};
 use pbs_datastore::file_formats::{DataBlobHeader, EncryptedDataBlobHeader};
 use pbs_tools::json::{required_integer_param, required_string_param};
 use pbs_api_types::{CHUNK_DIGEST_SCHEMA, BACKUP_ARCHIVE_NAME_SCHEMA};
 
-use crate::backup::DataStore;
-
 use super::environment::*;
 
 pub struct UploadChunk {

src/api2/pull.rs

@@ -16,9 +16,9 @@ use pbs_api_types::{
 use pbs_tools::task_log;
 use proxmox_rest_server::WorkerTask;
 use pbs_config::CachedUserInfo;
+use pbs_datastore::DataStore;
 
 use crate::server::{jobstate::Job, pull::pull_store};
-use crate::backup::DataStore;
 
 pub fn check_pull_privs(
     auth_id: &Authid,

src/api2/reader/environment.rs

@@ -6,14 +6,11 @@ use serde_json::{json, Value};
 use proxmox::api::{RpcEnvironment, RpcEnvironmentType};
 
 use pbs_datastore::backup_info::BackupDir;
+use pbs_datastore::DataStore;
 use pbs_api_types::Authid;
 use proxmox_rest_server::formatter::*;
-
-use crate::backup::DataStore;
 use proxmox_rest_server::WorkerTask;
 
-//use proxmox::tools;
-
 /// `RpcEnvironmet` implementation for backup reader service
 #[derive(Clone)]
 pub struct ReaderEnvironment {

src/api2/reader/mod.rs

@@ -34,14 +34,14 @@ use pbs_api_types::{
 };
 use pbs_tools::fs::lock_dir_noblock_shared;
 use pbs_tools::json::{required_integer_param, required_string_param};
-use pbs_datastore::PROXMOX_BACKUP_READER_PROTOCOL_ID_V1;
+use pbs_datastore::{DataStore, PROXMOX_BACKUP_READER_PROTOCOL_ID_V1};
 use pbs_datastore::backup_info::BackupDir;
 use pbs_datastore::index::IndexFile;
 use pbs_datastore::manifest::{archive_type, ArchiveType};
 use pbs_config::CachedUserInfo;
 use proxmox_rest_server::{WorkerTask, H2Service};
 
-use crate::{api2::helpers, backup::DataStore};
+use crate::api2::helpers;
 
 mod environment;
 use environment::*;

src/api2/status.rs

@@ -18,11 +18,11 @@ use pbs_api_types::{
     DATASTORE_SCHEMA, RRDMode, RRDTimeFrameResolution, Authid,
     PRIV_DATASTORE_AUDIT, PRIV_DATASTORE_BACKUP,
 };
-
-use crate::backup::DataStore;
-use crate::tools::statistics::{linear_regression};
+use pbs_datastore::DataStore;
 use pbs_config::CachedUserInfo;
 
+use crate::tools::statistics::{linear_regression};
+
 #[api(
     returns: {
         description: "Lists the Status of the Datastores.",

src/api2/tape/backup.rs

@@ -20,7 +20,7 @@ use pbs_api_types::{
     UPID_SCHEMA, JOB_ID_SCHEMA, PRIV_DATASTORE_READ, PRIV_TAPE_AUDIT, PRIV_TAPE_WRITE,
 };
 
-use pbs_datastore::StoreProgress;
+use pbs_datastore::{DataStore, StoreProgress};
 use pbs_datastore::backup_info::{BackupDir, BackupInfo};
 use pbs_tools::{task_log, task_warn, task::WorkerTaskContext};
 use pbs_config::CachedUserInfo;
@@ -36,7 +36,7 @@ use crate::{
             compute_schedule_status,
         },
     },
-    backup::{DataStore, SnapshotReader},
+    backup::SnapshotReader,
     tape::{
         TAPE_STATUS_DIR,
         Inventory,

src/api2/tape/restore.rs

@@ -34,7 +34,7 @@ use pbs_api_types::{
     UPID_SCHEMA, TAPE_RESTORE_SNAPSHOT_SCHEMA,
     PRIV_DATASTORE_BACKUP, PRIV_DATASTORE_MODIFY, PRIV_TAPE_READ,
 };
-use pbs_datastore::DataBlob;
+use pbs_datastore::{DataStore, DataBlob};
 use pbs_datastore::backup_info::BackupDir;
 use pbs_datastore::dynamic_index::DynamicIndexReader;
 use pbs_datastore::fixed_index::FixedIndexReader;
@@ -50,7 +50,6 @@ use proxmox_rest_server::WorkerTask;
 
 use crate::{
     tools::ParallelHandler,
-    backup::DataStore,
     server::lookup_user_email,
     tape::{
         TAPE_STATUS_DIR,