move src/tape/helpers/snapshot_reader.rs to src/backup/snapshot_reader.rs

src/api2/tape/backup.rs

@@ -35,14 +35,13 @@ use crate::{
             compute_schedule_status,
         },
     },
-    backup::DataStore,
+    backup::{DataStore, SnapshotReader},
     server::WorkerTask,
     tape::{
         TAPE_STATUS_DIR,
         Inventory,
         PoolWriter,
         MediaPool,
-        SnapshotReader,
         drive::{
             media_changer,
             lock_tape_device,

src/backup/mod.rs

@@ -12,3 +12,6 @@ pub use datastore::*;
 
 mod verify;
 pub use verify::*;
+
+mod snapshot_reader;
+pub use snapshot_reader::SnapshotReader;

src/tape/file_formats/snapshot_archive.rs

@@ -12,12 +12,11 @@ use pbs_tape::{
     TapeWrite, MediaContentHeader,
 };
 
-use crate::tape::{
+use crate::backup::SnapshotReader;
-    SnapshotReader,
+
-    file_formats::{
+use crate::tape::file_formats::{
-        PROXMOX_BACKUP_SNAPSHOT_ARCHIVE_MAGIC_1_1,
+    PROXMOX_BACKUP_SNAPSHOT_ARCHIVE_MAGIC_1_1,
-        SnapshotArchiveHeader,
+    SnapshotArchiveHeader,
-    },
 };
 
 

src/tape/helpers/mod.rs

@@ -1,2 +0,0 @@
-mod snapshot_reader;
-pub use snapshot_reader::*;

src/tape/mod.rs

@@ -14,9 +14,6 @@ mod test;
 
 pub mod file_formats;
 
-mod helpers;
-pub use helpers::*;
-
 mod media_set;
 pub use media_set::*;
 

src/tape/pool_writer/mod.rs

@@ -21,15 +21,12 @@ use pbs_tape::{
 };
 
 use crate::{
-    backup::{
+    backup::{DataStore, SnapshotReader},
-        DataStore,
-    },
     server::WorkerTask,
     tape::{
         TAPE_STATUS_DIR,
         MAX_CHUNK_ARCHIVE_SIZE,
         COMMIT_BLOCK_SIZE,
-        SnapshotReader,
         MediaPool,
         MediaId,
         MediaCatalog,

src/tape/pool_writer/new_chunks_iterator.rs

@@ -5,13 +5,8 @@ use anyhow::{format_err, Error};
 
 use pbs_datastore::DataBlob;
 
-use crate::{
+use crate::backup::{DataStore, SnapshotReader};
-    backup::DataStore,
+use crate::tape::CatalogSet;
-    tape::{
-        CatalogSet,
-        SnapshotReader,
-    },
-};
 
 /// Chunk iterator which use a separate thread to read chunks
 ///