matthew
6fee7ae583
Audit pass against the CLAUDE.md "no English text in library code" rule.
Found 9 call sites that violated the contract by stuffing English into
io::Error::new(kind, "…") or by abusing Error::DeviceNotFound { path }
as a free-form description field. Each is now a typed Error variant.
New variants and codes: ScsiInterfaceUnavailable (E1004), DeviceLocked
(E1005), IoKitPluginFailed (E1006), UnsupportedPlatform (E2003),
PlatformNotImplemented (E2004), MapfileInvalid (E6011), DiscUrlNotDirect
(E9009).
labels::apply() previously pushed Commentary/Descriptive/Score/IME and
" (Secondary)" English literals into AudioStream.label, leaking into
MKV titles + autorip UI. AudioStream now exposes structured `purpose:
LabelPurpose`, SubtitleStream `qualifier: LabelQualifier`. Callers
translate to localized text. label keeps codec-formatting only.
API hygiene: 11 mux/* modules dropped from `pub` to `pub(crate)` —
their *types* are still re-exported from lib.rs, but the modules were
leaking low-level EBML/TS/network primitives. Stream trait gets a real
rustdoc explaining read-vs-write split. lib.rs grouped re-exports into
documented sections. ScanOptions::with_keydb() removed (one-method-per-
action rule); use struct literal.
Dead-code sweep: removed lookahead.rs (orphan, never declared as mod),
tsreader.rs (TsDemuxReader unused), ebml::{write_int,read_vint,SEEK_*},
ts::{scan_first/last_pts,scan_duration,SCAN_HEAD/TAIL_SIZE,take/set_
remainder}, MkvMuxer codec_private_slots/filled fields and
fill_codec_private method (deferred-codecPrivate path never used since
the v0.10 PES rewrite). cargo clippy --all-targets -D warnings clean.
Tests: new error::tests for variant codes + Display "no English" guard +
io::ErrorKind mapping. 233 lib tests, all green (was 230).
Breaking: ScanOptions::with_keydb removed; mux/* modules pub(crate);
AudioStream and SubtitleStream gained required fields; UnsupportedDrive
{ product_revision: "Renesas not yet implemented" } no longer produced
(use PlatformNotImplemented).
102 lines
2.8 KiB
Rust
102 lines
2.8 KiB
Rust
//! ISO sector reader — file-backed SectorReader 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::SectorReader;
|
|
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(&self) -> u32 {
|
|
self.capacity
|
|
}
|
|
}
|
|
|
|
impl SectorReader 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(), 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(), 10);
|
|
|
|
std::fs::remove_file(&dir).ok();
|
|
}
|
|
}
|