pq/libfreemkv
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.11.15: lint cleanup — fmt + clippy clean

Browse Source
This commit is contained in:
Matt Jackson
2026-04-21 18:52:55 +00:00
parent afae37c8c3
commit 8843833ea7
16 changed files with 108 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/disc/mod.rs
+7 -9
View File
@@ -874,8 +874,8 @@ impl KeySource {
/// Standard KEYDB.cfg search locations (compatible with libaacs).
const KEYDB_SEARCH_PATHS: &[&str] = &[
".config/aacs/KEYDB.cfg", // libaacs standard path
".config/freemkv/keydb.cfg", // freemkv download path
".config/aacs/KEYDB.cfg", // libaacs standard path
".config/freemkv/keydb.cfg", // freemkv download path
];
const KEYDB_SYSTEM_PATH: &str = "/etc/aacs/KEYDB.cfg";
@@ -938,9 +938,7 @@ pub struct DiscId {
impl DiscId {
/// Best available name: meta_title, then formatted volume_id.
pub fn name(&self) -> &str {
self.meta_title
.as_deref()
.unwrap_or(&self.volume_id)
self.meta_title.as_deref().unwrap_or(&self.volume_id)
}
}
@@ -1031,10 +1029,10 @@ impl Disc {
{
let lba = disc.titles[0].extents.iter().find_map(|ext| {
let mut buf = vec![0u8; 2048];
if session.read_sectors(ext.start_lba, 1, &mut buf).is_ok() {
if crate::css::is_scrambled(&buf) {
return Some(ext.start_lba);
}
if session.read_sectors(ext.start_lba, 1, &mut buf).is_ok()
&& crate::css::is_scrambled(&buf)
{
return Some(ext.start_lba);
}
None
});