MattJackson
f1926c38dc
WO-2 (delete SectorReader trait): - The 0.18 trait split into SectorSource (read-only) and SectorSink (write-only) is final; the legacy SectorReader alias was a bridge. - Renames every internal &mut dyn SectorReader (~25 sites) to &mut dyn SectorSource. The trait method capacity() becomes capacity_sectors() with a default of 0 (preserves SectorReader's default-0 behavior). - Deletes the SectorReader trait, its blanket-to-Source bridge, and the FileSectorReader type alias. Adds explicit forwarding impls for Box<dyn SectorSource> and &mut dyn SectorSource so generic decorators like DecryptingSectorSource<S: SectorSource> compose. WO-3a (extract Disc::patch): - Moves Disc::patch (1230 lines) and bytes_bad_in_title from disc/mod.rs into disc/patch.rs as a split inherent impl. Zero behavior change — pure mechanical relocation. disc/mod.rs drops from 3,945 to 2,714 LOC. WO-6 (partial): - Deletes src/labels/png_filenames.rs — was a 72-LOC stub with detect() returning false, never wired into the PARSERS registry. project docs doc drift fixes (audited 2026-05-13): - JUMP_BASE_SECTORS: 256→1024 (64 MB base for UHD, not 8 MB) - PASSN_DAMAGE_THRESHOLD_PCT: 12→6 - PASSN_SKIP_SECTORS_BASE: 64→32 - MAX_RANGE_SECS=180: replaced by proportional range_sectors × 25, capped at RANGE_BUDGET_CAP_SECS=1800.
102 lines
2.8 KiB
Rust
102 lines
2.8 KiB
Rust
//! ISO sector reader — file-backed SectorSource for Blu-ray ISO images.
|
|
//!
|
|
//! An ISO is a flat image of 2048-byte sectors. Sector N starts at byte offset N * 2048.
|
|
//! Used by DiscStream::open_iso() and Disc::scan_image().
|
|
|
|
use crate::error::{Error, Result};
|
|
use crate::sector::SectorSource;
|
|
use std::fs::File;
|
|
use std::io::{Read, Seek, SeekFrom};
|
|
use std::path::Path;
|
|
|
|
const SECTOR_SIZE: u64 = 2048;
|
|
|
|
/// File-backed sector reader for ISO images.
|
|
pub struct IsoSectorReader {
|
|
file: File,
|
|
capacity: u32,
|
|
}
|
|
|
|
impl IsoSectorReader {
|
|
pub fn open(path: &str) -> std::io::Result<Self> {
|
|
let file = File::open(Path::new(path))?;
|
|
let size = file.metadata()?.len();
|
|
let sectors = size / SECTOR_SIZE;
|
|
if sectors > u32::MAX as u64 {
|
|
return Err(crate::error::Error::IsoTooLarge {
|
|
path: path.to_string(),
|
|
}
|
|
.into());
|
|
}
|
|
let capacity = sectors as u32;
|
|
Ok(Self { file, capacity })
|
|
}
|
|
|
|
pub fn capacity_sectors(&self) -> u32 {
|
|
self.capacity
|
|
}
|
|
}
|
|
|
|
impl SectorSource for IsoSectorReader {
|
|
fn read_sectors(
|
|
&mut self,
|
|
lba: u32,
|
|
count: u16,
|
|
buf: &mut [u8],
|
|
_recovery: bool,
|
|
) -> Result<usize> {
|
|
let bytes = count as usize * SECTOR_SIZE as usize;
|
|
self.file
|
|
.seek(SeekFrom::Start(lba as u64 * SECTOR_SIZE))
|
|
.map_err(|e| Error::IoError { source: e })?;
|
|
self.file
|
|
.read_exact(&mut buf[..bytes])
|
|
.map_err(|e| Error::IoError { source: e })?;
|
|
Ok(bytes)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn iso_reader_read_sectors() {
|
|
let mut data = vec![0u8; 4 * SECTOR_SIZE as usize];
|
|
for i in 0..4u8 {
|
|
let offset = i as usize * SECTOR_SIZE as usize;
|
|
data[offset] = i + 1;
|
|
data[offset + 2047] = i + 100;
|
|
}
|
|
|
|
let dir = std::env::temp_dir().join("freemkv_test_iso_read");
|
|
std::fs::write(&dir, &data).unwrap();
|
|
|
|
let mut reader = IsoSectorReader::open(dir.to_str().unwrap()).unwrap();
|
|
assert_eq!(reader.capacity_sectors(), 4);
|
|
|
|
let mut buf = [0u8; 2048];
|
|
reader.read_sectors(0, 1, &mut buf, true).unwrap();
|
|
assert_eq!(buf[0], 1);
|
|
assert_eq!(buf[2047], 100);
|
|
|
|
reader.read_sectors(2, 1, &mut buf, true).unwrap();
|
|
assert_eq!(buf[0], 3);
|
|
assert_eq!(buf[2047], 102);
|
|
|
|
std::fs::remove_file(&dir).ok();
|
|
}
|
|
|
|
#[test]
|
|
fn iso_reader_capacity() {
|
|
let data = vec![0u8; 10 * SECTOR_SIZE as usize];
|
|
let dir = std::env::temp_dir().join("freemkv_test_iso_cap");
|
|
std::fs::write(&dir, &data).unwrap();
|
|
|
|
let reader = IsoSectorReader::open(dir.to_str().unwrap()).unwrap();
|
|
assert_eq!(reader.capacity_sectors(), 10);
|
|
|
|
std::fs::remove_file(&dir).ok();
|
|
}
|
|
}
|