third-party-mirrors/bliss-analyser
1
0 Fork 1
mirror of https://github.com/CDrummond/bliss-analyser.git synced 2026-10-22 14:32:08 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

- Store analysis in BLISS_ANALYSIS tag, not in a COMMENT tag.

Browse Source 
- Fix read of tags during analysis phase.
Closes #23
This commit is contained in:
CDrummond committed 2025-05-13 12:25:50 +01:00
1 parent 50a55ee61a
commit 5722b04c85
5 files changed
+84 -60
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/analyse.rs
+8 -4
View File
@@ -111,7 +111,7 @@ fn check_dir_entry(db: &mut db::Db, mpath: &Path, entry: DirEntry, track_paths:
if id<=0 {
let mut tags_used = false;
if use_tags {
let meta = tags::read(&sname, true);
let meta = tags::read(&String::from(pb.to_string_lossy()), true);
if !meta.is_empty() && !meta.analysis.is_none() {
if !dry_run {
db.add_track(&sname, &meta, &meta.analysis.unwrap());
@@ -430,12 +430,16 @@ pub fn analyse_files(db_path: &str, mpaths: &Vec<PathBuf>, dry_run: bool, keep_o
}
get_file_list(&mut db, &mpath, &cur, &mut track_paths, &mut cue_tracks, &mut file_count, max_num_files, use_tags, &mut tagged_file_count, dry_run);
track_paths.sort();
log::info!("Num new files: {}", track_paths.len());
if use_tags {
log::info!("New untagged files: {}", track_paths.len());
} else {
log::info!("New files: {}", track_paths.len());
}
if !cue_tracks.is_empty() {
log::info!("Num new cue tracks: {}", cue_tracks.len());
log::info!("New cue tracks: {}", cue_tracks.len());
}
if use_tags {
log::info!("Num tagged files: {}", tagged_file_count);
log::info!("New tagged files: {}", tagged_file_count);
}
if dry_run {
src/tags.rs
+69 -54
View File
@@ -21,12 +21,11 @@ use bliss_audio::{Analysis, AnalysisIndex};
const MAX_GENRE_VAL: usize = 192;
const NUM_ANALYSIS_VALS: usize = 20;
const ANALYSIS_TAG:ItemKey = ItemKey::Comment;
const ANALYSIS_TAG_START: &str = "BLISS_ANALYSIS";
const ANALYSIS_TAG: &str = "BLISS_ANALYSIS";
const ANALYSIS_TAG_VER: u16 = 1;
pub fn write_analysis(track: &String, analysis: &Analysis, preserve_mod_times: bool) {
let value = format!("{},{},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24}", ANALYSIS_TAG_START, ANALYSIS_TAG_VER,
let value = format!("{},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24},{:.24}", ANALYSIS_TAG_VER,
analysis[AnalysisIndex::Tempo], analysis[AnalysisIndex::Zcr], analysis[AnalysisIndex::MeanSpectralCentroid], analysis[AnalysisIndex::StdDeviationSpectralCentroid], analysis[AnalysisIndex::MeanSpectralRolloff],
analysis[AnalysisIndex::StdDeviationSpectralRolloff], analysis[AnalysisIndex::MeanSpectralFlatness], analysis[AnalysisIndex::StdDeviationSpectralFlatness], analysis[AnalysisIndex::MeanLoudness], analysis[AnalysisIndex::StdDeviationLoudness],
analysis[AnalysisIndex::Chroma1], analysis[AnalysisIndex::Chroma2], analysis[AnalysisIndex::Chroma3], analysis[AnalysisIndex::Chroma4], analysis[AnalysisIndex::Chroma5],
@@ -46,23 +45,13 @@ pub fn write_analysis(track: &String, analysis: &Analysis, preserve_mod_times: b
},
};
// Remove any existing analysis result tag
let entries = tag.get_strings(&ANALYSIS_TAG);
let mut keep: Vec<ItemValue> = Vec::new();
for entry in entries {
if !entry.starts_with(ANALYSIS_TAG_START) {
keep.push(ItemValue::Text(entry.to_string()));
}
}
tag.remove_key(&ANALYSIS_TAG);
for k in keep {
tag.push(TagItem::new(ANALYSIS_TAG, k));
}
// Store analysis results
tag.push(TagItem::new(ANALYSIS_TAG, ItemValue::Text(value)));
let tag_key = ItemKey::Unknown(ANALYSIS_TAG.to_string());
tag.remove_key(&tag_key);
tag.insert_unchecked(TagItem::new(tag_key, ItemValue::Text(value)));
let now = SystemTime::now();
let mut mod_time = now;
if preserve_mod_times {
if let Ok(fmeta) = fs::metadata(track) {
if let Ok(time) = fmeta.modified() {
@@ -81,6 +70,49 @@ pub fn write_analysis(track: &String, analysis: &Analysis, preserve_mod_times: b
}
}
fn read_analysis_string(tag_str: &str, start_tag_pos:usize, version_pos:usize) -> Option<Analysis> {
let parts = tag_str.split(",");
let mut index = 0;
let mut num_read_vals = 0;
let mut vals = [0.; NUM_ANALYSIS_VALS];
let val_start_pos = version_pos+1;
for part in parts {
if index==start_tag_pos && start_tag_pos<version_pos {
if part!=ANALYSIS_TAG {
break;
}
} else if index==version_pos {
match part.parse::<u16>() {
Ok(ver) => {
if ver!=ANALYSIS_TAG_VER {
break;
}
},
Err(_) => {
break;
}
}
} else if (index - val_start_pos) < NUM_ANALYSIS_VALS {
match part.parse::<f32>() {
Ok(val) => {
num_read_vals += 1;
vals[index - val_start_pos] = val;
},
Err(_) => {
break;
}
}
} else {
break;
}
index += 1;
}
if num_read_vals == NUM_ANALYSIS_VALS {
return Some(Analysis::new(vals));
}
None
}
pub fn read(track: &String, read_analysis: bool) -> db::Metadata {
let mut meta = db::Metadata {
duration: 180,
@@ -140,45 +172,28 @@ pub fn read(track: &String, read_analysis: bool) -> db::Metadata {
meta.duration = file.properties().duration().as_secs() as u32;
if read_analysis {
let entries = tag.get_strings(&ANALYSIS_TAG);
for entry in entries {
if entry.len()>(ANALYSIS_TAG_START.len()+(NUM_ANALYSIS_VALS*8)) && entry.starts_with(ANALYSIS_TAG_START) {
let parts = entry.split(",");
let mut index = 0;
let mut vals = [0.; NUM_ANALYSIS_VALS];
for part in parts {
if 0==index {
if part!=ANALYSIS_TAG_START {
break;
}
} else if 1==index {
match part.parse::<u16>() {
Ok(ver) => {
if ver!=ANALYSIS_TAG_VER {
break;
}
},
Err(_) => {
break;
}
}
} else if (index - 2) < NUM_ANALYSIS_VALS {
match part.parse::<f32>() {
Ok(val) => {
vals[index - 2] = val;
},
Err(_) => {
break;
}
}
} else {
break;
match tag.get_string(&ItemKey::Unknown(ANALYSIS_TAG.to_string())) {
Some(tag_str) => {
match read_analysis_string(tag_str, 100, 0) {
Some(analysis) => {
meta.analysis = Some(analysis);
}
index += 1;
None => { }
}
if index == (NUM_ANALYSIS_VALS+2) {
meta.analysis = Some(Analysis::new(vals));
break;
}
None => {
// Old, stored in comment
let entries = tag.get_strings(&ItemKey::Comment);
for entry in entries {
if entry.len()>(ANALYSIS_TAG.len()+(NUM_ANALYSIS_VALS*8)) && entry.starts_with(ANALYSIS_TAG) {
match read_analysis_string(entry, 0, 1) {
Some(analysis) => {
meta.analysis = Some(analysis);
break;
}
None => { }
}
}
}
}
}