asp/keep
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename CompressionProgram to CompresionEngineProgram

Browse Source
This commit is contained in:
Andrew Phillips
2023-09-02 23:22:03 +00:00
parent 0a6cefc99e
commit 8b51210dc9
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/compression.rs
View File

@@ -15,8 +15,8 @@ pub mod program;
use none::CompressionEngineNone; use none::CompressionEngineNone;
use lz4::CompressionEngineLZ4; use lz4::CompressionEngineLZ4;
use program::CompressionProgram;
use gzip::CompressionEngineGZip; use gzip::CompressionEngineGZip;
use 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)]
@@ -38,12 +38,12 @@ pub trait CompressionEngine {
lazy_static! { lazy_static! {
pub static ref COMPRESSION_PROGRAMS: EnumMap<CompressionType, Option<CompressionProgram>> = enum_map! { pub static ref COMPRESSION_PROGRAMS: EnumMap<CompressionType, Option<CompressionEngineProgram>> = enum_map! {
CompressionType::LZ4 => None, CompressionType::LZ4 => None,
CompressionType::GZip => None, CompressionType::GZip => None,
CompressionType::BZip2 => Some(CompressionProgram::new("bzip2", vec!["-qcf"], vec!["-dcf"])), CompressionType::BZip2 => Some(CompressionEngineProgram::new("bzip2", vec!["-qcf"], vec!["-dcf"])),
CompressionType::XZ => Some(CompressionProgram::new("xz", vec!["-qcf"], vec!["-dcf"])), CompressionType::XZ => Some(CompressionEngineProgram::new("xz", vec!["-qcf"], vec!["-dcf"])),
CompressionType::ZStd => Some(CompressionProgram::new("zstd", vec!["-qcf"], vec!["-dcf"])), CompressionType::ZStd => Some(CompressionEngineProgram::new("zstd", vec!["-qcf"], vec!["-dcf"])),
CompressionType::None => None CompressionType::None => None
}; };
} }

10
src/compression/program.rs
View File

@@ -12,7 +12,7 @@ use crate::compression::CompressionEngine;
#[derive(Debug, Eq, PartialEq, Clone)] #[derive(Debug, Eq, PartialEq, Clone)]
pub struct CompressionProgram { pub struct CompressionEngineProgram {
pub program: String, pub program: String,
pub compress: Vec<String>, pub compress: Vec<String>,
pub decompress: Vec<String>, pub decompress: Vec<String>,
@@ -20,12 +20,12 @@ pub struct CompressionProgram {
} }
impl CompressionProgram { impl CompressionEngineProgram {
pub fn new(program: &str, compress: Vec<&str>, decompress: Vec<&str>) -> CompressionProgram { pub fn new(program: &str, compress: Vec<&str>, decompress: Vec<&str>) -> CompressionEngineProgram {
let program_path = get_program_path(program); let program_path = get_program_path(program);
let supported = program_path.is_ok(); let supported = program_path.is_ok();
CompressionProgram { CompressionEngineProgram {
program: program_path.unwrap_or(program.to_string()), program: program_path.unwrap_or(program.to_string()),
compress: compress.iter().map(|s| {s.to_string()}).collect(), compress: compress.iter().map(|s| {s.to_string()}).collect(),
decompress: decompress.iter().map(|s| {s.to_string()}).collect(), decompress: decompress.iter().map(|s| {s.to_string()}).collect(),
@@ -34,7 +34,7 @@ impl CompressionProgram {
} }
} }
impl CompressionEngine for CompressionProgram { impl CompressionEngine for CompressionEngineProgram {
fn is_supported(&self) -> bool { fn is_supported(&self) -> bool {
self.supported self.supported
} }

6
src/main.rs
View File

@@ -33,7 +33,7 @@ pub mod compression;
pub mod db; pub mod db;
use compression::CompressionType; use compression::CompressionType;
use compression::program::CompressionProgram; use compression::program::CompressionEngineProgram;
use humansize::{format_size, BINARY}; use humansize::{format_size, BINARY};
@@ -654,9 +654,9 @@ fn mode_status(_cmd: &mut Command, args: Args, data_path: PathBuf, db_path: Path
}; };
for compression_type in CompressionType::iter() { for compression_type in CompressionType::iter() {
let compression_program: CompressionProgram = match &compression::COMPRESSION_PROGRAMS[compression_type.clone()] { let compression_program: CompressionEngineProgram = match &compression::COMPRESSION_PROGRAMS[compression_type.clone()] {
Some(compression_program) => compression_program.clone(), Some(compression_program) => compression_program.clone(),
None => CompressionProgram { None => CompressionEngineProgram {
program: "".to_string(), program: "".to_string(),
compress: Vec::new(), compress: Vec::new(),
decompress: Vec::new(), decompress: Vec::new(),