diff --git a/src/compression_engine.rs b/src/compression_engine.rs index 64e8325..acdb7f2 100755 --- a/src/compression_engine.rs +++ b/src/compression_engine.rs @@ -18,10 +18,10 @@ pub mod lz4; pub mod none; pub mod program; -use gzip::CompressionEngineGZip; -use lz4::CompressionEngineLZ4; -use none::CompressionEngineNone; -use program::CompressionEngineProgram; +use crate::gzip::CompressionEngineGZip; +use crate::lz4::CompressionEngineLZ4; +use crate::none::CompressionEngineNone; +use crate::program::CompressionEngineProgram; #[derive(Debug, Eq, PartialEq, Clone, strum::EnumIter, strum::Display, strum::EnumString, Enum)] #[strum(ascii_case_insensitive)] diff --git a/src/compression_engine/gzip.rs b/src/compression_engine/gzip.rs index bcc6fd5..5449e4b 100644 --- a/src/compression_engine/gzip.rs +++ b/src/compression_engine/gzip.rs @@ -9,7 +9,7 @@ use flate2::read::GzDecoder; use flate2::write::GzEncoder; use flate2::Compression; -use crate::compression::CompressionEngine; +use crate::compression_engine::CompressionEngine; #[derive(Debug, Eq, PartialEq, Clone, Default)] pub struct CompressionEngineGZip {} diff --git a/src/compression_engine/lz4.rs b/src/compression_engine/lz4.rs index d97d916..2f6ab8e 100644 --- a/src/compression_engine/lz4.rs +++ b/src/compression_engine/lz4.rs @@ -6,7 +6,7 @@ use std::path::PathBuf; use lz4_flex::frame::{FrameDecoder, FrameEncoder}; -use crate::compression::CompressionEngine; +use crate::compression_engine::CompressionEngine; #[derive(Debug, Eq, PartialEq, Clone, Default)] pub struct CompressionEngineLZ4 {} diff --git a/src/compression_engine/none.rs b/src/compression_engine/none.rs index 7c1c260..aee2670 100644 --- a/src/compression_engine/none.rs +++ b/src/compression_engine/none.rs @@ -4,7 +4,7 @@ use std::fs::File; use std::io::{Read, Write}; use std::path::PathBuf; -use crate::compression::CompressionEngine; +use crate::compression_engine::CompressionEngine; #[derive(Debug, Eq, PartialEq, Clone, Default)] pub struct CompressionEngineNone {} diff --git a/src/compression_engine/program.rs b/src/compression_engine/program.rs index 7632698..a447e24 100644 --- a/src/compression_engine/program.rs +++ b/src/compression_engine/program.rs @@ -8,7 +8,7 @@ use std::os::unix::fs::PermissionsExt; use std::path::PathBuf; use std::process::{Command, Stdio}; -use crate::compression::CompressionEngine; +use crate::compression_engine::CompressionEngine; #[derive(Debug, Eq, PartialEq, Clone)] pub struct CompressionEngineProgram { diff --git a/src/main.rs b/src/main.rs index 61c2491..ea498f4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -22,7 +22,7 @@ pub mod compression_engine; pub mod db; //pub mod item; -use compression::CompressionType; +use crate::compression_engine::CompressionType; extern crate term; diff --git a/src/modes/diff.rs b/src/modes/diff.rs index f0f1103..0091608 100644 --- a/src/modes/diff.rs +++ b/src/modes/diff.rs @@ -133,7 +133,7 @@ pub fn mode_diff( ) { use std::io::BufWriter; let mut buffered_pipe_writer = BufWriter::new(pipe_writer_raw); - let engine = crate::compression::get_engine(compression_type) + let engine = crate::compression_engine::get_engine(compression_type) .expect("Unable to get compression engine"); log::debug!("THREAD: Sending item to diff"); engine diff --git a/src/modes/get.rs b/src/modes/get.rs index 38e6219..e8b64e2 100644 --- a/src/modes/get.rs +++ b/src/modes/get.rs @@ -38,7 +38,7 @@ pub fn mode_get( item_path.push(item.id.unwrap().to_string()); let compression_type = CompressionType::from_str(&item.compression)?; - let compression_engine = crate::compression::get_engine(compression_type)?; + let compression_engine = crate::compression_engine::get_engine(compression_type)?; compression_engine.cat(item_path.clone())?; Ok(()) diff --git a/src/modes/update.rs b/src/modes/update.rs index 0840172..0026682 100644 --- a/src/modes/update.rs +++ b/src/modes/update.rs @@ -47,7 +47,7 @@ pub fn mode_update( if item_file_metadata.is_ok() { debug!("MAIN: Updating stream size of {:?}", item_path); let compression_type = CompressionType::from_str(&item.compression)?; - let compression_engine = crate::compression::get_engine(compression_type) + let compression_engine = crate::compression_engine::get_engine(compression_type) .expect("Unable to get compression engine"); let size = compression_engine.size(item_path)? as i64; item.size = Some(size);