feat(library): index DSF/DFF files and sort ephemeral folders musically
Scanner accepts .dsf/.dff; new AudioFormat::Dsd; metadata extraction via qbz-dsd (embedded ID3, artwork, bit_depth=1 with the DSD bit rate as sample_rate so badges derive DSD64/128/256). Ephemeral folder open now sorts tracks by album/disc/track/title and re-keys ids so the displayed order matches the play-queue order (was readdir order). cc
This commit is contained in:
5 files changed
+134
-1
No files matched your search
@@ -25,6 +25,7 @@ dirs = "6"
|
|||||||
|
|
||||||
# Audio metadata
|
# Audio metadata
|
||||||
lofty = "0.23"
|
lofty = "0.23"
|
||||||
|
qbz-dsd = { path = "../qbz-dsd" }
|
||||||
|
|
||||||
# Image processing (thumbnails)
|
# Image processing (thumbnails)
|
||||||
image = { version = "0.25", default-features = false, features = ["png", "jpeg", "webp"] }
|
image = { version = "0.25", default-features = false, features = ["png", "jpeg", "webp"] }
|
||||||
|
|||||||
@@ -354,6 +354,31 @@ impl EphemeralLibraryState {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Musical order (album, then disc/track/title — same as the DB-backed
|
||||||
|
// folder view): the extraction order above is readdir order, which is
|
||||||
|
// arbitrary. Ids must FOLLOW the display order because
|
||||||
|
// `tracks_snapshot` builds play queues by id — so this call's entries
|
||||||
|
// are re-keyed after sorting.
|
||||||
|
tracks_out.sort_by(|a, b| {
|
||||||
|
a.album_group_key
|
||||||
|
.cmp(&b.album_group_key)
|
||||||
|
.then_with(|| a.disc_number.unwrap_or(1).cmp(&b.disc_number.unwrap_or(1)))
|
||||||
|
.then_with(|| {
|
||||||
|
a.track_number
|
||||||
|
.unwrap_or(u32::MAX)
|
||||||
|
.cmp(&b.track_number.unwrap_or(u32::MAX))
|
||||||
|
})
|
||||||
|
.then_with(|| a.title.cmp(&b.title))
|
||||||
|
});
|
||||||
|
for track in &tracks_out {
|
||||||
|
inner.tracks.remove(&track.id);
|
||||||
|
}
|
||||||
|
for track in &mut tracks_out {
|
||||||
|
track.id = inner.next_id;
|
||||||
|
inner.next_id += 1;
|
||||||
|
inner.tracks.insert(track.id, track.clone());
|
||||||
|
}
|
||||||
|
|
||||||
let folder_path = path.display().to_string();
|
let folder_path = path.display().to_string();
|
||||||
inner.current_folder_path = Some(folder_path.clone());
|
inner.current_folder_path = Some(folder_path.clone());
|
||||||
|
|
||||||
|
|||||||
@@ -396,6 +396,12 @@ impl MetadataExtractor {
|
|||||||
pub fn extract(file_path: &Path) -> Result<LocalTrack, LibraryError> {
|
pub fn extract(file_path: &Path) -> Result<LocalTrack, LibraryError> {
|
||||||
log::debug!("Extracting metadata from: {}", file_path.display());
|
log::debug!("Extracting metadata from: {}", file_path.display());
|
||||||
|
|
||||||
|
// DSD containers aren't lofty-readable: qbz-dsd demuxes them (tech
|
||||||
|
// props + embedded ID3v2 for DSF; trailing ID3 for DFF when present).
|
||||||
|
if qbz_dsd::is_dsd_path(file_path) {
|
||||||
|
return Self::extract_dsd(file_path);
|
||||||
|
}
|
||||||
|
|
||||||
// Probe the file
|
// Probe the file
|
||||||
let tagged_file = Probe::open(file_path)
|
let tagged_file = Probe::open(file_path)
|
||||||
.map_err(|e| LibraryError::Metadata(format!("Failed to open file: {}", e)))?
|
.map_err(|e| LibraryError::Metadata(format!("Failed to open file: {}", e)))?
|
||||||
@@ -535,8 +541,93 @@ impl MetadataExtractor {
|
|||||||
Ok(track)
|
Ok(track)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Build a LocalTrack from a DSF/DFF file via qbz-dsd. Tag-read failures
|
||||||
|
/// degrade to filename-derived metadata — a DSD file must still index.
|
||||||
|
fn extract_dsd(file_path: &Path) -> Result<LocalTrack, LibraryError> {
|
||||||
|
let demux = qbz_dsd::open_dsd(file_path)
|
||||||
|
.map_err(|e| LibraryError::Metadata(format!("Failed to read DSD file: {}", e)))?;
|
||||||
|
let info = demux.info().clone();
|
||||||
|
drop(demux);
|
||||||
|
|
||||||
|
let file_metadata = fs::metadata(file_path).map_err(LibraryError::Io)?;
|
||||||
|
let file_size_bytes = file_metadata.len();
|
||||||
|
let last_modified = file_metadata
|
||||||
|
.modified()
|
||||||
|
.ok()
|
||||||
|
.and_then(|t| t.duration_since(UNIX_EPOCH).ok())
|
||||||
|
.map(|d| d.as_secs() as i64)
|
||||||
|
.unwrap_or(0);
|
||||||
|
|
||||||
|
let filename = file_path
|
||||||
|
.file_stem()
|
||||||
|
.and_then(|s| s.to_str())
|
||||||
|
.unwrap_or("Unknown")
|
||||||
|
.to_string();
|
||||||
|
let (fallback_artist, fallback_album) = Self::infer_artist_album(file_path);
|
||||||
|
let inferred_disc = Self::infer_disc_number(file_path);
|
||||||
|
|
||||||
|
let tags = &info.tags;
|
||||||
|
let album_title = Self::normalize_field(tags.album.as_deref())
|
||||||
|
.or_else(|| fallback_album.clone())
|
||||||
|
.unwrap_or_else(|| "Unknown Album".to_string());
|
||||||
|
let (album_group_key, album_group_title) =
|
||||||
|
Self::album_group_info(file_path, Some(album_title.as_str()));
|
||||||
|
|
||||||
|
Ok(LocalTrack {
|
||||||
|
id: 0,
|
||||||
|
file_path: file_path.to_string_lossy().to_string(),
|
||||||
|
title: tags.title.clone().unwrap_or(filename),
|
||||||
|
artist: Self::normalize_field(tags.artist.as_deref())
|
||||||
|
.or_else(|| fallback_artist.clone())
|
||||||
|
.unwrap_or_else(|| "Unknown Artist".to_string()),
|
||||||
|
album: album_title,
|
||||||
|
album_artist: tags.album_artist.clone(),
|
||||||
|
album_group_key,
|
||||||
|
album_group_title,
|
||||||
|
track_number: tags
|
||||||
|
.track_number
|
||||||
|
.or_else(|| Self::infer_track_number_from_filename(file_path)),
|
||||||
|
disc_number: tags.disc_number.filter(|d| *d > 0).or(inferred_disc),
|
||||||
|
year: tags.year.and_then(|y| u32::try_from(y).ok()),
|
||||||
|
genre: tags.genre.clone(),
|
||||||
|
catalog_number: None,
|
||||||
|
duration_secs: info.duration_secs(),
|
||||||
|
format: AudioFormat::Dsd,
|
||||||
|
// 1-bit stream; sample_rate carries the DSD bit rate (2 822 400 =
|
||||||
|
// DSD64) — the badge layer derives "DSD64/128/256" from it.
|
||||||
|
bit_depth: Some(1),
|
||||||
|
sample_rate: info.dsd_rate as f64,
|
||||||
|
channels: info.channels as u8,
|
||||||
|
file_size_bytes,
|
||||||
|
cue_file_path: None,
|
||||||
|
cue_start_secs: None,
|
||||||
|
cue_end_secs: None,
|
||||||
|
artwork_path: None,
|
||||||
|
last_modified,
|
||||||
|
indexed_at: SystemTime::now()
|
||||||
|
.duration_since(UNIX_EPOCH)
|
||||||
|
.map(|d| d.as_secs() as i64)
|
||||||
|
.unwrap_or(0),
|
||||||
|
source: None,
|
||||||
|
qobuz_track_id: None,
|
||||||
|
is_network_mount: false,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
/// Extract audio properties without full metadata
|
/// Extract audio properties without full metadata
|
||||||
pub fn extract_properties(file_path: &Path) -> Result<AudioProperties, LibraryError> {
|
pub fn extract_properties(file_path: &Path) -> Result<AudioProperties, LibraryError> {
|
||||||
|
if qbz_dsd::is_dsd_path(file_path) {
|
||||||
|
let demux = qbz_dsd::open_dsd(file_path)
|
||||||
|
.map_err(|e| LibraryError::Metadata(format!("Failed to read DSD file: {}", e)))?;
|
||||||
|
let info = demux.info();
|
||||||
|
return Ok(AudioProperties {
|
||||||
|
duration_secs: info.duration_secs(),
|
||||||
|
bit_depth: Some(1),
|
||||||
|
sample_rate: info.dsd_rate as f64,
|
||||||
|
channels: info.channels as u8,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
let tagged_file = Probe::open(file_path)
|
let tagged_file = Probe::open(file_path)
|
||||||
.map_err(|e| LibraryError::Metadata(format!("Failed to open file: {}", e)))?
|
.map_err(|e| LibraryError::Metadata(format!("Failed to open file: {}", e)))?
|
||||||
.read()
|
.read()
|
||||||
@@ -566,12 +657,26 @@ impl MetadataExtractor {
|
|||||||
Some("aiff") | Some("aif") => AudioFormat::Aiff,
|
Some("aiff") | Some("aif") => AudioFormat::Aiff,
|
||||||
Some("ape") => AudioFormat::Ape,
|
Some("ape") => AudioFormat::Ape,
|
||||||
Some("mp3") => AudioFormat::Mp3,
|
Some("mp3") => AudioFormat::Mp3,
|
||||||
|
Some("dsf") | Some("dff") => AudioFormat::Dsd,
|
||||||
_ => AudioFormat::Unknown,
|
_ => AudioFormat::Unknown,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Extract and save artwork as thumbnail to cache directory
|
/// Extract and save artwork as thumbnail to cache directory
|
||||||
pub fn extract_artwork(file_path: &Path, _cache_dir: &Path) -> Option<String> {
|
pub fn extract_artwork(file_path: &Path, _cache_dir: &Path) -> Option<String> {
|
||||||
|
if qbz_dsd::is_dsd_path(file_path) {
|
||||||
|
let demux = qbz_dsd::open_dsd(file_path).ok()?;
|
||||||
|
let art = demux.info().tags.artwork.clone()?;
|
||||||
|
let cache_key = file_path.to_string_lossy().to_string();
|
||||||
|
return match generate_thumbnail_from_bytes(&art, &cache_key) {
|
||||||
|
Ok(thumbnail_path) => Some(thumbnail_path.to_string_lossy().to_string()),
|
||||||
|
Err(e) => {
|
||||||
|
log::warn!("Failed to generate DSD thumbnail for {:?}: {}", file_path, e);
|
||||||
|
None
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
let tagged_file = Probe::open(file_path).ok()?.read().ok()?;
|
let tagged_file = Probe::open(file_path).ok()?.read().ok()?;
|
||||||
let tag = tagged_file
|
let tag = tagged_file
|
||||||
.primary_tag()
|
.primary_tag()
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ pub enum AudioFormat {
|
|||||||
Aiff,
|
Aiff,
|
||||||
Ape,
|
Ape,
|
||||||
Mp3,
|
Mp3,
|
||||||
|
Dsd,
|
||||||
Unknown,
|
Unknown,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -29,6 +30,7 @@ impl std::fmt::Display for AudioFormat {
|
|||||||
AudioFormat::Aiff => write!(f, "AIFF"),
|
AudioFormat::Aiff => write!(f, "AIFF"),
|
||||||
AudioFormat::Ape => write!(f, "APE"),
|
AudioFormat::Ape => write!(f, "APE"),
|
||||||
AudioFormat::Mp3 => write!(f, "MP3"),
|
AudioFormat::Mp3 => write!(f, "MP3"),
|
||||||
|
AudioFormat::Dsd => write!(f, "DSD"),
|
||||||
AudioFormat::Unknown => write!(f, "Unknown"),
|
AudioFormat::Unknown => write!(f, "Unknown"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ use walkdir::WalkDir;
|
|||||||
use crate::LibraryError;
|
use crate::LibraryError;
|
||||||
|
|
||||||
/// Supported audio file extensions
|
/// Supported audio file extensions
|
||||||
const SUPPORTED_AUDIO_EXTENSIONS: &[&str] = &["flac", "m4a", "wav", "aiff", "aif", "ape", "mp3"];
|
const SUPPORTED_AUDIO_EXTENSIONS: &[&str] = &["flac", "m4a", "wav", "aiff", "aif", "ape", "mp3", "dsf", "dff"];
|
||||||
|
|
||||||
/// CUE file extension
|
/// CUE file extension
|
||||||
const CUE_EXTENSION: &str = "cue";
|
const CUE_EXTENSION: &str = "cue";
|
||||||
|
|||||||
Reference in new issue
Block a user