added better mutex handlingv0.2.3

8 files changed, 63 insertions, 44 deletions

diff --git a/.gitignore b/.gitignore
index f97ae78..6b5265b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,7 @@
 target
 testfiles
 testfiles_orig
-*.flac
-*.wav
-*.tmp
-*.db
\ No newline at end of file
+./*.flac
+./*.wav
+./*.tmp
+./*.db
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index ecb3970..68c575e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -311,7 +311,7 @@ dependencies = [
 
 [[package]]
 name = "flac-reencoder"
-version = "0.2.2"
+version = "0.2.3"
 dependencies = [
  "anyhow",
  "clap",
diff --git a/Cargo.toml b/Cargo.toml
index a06d20b..9c7445d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "flac-reencoder"
-version = "0.2.2"
+version = "0.2.3"
 edition = "2024"
 repository = "https://github.com/justjakka/reencoder/"
 license = "BSD-3-Clause"
diff --git a/samples/16bit.flac b/samples/16bit.flac
new file mode 100644
index 0000000..70899fc
--- /dev/null
+++ b/samples/16bit.flac
diff --git a/samples/24bit.flac b/samples/24bit.flac
new file mode 100644
index 0000000..b5d0985
--- /dev/null
+++ b/samples/24bit.flac
diff --git a/samples/32bit.flac b/samples/32bit.flac
new file mode 100644
index 0000000..dbb434f
--- /dev/null
+++ b/samples/32bit.flac
diff --git a/src/files.rs b/src/files.rs
index 9793243..d3f68b4 100644
--- a/src/files.rs
+++ b/src/files.rs
@@ -149,21 +149,24 @@ pub fn reencode_files(conn: Connection, handler: Arc<AtomicBool>) -> Result<()>
 
     files.par_iter().for_each(|file| {
         if handler.load(Ordering::SeqCst) {
-            let conn = match lock.lock() {
-                Ok(conn) => conn,
-                Err(_) => {
-                    eprintln!("Lock poisoned on file:\t{}", file.to_string_lossy());
-                    return;
-                }
-            };
-            if let Err(error) = handle_encode(file) {
-                eprintln!("{}", FileError::new(file, error));
-            } else {
-                if let Err(error) = conn.update_file(file) {
-                    eprintln!("{}", FileError::new(file, error));
+            let newhandler = handler.clone();
+            match handle_encode(file, newhandler) {
+                Err(error) => eprintln!("{}", FileError::new(file, error)),
+                Ok(false) => {
+                    let conn = match lock.lock() {
+                        Ok(conn) => conn,
+                        Err(_) => {
+                            eprintln!("Lock poisoned on file:\t{}", file.to_string_lossy());
+                            return;
+                        }
+                    };
+                    if let Err(error) = conn.update_file(file) {
+                        eprintln!("{}", FileError::new(file, error));
+                    }
+                    #[cfg(not(test))]
+                    bar.inc(1)
                 }
-                #[cfg(not(test))]
-                bar.inc(1)
+                Ok(true) => {}
             }
         }
     });
diff --git a/src/flac.rs b/src/flac.rs
index 823f4e4..0879faa 100644
--- a/src/flac.rs
+++ b/src/flac.rs
@@ -3,7 +3,13 @@ use claxon::{FlacReader, FlacReaderOptions};
 use flac_bound::FlacEncoder;
 use md5::{Digest, Md5};
 use metaflac::{Block, Tag};
-use std::path::Path;
+use std::{
+    path::Path,
+    sync::{
+        Arc,
+        atomic::{AtomicBool, Ordering},
+    },
+};
 
 pub const CURRENT_VENDOR: &str = "reference libFLAC 1.5.0 20250211";
 
@@ -35,7 +41,7 @@ fn write_tags(filename: impl AsRef<Path>, hash: Vec<u8>) -> Result<()> {
     Ok(())
 }
 
-fn encode_file(filename: impl AsRef<Path>) -> Result<()> {
+fn encode_file(filename: impl AsRef<Path>, handler: Arc<AtomicBool>) -> Result<bool> {
     let temp_name = filename.as_ref().with_extension("tmp");
     if temp_name.exists() {
         std::fs::remove_file(&temp_name)?;
@@ -55,7 +61,7 @@ fn encode_file(filename: impl AsRef<Path>) -> Result<()> {
 
     let mut hasher = Md5::new();
 
-    let samples = decoder
+    for samples in decoder
         .samples()
         .map(|res| {
             let sample = res.unwrap();
@@ -73,11 +79,17 @@ fn encode_file(filename: impl AsRef<Path>) -> Result<()> {
             }
             sample
         })
-        .collect::<Vec<i32>>();
-
-    encoder
-        .process_interleaved(&samples, samples.len() as u32 / streaminfo.channels)
-        .unwrap();
+        .collect::<Vec<i32>>()
+        .chunks(streaminfo.channels as usize)
+    {
+        if handler.load(Ordering::SeqCst) {
+            let _ =
+                encoder.process_interleaved(samples, samples.len() as u32 / streaminfo.channels);
+        } else {
+            let _ = std::fs::remove_file(temp_name);
+            return Ok(true);
+        }
+    }
 
     if let Err(enc) = encoder.finish() {
         return Err(anyhow!("Encoding failed:\t{:?}", enc.state()));
@@ -86,15 +98,16 @@ fn encode_file(filename: impl AsRef<Path>) -> Result<()> {
     let hash = hasher.finalize().to_vec();
     write_tags(&filename, hash)?;
     std::fs::rename(temp_name, filename)?;
-    Ok(())
+    Ok(false)
 }
 
-pub fn handle_encode(filename: impl AsRef<Path>) -> Result<()> {
-    if let Err(error) = encode_file(&filename) {
-        let _ = std::fs::remove_file(filename.as_ref().with_extension("tmp"));
-        Err(error)
-    } else {
-        Ok(())
+pub fn handle_encode(filename: impl AsRef<Path>, handler: Arc<AtomicBool>) -> Result<bool> {
+    match encode_file(&filename, handler) {
+        Err(error) => {
+            let _ = std::fs::remove_file(filename.as_ref().with_extension("tmp"));
+            Err(error)
+        }
+        Ok(res) => Ok(res),
     }
 }
 
@@ -120,10 +133,11 @@ mod tests {
 
     #[test]
     fn bit16() {
-        let name = "16bit.flac";
-        let tempname = "16bit.flac.temp";
+        let name = "./samples/16bit.flac";
+        let tempname = "./samples/16bit.flac.temp";
         std::fs::copy(name, tempname).unwrap();
-        encode_file(name).unwrap();
+        let handler = Arc::new(AtomicBool::new(true));
+        encode_file(name, handler).unwrap();
         let target_md5 = FlacReader::open(tempname).unwrap().streaminfo().md5sum;
         let temp_md5 = FlacReader::open(name).unwrap().streaminfo().md5sum;
 
@@ -133,10 +147,11 @@ mod tests {
 
     #[test]
     fn bit24() {
-        let name = "24bit.flac";
-        let tempname = "24bit.flac.temp";
+        let name = "./samples/24bit.flac";
+        let tempname = "./samples/24bit.flac.temp";
         std::fs::copy(name, tempname).unwrap();
-        encode_file(name).unwrap();
+        let handler = Arc::new(AtomicBool::new(true));
+        encode_file(name, handler).unwrap();
         let target_md5 = FlacReader::open(tempname).unwrap().streaminfo().md5sum;
         let temp_md5 = FlacReader::open(name).unwrap().streaminfo().md5sum;
 
@@ -146,10 +161,11 @@ mod tests {
 
     #[test]
     fn bit32() {
-        let name = "32bit.flac";
-        let tempname = "32bit.flac.temp";
+        let name = "./samples/32bit.flac";
+        let tempname = "./samples/32bit.flac.temp";
         std::fs::copy(name, tempname).unwrap();
-        encode_file(name).unwrap();
+        let handler = Arc::new(AtomicBool::new(true));
+        encode_file(name, handler).unwrap();
         let target_md5 = FlacReader::open(tempname).unwrap().streaminfo().md5sum;
         let temp_md5 = FlacReader::open(name).unwrap().streaminfo().md5sum;