From e7496b89782dfa5f9708f7d7b4878118936e48e1 Mon Sep 17 00:00:00 2001 From: Andrew Phillips Date: Tue, 13 May 2025 18:36:23 -0300 Subject: [PATCH] fix: Fix COMPRESSION typo, correct DIGEST log tag, and refactor mode_update cloning --- src/compression_engine.rs | 2 +- src/digest_engine/program.rs | 2 +- src/modes/update.rs | 16 +++++++--------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/compression_engine.rs b/src/compression_engine.rs index dd91428..ebe99d9 100755 --- a/src/compression_engine.rs +++ b/src/compression_engine.rs @@ -97,7 +97,7 @@ pub trait CompressionEngine { loop { let n = reader.read(&mut buffer[..libc::BUFSIZ as usize])?; if n == 0 { - debug!("COMPREESSION: EOF"); + debug!("COMPRESSION: EOF"); break; } diff --git a/src/digest_engine/program.rs b/src/digest_engine/program.rs index 0bec125..c126bff 100644 --- a/src/digest_engine/program.rs +++ b/src/digest_engine/program.rs @@ -72,7 +72,7 @@ impl DigestEngine for DigestEngineProgram { } fn get_program_path(program: &str) -> Result { - debug!("COMPRESSION: Looking for executable: {}", program); + debug!("DIGEST: Looking for executable: {}", program); if let Ok(path) = env::var("PATH") { for p in path.split(':') { let p_str = format!("{}/{}", p, program); diff --git a/src/modes/update.rs b/src/modes/update.rs index 660c2dd..671fc9e 100644 --- a/src/modes/update.rs +++ b/src/modes/update.rs @@ -39,18 +39,16 @@ pub fn mode_update( db::set_item_tags(conn, item.clone(), tags)?; } + let item_path = { + let mut path = data_path.clone(); + path.push(item.id.unwrap().to_string()); + path + }; + if item.size.is_none() { info!("Updating unknown stream size"); - let item_path = { - let mut path = data_path.clone(); - path.push(item.id.unwrap().to_string()); - path - }; let item_file_metadata = item_path.metadata(); - // Ensure item_path is in scope for later use - let item_path_clone = item_path.clone(); - if item_file_metadata.is_ok() { debug!("MAIN: Updating stream size of {:?}", item_path); let compression_type = CompressionType::from_str(&item.compression)?; @@ -80,7 +78,7 @@ pub fn mode_update( let compression_engine = get_compression_engine(compression_type) .expect("Unable to get compression engine"); - let mut reader = compression_engine.open(item_path_clone)?; + let mut reader = compression_engine.open(item_path.clone())?; let mut buffer = [0; 4096]; loop {