Fix checking if CUE already analysed.

Issue #2

Cargo.lock

@@ -113,7 +113,7 @@ dependencies = [
 
 [[package]]
 name = "bliss-analyser"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "anyhow",
  "argparse",

ChangeLog

@@ -1,6 +1,7 @@
 0.2.1
 -----
 1. Update version of tag reader library.
+2. Fix checking if CUE already analysed.
 
 0.2.0
 -----

src/analyse.rs

@@ -58,15 +58,20 @@ fn check_dir_entry(db: &mut db::Db, mpath: &Path, entry: DirEntry, track_paths:
                 cue_file.set_extension("cue");
                 if cue_file.exists() {
                     // For cue files, check if first track is in DB
-                    let mut track_path = pb.clone();
+                    let mut cue_track_path = pb.clone();
                     let ext = pb.extension().unwrap().to_string_lossy();
-                    track_path.set_extension(format!("{}{}1", ext, db::CUE_MARKER));
-                    let db_track = String::from(track_path.to_string_lossy());
-                    if let Ok(id) = db.get_rowid(&db_track) {
+                    cue_track_path.set_extension(format!("{}{}1", ext, db::CUE_MARKER));
+                    match cue_track_path.strip_prefix(mpath) {
+                        Ok(cue_track_stripped) => {
+                            let cue_track_sname = String::from(cue_track_stripped.to_string_lossy());
+                            if let Ok(id) = db.get_rowid(&cue_track_sname) {
                                 if id<=0 {
                                     track_paths.push(String::from(cue_file.to_string_lossy()));
                                 }
                             }
+                        }
+                        Err(_) => { }
+                    }
                 } else {
                     if let Ok(id) = db.get_rowid(&sname) {
                         if id<=0 {