MattJackson
a74d395f68
Tier 1 (compilation + correctness): - Fix nightly-only is_multiple_of → % 2 != 0 (stable Rust compat) - Fix parse_sample_rate: check 192 before 96 (was returning wrong rate) - macOS drive discovery: split unix.rs → linux.rs + macos.rs - Linux: EACCES returns DevicePermission not DeviceNotFound - CLI pipe.rs: Ctrl+C signal handler added Tier 2 (correctness + security): - MkvStream: reset demuxer after scanning→streaming transition - Windows SPTI: zero data buffer before ioctl - AACS cert verification: documented why silently skipped - KEYDB: HOME + USERPROFILE fallback for Windows - Library modules: pub(crate) for internal modules - AACS: explicit re-exports, AES primitives pub(crate) Tier 3 (performance + polish): - IsoStream: batch 64-sector reads (was 1 sector at a time) - DiscStream: buffer swap instead of copy in decrypt_and_buffer - Vec capacity hints in TS/PS demuxer hot paths - NetworkStream: TLS warning documented - Batch rip: per-title progress display - cargo fmt: 0 violations 319 tests, 0 fmt violations.
85 lines
2.5 KiB
Rust
85 lines
2.5 KiB
Rust
//! Windows drive discovery and device resolution.
|
|
|
|
use crate::error::Result;
|
|
use crate::identity::DriveId;
|
|
use std::path::Path;
|
|
|
|
pub fn find_drives() -> Vec<(String, DriveId)> {
|
|
let mut drives = Vec::new();
|
|
|
|
// Try CdRom0..CdRom15
|
|
for i in 0..16 {
|
|
let path = format!("\\\\.\\CdRom{}", i);
|
|
if let Ok(mut transport) = crate::scsi::open(Path::new(&path)) {
|
|
if let Ok(id) = DriveId::from_drive(transport.as_mut()) {
|
|
if !id.raw_inquiry.is_empty() && (id.raw_inquiry[0] & 0x1F) == 0x05 {
|
|
drives.push((path, id));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// Also try drive letters if CdRom didn't find anything
|
|
if drives.is_empty() {
|
|
for letter in b'D'..=b'Z' {
|
|
let path = format!("{}:", letter as char);
|
|
if let Ok(mut transport) = crate::scsi::open(Path::new(&path)) {
|
|
if let Ok(id) = DriveId::from_drive(transport.as_mut()) {
|
|
if !id.raw_inquiry.is_empty() && (id.raw_inquiry[0] & 0x1F) == 0x05 {
|
|
drives.push((path, id));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
drives
|
|
}
|
|
|
|
pub fn resolve_device(path: &str) -> Result<(String, Option<String>)> {
|
|
Ok((normalize_path(path), None))
|
|
}
|
|
|
|
/// Normalize a device path to Windows \\.\X: format.
|
|
///
|
|
/// Accepts: "D:", "D:\\", "\\.\D:", "\\.\CdRom0"
|
|
///
|
|
/// NOTE: A near-identical `normalize_device_path` exists in `scsi::windows`.
|
|
/// Both are kept because they live in separate `cfg(windows)` modules that
|
|
/// cannot easily share a helper without introducing cross-module coupling.
|
|
fn normalize_path(path: &str) -> String {
|
|
if path.starts_with("\\\\.\\") {
|
|
return path.to_string();
|
|
}
|
|
let trimmed = path.trim_end_matches('\\');
|
|
if trimmed.len() == 2 && trimmed.as_bytes()[1] == b':' {
|
|
return format!("\\\\.\\{}", trimmed);
|
|
}
|
|
if path.to_lowercase().starts_with("cdrom") {
|
|
return format!("\\\\.\\{}", path);
|
|
}
|
|
format!("\\\\.\\{}", path)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn normalize_drive_letter() {
|
|
assert_eq!(normalize_path("D:"), "\\\\.\\D:");
|
|
assert_eq!(normalize_path("E:\\"), "\\\\.\\E:");
|
|
}
|
|
|
|
#[test]
|
|
fn normalize_already_prefixed() {
|
|
assert_eq!(normalize_path("\\\\.\\D:"), "\\\\.\\D:");
|
|
assert_eq!(normalize_path("\\\\.\\CdRom0"), "\\\\.\\CdRom0");
|
|
}
|
|
|
|
#[test]
|
|
fn normalize_cdrom() {
|
|
assert_eq!(normalize_path("CdRom0"), "\\\\.\\CdRom0");
|
|
}
|
|
}
|