third-party-mirrors/bliss-analyser
1
0
Fork 1
mirror of https://github.com/CDrummond/bliss-analyser.git synced 2025-04-08 05:00:02 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

If new files analysed and 'ignore' file exists then update DB's 'ignore' flags.

Browse Source 
Closes #9
This commit is contained in:
CDrummond 2025-03-04 19:06:59 +00:00
parent 2cb7dc0fa0
commit 3a387be3bf
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -6,6 +6,8 @@
defualt. Pass "--features=libav" to cargo to build against ffmpeg defualt. Pass "--features=libav" to cargo to build against ffmpeg
libraries. libraries.
4. Add ability to specify LMS JSONRPC port. 4. Add ability to specify LMS JSONRPC port.
5. If new files analysed and 'ignore' file exists then update DB's 'ignore'
flags.
0.2.3 0.2.3
----- -----

11
src/analyse.rs
View File

@ -376,7 +376,7 @@ pub fn analyse_new_cue_tracks(db:&db::Db, mpath: &PathBuf, cue_tracks:Vec<cue::C
Ok(()) Ok(())
} }
pub fn analyse_files(db_path: &str, mpaths: &Vec<PathBuf>, dry_run: bool, keep_old: bool, max_num_files: usize, max_threads: usize) { pub fn analyse_files(db_path: &str, mpaths: &Vec<PathBuf>, dry_run: bool, keep_old: bool, max_num_files: usize, max_threads: usize, ignore_path: &PathBuf) {
let mut db = db::Db::new(&String::from(db_path)); let mut db = db::Db::new(&String::from(db_path));
db.init(); db.init();
@ -385,6 +385,7 @@ pub fn analyse_files(db_path: &str, mpaths: &Vec<PathBuf>, dry_run: bool, keep_o
db.remove_old(mpaths, dry_run); db.remove_old(mpaths, dry_run);
} }
let mut changes_made = false;
for path in mpaths { for path in mpaths {
let mpath = path.clone(); let mpath = path.clone();
let cur = path.clone(); let cur = path.clone();
@ -417,7 +418,7 @@ pub fn analyse_files(db_path: &str, mpaths: &Vec<PathBuf>, dry_run: bool, keep_o
} else { } else {
if !track_paths.is_empty() { if !track_paths.is_empty() {
match analyse_new_files(&db, &mpath, track_paths, max_threads) { match analyse_new_files(&db, &mpath, track_paths, max_threads) {
Ok(_) => { } Ok(_) => { changes_made = true; }
Err(e) => { log::error!("Analysis returned error: {}", e); } Err(e) => { log::error!("Analysis returned error: {}", e); }
} }
} else { } else {
@ -427,7 +428,7 @@ pub fn analyse_files(db_path: &str, mpaths: &Vec<PathBuf>, dry_run: bool, keep_o
#[cfg(not(feature = "libav"))] #[cfg(not(feature = "libav"))]
if !cue_tracks.is_empty() { if !cue_tracks.is_empty() {
match analyse_new_cue_tracks(&db, &mpath, cue_tracks) { match analyse_new_cue_tracks(&db, &mpath, cue_tracks) {
Ok(_) => { }, Ok(_) => { changes_made = true; },
Err(e) => { log::error!("Cue analysis returned error: {}", e); } Err(e) => { log::error!("Cue analysis returned error: {}", e); }
} }
} }
@ -435,6 +436,10 @@ pub fn analyse_files(db_path: &str, mpaths: &Vec<PathBuf>, dry_run: bool, keep_o
} }
db.close(); db.close();
if changes_made && ignore_path.exists() && ignore_path.is_file() {
log::info!("Updating 'ignore' flags");
update_ignore(&db_path, &ignore_path);
}
} }
pub fn read_tags(db_path: &str, mpaths: &Vec<PathBuf>) { pub fn read_tags(db_path: &str, mpaths: &Vec<PathBuf>) {

3
src/main.rs
View File

@ -199,7 +199,8 @@ fn main() {
} }
analyse::update_ignore(&db_path, &ignore_path); analyse::update_ignore(&db_path, &ignore_path);
} else { } else {
analyse::analyse_files(&db_path, &music_paths, dry_run, keep_old, max_num_files, max_threads); let ignore_path = PathBuf::from(&ignore_file);
analyse::analyse_files(&db_path, &music_paths, dry_run, keep_old, max_num_files, max_threads, &ignore_path);
} }
} }
} }