fix: correct compression module imports
This commit is contained in:
@@ -18,10 +18,10 @@ pub mod lz4;
|
|||||||
pub mod none;
|
pub mod none;
|
||||||
pub mod program;
|
pub mod program;
|
||||||
|
|
||||||
use gzip::CompressionEngineGZip;
|
use crate::gzip::CompressionEngineGZip;
|
||||||
use lz4::CompressionEngineLZ4;
|
use crate::lz4::CompressionEngineLZ4;
|
||||||
use none::CompressionEngineNone;
|
use crate::none::CompressionEngineNone;
|
||||||
use program::CompressionEngineProgram;
|
use crate::program::CompressionEngineProgram;
|
||||||
|
|
||||||
#[derive(Debug, Eq, PartialEq, Clone, strum::EnumIter, strum::Display, strum::EnumString, Enum)]
|
#[derive(Debug, Eq, PartialEq, Clone, strum::EnumIter, strum::Display, strum::EnumString, Enum)]
|
||||||
#[strum(ascii_case_insensitive)]
|
#[strum(ascii_case_insensitive)]
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ use flate2::read::GzDecoder;
|
|||||||
use flate2::write::GzEncoder;
|
use flate2::write::GzEncoder;
|
||||||
use flate2::Compression;
|
use flate2::Compression;
|
||||||
|
|
||||||
use crate::compression::CompressionEngine;
|
use crate::compression_engine::CompressionEngine;
|
||||||
|
|
||||||
#[derive(Debug, Eq, PartialEq, Clone, Default)]
|
#[derive(Debug, Eq, PartialEq, Clone, Default)]
|
||||||
pub struct CompressionEngineGZip {}
|
pub struct CompressionEngineGZip {}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ use std::path::PathBuf;
|
|||||||
|
|
||||||
use lz4_flex::frame::{FrameDecoder, FrameEncoder};
|
use lz4_flex::frame::{FrameDecoder, FrameEncoder};
|
||||||
|
|
||||||
use crate::compression::CompressionEngine;
|
use crate::compression_engine::CompressionEngine;
|
||||||
|
|
||||||
#[derive(Debug, Eq, PartialEq, Clone, Default)]
|
#[derive(Debug, Eq, PartialEq, Clone, Default)]
|
||||||
pub struct CompressionEngineLZ4 {}
|
pub struct CompressionEngineLZ4 {}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ use std::fs::File;
|
|||||||
use std::io::{Read, Write};
|
use std::io::{Read, Write};
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
|
|
||||||
use crate::compression::CompressionEngine;
|
use crate::compression_engine::CompressionEngine;
|
||||||
|
|
||||||
#[derive(Debug, Eq, PartialEq, Clone, Default)]
|
#[derive(Debug, Eq, PartialEq, Clone, Default)]
|
||||||
pub struct CompressionEngineNone {}
|
pub struct CompressionEngineNone {}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ use std::os::unix::fs::PermissionsExt;
|
|||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
use std::process::{Command, Stdio};
|
use std::process::{Command, Stdio};
|
||||||
|
|
||||||
use crate::compression::CompressionEngine;
|
use crate::compression_engine::CompressionEngine;
|
||||||
|
|
||||||
#[derive(Debug, Eq, PartialEq, Clone)]
|
#[derive(Debug, Eq, PartialEq, Clone)]
|
||||||
pub struct CompressionEngineProgram {
|
pub struct CompressionEngineProgram {
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ pub mod compression_engine;
|
|||||||
pub mod db;
|
pub mod db;
|
||||||
//pub mod item;
|
//pub mod item;
|
||||||
|
|
||||||
use compression::CompressionType;
|
use crate::compression_engine::CompressionType;
|
||||||
|
|
||||||
extern crate term;
|
extern crate term;
|
||||||
|
|
||||||
|
|||||||
@@ -133,7 +133,7 @@ pub fn mode_diff(
|
|||||||
) {
|
) {
|
||||||
use std::io::BufWriter;
|
use std::io::BufWriter;
|
||||||
let mut buffered_pipe_writer = BufWriter::new(pipe_writer_raw);
|
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");
|
.expect("Unable to get compression engine");
|
||||||
log::debug!("THREAD: Sending item to diff");
|
log::debug!("THREAD: Sending item to diff");
|
||||||
engine
|
engine
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ pub fn mode_get(
|
|||||||
item_path.push(item.id.unwrap().to_string());
|
item_path.push(item.id.unwrap().to_string());
|
||||||
|
|
||||||
let compression_type = CompressionType::from_str(&item.compression)?;
|
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())?;
|
compression_engine.cat(item_path.clone())?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ pub fn mode_update(
|
|||||||
if item_file_metadata.is_ok() {
|
if item_file_metadata.is_ok() {
|
||||||
debug!("MAIN: Updating stream size of {:?}", item_path);
|
debug!("MAIN: Updating stream size of {:?}", item_path);
|
||||||
let compression_type = CompressionType::from_str(&item.compression)?;
|
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");
|
.expect("Unable to get compression engine");
|
||||||
let size = compression_engine.size(item_path)? as i64;
|
let size = compression_engine.size(item_path)? as i64;
|
||||||
item.size = Some(size);
|
item.size = Some(size);
|
||||||
|
|||||||
Reference in New Issue
Block a user