MattJackson
9aaddaa9b8
Replace read_with_binary_search + 3×5s light recovery with an adaptive
sizer that shrinks on failure (halve, 3-aligned ≥6) and probes back up
after 100 MiB (51,200 sectors) of clean reads. Descent cost is paid
once per bad region, not once per bad sector.
Emit BatchSizeChanged { new_size, reason } on shrink and probe-up.
Remove BinarySearch event — no longer produced.
Side fix: scsi/macos.rs one-liner for manual_c_str_literals clippy
lint that surfaced on a newer toolchain.
119 lines
3.3 KiB
Rust
119 lines
3.3 KiB
Rust
//! Event system for progress and status reporting.
|
|
//!
|
|
//! The lib fires events during operations like rip().
|
|
//! The app registers a callback to receive them.
|
|
//! No display logic, no English text — just data.
|
|
//!
|
|
//! ```rust,ignore
|
|
//! disc.rip(&mut session, 0, output, |event| {
|
|
//! match event.kind {
|
|
//! EventKind::BytesRead { bytes, total } => update_progress(bytes, total),
|
|
//! EventKind::ReadError { sector, .. } => log_error(sector),
|
|
//! _ => {}
|
|
//! }
|
|
//! });
|
|
//! ```
|
|
|
|
use crate::error::Error;
|
|
|
|
/// An event fired by the lib during operations.
|
|
#[derive(Debug)]
|
|
pub struct Event {
|
|
pub kind: EventKind,
|
|
}
|
|
|
|
/// Types of events the lib can fire.
|
|
#[derive(Debug)]
|
|
pub enum EventKind {
|
|
// ── Init sequence events ────────────────────────────────────────
|
|
/// Drive opened successfully.
|
|
DriveOpened { device: String },
|
|
|
|
/// Drive is ready (disc spun up).
|
|
DriveReady,
|
|
|
|
/// Firmware init completed.
|
|
InitComplete { success: bool },
|
|
|
|
/// Disc probe completed.
|
|
ProbeComplete { success: bool },
|
|
|
|
/// Disc scan completed.
|
|
ScanComplete { titles: usize },
|
|
|
|
// ── Read events ─────────────────────────────────────────────────
|
|
/// Bytes successfully read and written to output.
|
|
BytesRead {
|
|
/// Bytes written so far.
|
|
bytes: u64,
|
|
/// Total bytes expected (0 if unknown).
|
|
total: u64,
|
|
},
|
|
|
|
/// A read error occurred. The lib will retry automatically.
|
|
ReadError {
|
|
/// Sector that failed.
|
|
sector: u64,
|
|
/// Error code.
|
|
error: Error,
|
|
},
|
|
|
|
/// Retrying a failed read.
|
|
Retry {
|
|
/// Current attempt number (1-based).
|
|
attempt: u32,
|
|
},
|
|
|
|
/// Drive speed changed (error recovery or restoration).
|
|
SpeedChange {
|
|
/// New speed in KB/s (0xFFFF = max).
|
|
speed_kbs: u16,
|
|
},
|
|
|
|
/// Starting a new disc extent.
|
|
ExtentStart {
|
|
/// Extent index (0-based).
|
|
index: usize,
|
|
/// First sector of extent.
|
|
start_sector: u64,
|
|
/// Number of sectors in extent.
|
|
sector_count: u64,
|
|
},
|
|
|
|
/// Sector recovered after a retry (Drive::read multi-phase recovery).
|
|
SectorRecovered { sector: u64 },
|
|
|
|
/// Sector unreadable, zero-filled (skip mode).
|
|
SectorSkipped { sector: u64 },
|
|
|
|
/// Adaptive batch sizer changed the read size.
|
|
///
|
|
/// Fires on shrink (read failed at larger size) and on probe-up
|
|
/// (enough clean reads to try larger again). Consumers use this to
|
|
/// display a "recovering" state distinct from "ripping normally".
|
|
BatchSizeChanged {
|
|
new_size: u16,
|
|
reason: BatchSizeReason,
|
|
},
|
|
|
|
/// Operation complete.
|
|
Complete {
|
|
/// Total bytes written.
|
|
bytes: u64,
|
|
/// Total read errors encountered.
|
|
errors: u32,
|
|
},
|
|
}
|
|
|
|
/// Why the adaptive batch sizer changed size.
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
pub enum BatchSizeReason {
|
|
/// Read failed; sizer halved the batch.
|
|
Shrunk,
|
|
/// Clean-read streak threshold hit; sizer doubled toward preferred.
|
|
Probed,
|
|
}
|
|
|
|
/// A no-op event handler. Ignores all events.
|
|
pub fn ignore(_event: Event) {}
|