tape: change code hierarchy to improve docs

src/api2/config/changer.rs

@@ -21,7 +21,7 @@ use crate::{
         ScsiTapeChanger,
         LinuxTapeDrive,
     },
-    tape::{
+    tape::drive::{
         linux_tape_changer_list,
         check_drive_path,
         lookup_drive,

src/api2/config/drive.rs

@@ -16,7 +16,7 @@ use crate::{
         LinuxTapeDrive,
         ScsiTapeChanger,
     },
-    tape::{
+    tape::drive::{
         linux_tape_device_list,
         check_drive_path,
         lookup_drive,

src/api2/tape/backup.rs

@@ -37,8 +37,8 @@ use crate::{
         PoolWriter,
         MediaPool,
         SnapshotReader,
-        media_changer,
+        drive::media_changer,
-        update_changer_online_status,
+        changer::update_changer_online_status,
     },
 };
 

src/api2/tape/changer.rs

@@ -17,13 +17,15 @@ use crate::{
     },
     tape::{
         TAPE_STATUS_DIR,
-        ElementStatus,
-        OnlineStatusMap,
         Inventory,
-        linux_tape_changer_list,
+        drive::linux_tape_changer_list,
-        mtx_status,
+        changer::{
-        mtx_status_to_online_set,
+            OnlineStatusMap,
-        mtx_transfer,
+            ElementStatus,
+            mtx_status,
+            mtx_status_to_online_set,
+            mtx_transfer,
+        },
     },
 };
 

src/api2/tape/drive.rs

@@ -43,24 +43,24 @@ use crate::{
     server::WorkerTask,
     tape::{
         TAPE_STATUS_DIR,
-        TapeDriver,
         MediaPool,
         Inventory,
         MediaCatalog,
         MediaId,
-        linux_tape_device_list,
+         file_formats::{
-        open_drive,
-        media_changer,
-        required_media_changer,
-        update_changer_online_status,
-        linux_tape::{
-            LinuxTapeHandle,
-            open_linux_tape_device,
-        },
-        file_formats::{
             MediaLabel,
             MediaSetLabel,
         },
+        drive::{
+            TapeDriver,
+            LinuxTapeHandle,
+            open_linux_tape_device,
+            linux_tape_device_list,
+            media_changer,
+            required_media_changer,
+            open_drive,
+        },
+        changer::update_changer_online_status,
     },
 };
 

src/api2/tape/media.rs

@@ -33,7 +33,7 @@ use crate::{
         Inventory,
         MediaPool,
         MediaCatalog,
-        update_online_status,
+        changer::update_online_status,
     },
 };
 

src/api2/tape/restore.rs

@@ -55,10 +55,8 @@ use crate::{
         MediaId,
         MediaCatalog,
         ChunkArchiveDecoder,
-        TapeDriver,
         MediaPool,
         Inventory,
-        request_and_load_media,
         file_formats::{
             PROXMOX_BACKUP_MEDIA_LABEL_MAGIC_1_0,
             PROXMOX_BACKUP_SNAPSHOT_ARCHIVE_MAGIC_1_0,
@@ -67,6 +65,10 @@ use crate::{
             PROXMOX_BACKUP_CHUNK_ARCHIVE_MAGIC_1_0,
             MediaContentHeader,
         },
+        drive::{
+            TapeDriver,
+            request_and_load_media,
+        }
     },
 };
 

src/bin/proxmox-tape.rs

@@ -41,7 +41,7 @@ use proxmox_backup::{
         media_pool::complete_pool_name,
     },
     tape::{
-        open_drive,
+        drive::open_drive,
         complete_media_label_text,
         complete_media_set_uuid,
         file_formats::{

src/bin/proxmox_tape/changer.rs

@@ -19,8 +19,10 @@ use proxmox_backup::{
         },
     },
     tape::{
-        complete_changer_path,
+        drive::{
-        media_changer,
+            media_changer,
+            complete_changer_path,
+        },
     },
     config::{
         self,

src/bin/proxmox_tape/drive.rs

@@ -17,9 +17,7 @@ use proxmox_backup::{
             DRIVE_NAME_SCHEMA,
         },
     },
-    tape::{
+    tape::drive::complete_drive_path,
-        complete_drive_path,
-    },
     config::drive::{
         complete_drive_name,
         complete_changer_name,

src/bin/sg-tape-cmd.rs

@@ -31,8 +31,8 @@ use proxmox_backup::{
         LinuxTapeDrive,
     },
     tape::{
-        TapeDriver,
+        drive::{
-        linux_tape::{
+            TapeDriver,
             LinuxTapeHandle,
             open_linux_tape_device,
             check_tape_is_linux_tape_device,

src/tape/changer/mod.rs

@@ -1,3 +1,5 @@
+//! Media changer implementation (SCSI media changer)
+
 mod email;
 pub use email::*;
 
@@ -10,6 +12,9 @@ pub use mtx_wrapper::*;
 mod mtx;
 pub use mtx::*;
 
+mod online_status_map;
+pub use online_status_map::*;
+
 use anyhow::{bail, Error};
 
 /// Interface to the media changer device for a single drive

src/tape/changer/online_status_map.rs

@@ -12,11 +12,13 @@ use crate::{
         ScsiTapeChanger,
     },
     tape::{
-        MediaChange,
         Inventory,
-        MtxStatus,
+        changer::{
-        ElementStatus,
+            MediaChange,
-        mtx_status,
+            MtxStatus,
+            ElementStatus,
+            mtx_status,
+        },
     },
 };
 

src/tape/drive/linux_tape.rs

@@ -26,17 +26,17 @@ use crate::{
     tape::{
         TapeRead,
         TapeWrite,
-        TapeAlertFlags,
-        Lp17VolumeStatistics,
-        read_mam_attributes,
-        mam_extract_media_usage,
-        read_tape_alert_flags,
-        read_volume_statistics,
-        set_encryption,
         drive::{
+            linux_mtio::*,
             LinuxTapeDrive,
             TapeDriver,
-            linux_mtio::*,
+            TapeAlertFlags,
+            Lp17VolumeStatistics,
+            read_mam_attributes,
+            mam_extract_media_usage,
+            read_tape_alert_flags,
+            read_volume_statistics,
+            set_encryption,
         },
         file_formats::{
             PROXMOX_TAPE_BLOCK_SIZE,

src/tape/drive/mam.rs

@@ -10,7 +10,7 @@ use proxmox::tools::io::ReadExt;
 use crate::{
     api2::types::MamAttribute,
     tape::{
-        TapeAlertFlags,
+        drive::TapeAlertFlags,
         sgutils2::SgRaw,
     },
 };

src/tape/drive/mod.rs

@@ -1,3 +1,5 @@
+//! Tape drivers
+
 mod virtual_tape;
 mod linux_mtio;
 
@@ -10,7 +12,8 @@ pub use volume_statistics::*;
 mod encryption;
 pub use encryption::*;
 
-pub mod linux_tape;
+mod linux_tape;
+pub use linux_tape::*;
 
 mod mam;
 pub use mam::*;
@@ -44,7 +47,6 @@ use crate::{
         TapeWrite,
         TapeRead,
         MediaId,
-        MtxMediaChanger,
         file_formats::{
             PROXMOX_BACKUP_MEDIA_LABEL_MAGIC_1_0,
             PROXMOX_BACKUP_MEDIA_SET_LABEL_MAGIC_1_0,
@@ -54,6 +56,7 @@ use crate::{
         },
         changer::{
             MediaChange,
+            MtxMediaChanger,
             send_load_media_email,
         },
     },

src/tape/drive/virtual_tape.rs

@@ -15,10 +15,12 @@ use crate::{
     tape::{
         TapeWrite,
         TapeRead,
-        MtxStatus,
+        changer::{
-        DriveStatus,
+            MediaChange,
-        ElementStatus,
+            MtxStatus,
-        changer::MediaChange,
+            DriveStatus,
+            ElementStatus,
+        },
         drive::{
             VirtualTapeDrive,
             TapeDriver,

src/tape/inventory.rs

@@ -31,12 +31,12 @@ use crate::{
     },
     tape::{
         TAPE_STATUS_DIR,
-        OnlineStatusMap,
         MediaSet,
         file_formats::{
             MediaLabel,
             MediaSetLabel,
         },
+        changer::OnlineStatusMap,
     },
 };
 

src/tape/mod.rs

@@ -26,14 +26,9 @@ pub use media_set::*;
 mod inventory;
 pub use inventory::*;
 
-mod changer;
+pub mod changer;
-pub use changer::*;
 
-mod drive;
+pub mod drive;
-pub use drive::*;
-
-mod online_status_map;
-pub use online_status_map::*;
 
 mod media_pool;
 pub use media_pool::*;

src/tape/pool_writer.rs

@@ -15,7 +15,6 @@ use crate::{
         TAPE_STATUS_DIR,
         MAX_CHUNK_ARCHIVE_SIZE,
         COMMIT_BLOCK_SIZE,
-        TapeDriver,
         TapeWrite,
         ChunkArchiveWriter,
         SnapshotReader,
@@ -25,10 +24,13 @@ use crate::{
         MediaCatalog,
         MediaSetCatalog,
         tape_write_snapshot_archive,
-        request_and_load_media,
-        tape_alert_flags_critical,
-        media_changer,
         file_formats::MediaSetLabel,
+        drive::{
+            TapeDriver,
+            request_and_load_media,
+            tape_alert_flags_critical,
+            media_changer,
+        },
     },
     config::tape_encryption_keys::load_key_configs,
 };