move src/backup/datastore.rs into pbs_datastore crate

src/server/gc_job.rs

@@ -3,12 +3,10 @@ use anyhow::Error;
 
 use pbs_api_types::Authid;
 use pbs_tools::task_log;
+use pbs_datastore::DataStore;
 use proxmox_rest_server::WorkerTask;
 
-use crate::{
-    server::jobstate::Job,
-    backup::DataStore,
-};
+use crate::server::jobstate::Job;
 
 /// Runs a garbage collection job.
 pub fn do_garbage_collection_job(

src/server/prune_job.rs

@@ -4,15 +4,13 @@ use anyhow::Error;
 
 use pbs_datastore::backup_info::BackupInfo;
 use pbs_datastore::prune::compute_prune_info;
+use pbs_datastore::DataStore;
 use pbs_api_types::{Authid, PRIV_DATASTORE_MODIFY, PruneOptions};
 use pbs_config::CachedUserInfo;
 use pbs_tools::{task_log, task_warn};
 use proxmox_rest_server::WorkerTask;
 
-use crate::{
-    backup::DataStore,
-    server::jobstate::Job,
- };
+use crate::server::jobstate::Job;
 
 pub fn prune_datastore(
     worker: Arc<WorkerTask>,

src/server/pull.rs

@@ -13,7 +13,7 @@ use serde_json::json;
 use proxmox::api::error::{HttpError, StatusCode};
 
 use pbs_api_types::{Authid, SnapshotListItem, GroupListItem};
-use pbs_datastore::{BackupInfo, BackupDir, BackupGroup, StoreProgress};
+use pbs_datastore::{DataStore, BackupInfo, BackupDir, BackupGroup, StoreProgress};
 use pbs_datastore::data_blob::DataBlob;
 use pbs_datastore::dynamic_index::DynamicIndexReader;
 use pbs_datastore::fixed_index::FixedIndexReader;
@@ -26,10 +26,7 @@ use pbs_tools::task_log;
 use pbs_client::{BackupReader, BackupRepository, HttpClient, HttpClientOptions, RemoteChunkReader};
 use proxmox_rest_server::WorkerTask;
 
-use crate::{
-    backup::DataStore,
-    tools::ParallelHandler,
-};
+use crate::tools::ParallelHandler;
 
 // fixme: implement filters
 // fixme: delete vanished groups

src/server/verify_job.rs

@@ -3,11 +3,11 @@ use anyhow::{format_err, Error};
 use pbs_tools::task_log;
 use pbs_api_types::{Authid, VerificationJobConfig};
 use proxmox_rest_server::WorkerTask;
+use pbs_datastore::DataStore;
 
 use crate::{
     server::jobstate::Job,
     backup::{
-        DataStore,
         verify_filter,
         verify_all_backups,
     },