From 8b51210dc9430a62e015aae8348da2b3574aee29 Mon Sep 17 00:00:00 2001
From: Andrew Phillips <andrew.phillips2@canada.ca>
Date: Sat, 2 Sep 2023 23:22:03 +0000
Subject: [PATCH] Rename CompressionProgram to CompresionEngineProgram

---
 src/compression.rs         | 10 +++++-----
 src/compression/program.rs | 10 +++++-----
 src/main.rs                |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/compression.rs b/src/compression.rs
index ef357a8..6e8100b 100755
--- a/src/compression.rs
+++ b/src/compression.rs
@@ -15,8 +15,8 @@ pub mod program;
 
 use none::CompressionEngineNone;
 use lz4::CompressionEngineLZ4;
-use program::CompressionProgram;
 use gzip::CompressionEngineGZip;
+use program::CompressionEngineProgram;
 
 #[derive(Debug, Eq, PartialEq, Clone, strum::EnumIter, strum::Display, strum::EnumString, Enum)]
 #[strum(ascii_case_insensitive)]
@@ -38,12 +38,12 @@ pub trait CompressionEngine {
 
 
 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::GZip => None,
-        CompressionType::BZip2 => Some(CompressionProgram::new("bzip2", vec!["-qcf"], vec!["-dcf"])),
-        CompressionType::XZ => Some(CompressionProgram::new("xz", vec!["-qcf"], vec!["-dcf"])),
-        CompressionType::ZStd => Some(CompressionProgram::new("zstd", vec!["-qcf"], vec!["-dcf"])),
+        CompressionType::BZip2 => Some(CompressionEngineProgram::new("bzip2", vec!["-qcf"], vec!["-dcf"])),
+        CompressionType::XZ => Some(CompressionEngineProgram::new("xz", vec!["-qcf"], vec!["-dcf"])),
+        CompressionType::ZStd => Some(CompressionEngineProgram::new("zstd", vec!["-qcf"], vec!["-dcf"])),
         CompressionType::None => None
     };
 }
diff --git a/src/compression/program.rs b/src/compression/program.rs
index 2cb679d..566c267 100644
--- a/src/compression/program.rs
+++ b/src/compression/program.rs
@@ -12,7 +12,7 @@ use crate::compression::CompressionEngine;
 
 
 #[derive(Debug, Eq, PartialEq, Clone)]
-pub struct CompressionProgram {
+pub struct CompressionEngineProgram {
     pub program: String,
     pub compress: Vec<String>,
     pub decompress: Vec<String>,
@@ -20,12 +20,12 @@ pub struct CompressionProgram {
 }
 
 
-impl CompressionProgram {
-    pub fn new(program: &str, compress: Vec<&str>, decompress: Vec<&str>) -> CompressionProgram {
+impl CompressionEngineProgram {
+    pub fn new(program: &str, compress: Vec<&str>, decompress: Vec<&str>) -> CompressionEngineProgram {
         let program_path = get_program_path(program);
         let supported = program_path.is_ok();
 
-        CompressionProgram {
+        CompressionEngineProgram {
             program: program_path.unwrap_or(program.to_string()),
             compress: compress.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 {
         self.supported
     }
diff --git a/src/main.rs b/src/main.rs
index 9d5a713..bcdf493 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -33,7 +33,7 @@ pub mod compression;
 pub mod db;
 
 use compression::CompressionType;
-use compression::program::CompressionProgram;
+use compression::program::CompressionEngineProgram;
 
 
 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() {
-        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(),
-            None => CompressionProgram {
+            None => CompressionEngineProgram {
                 program: "".to_string(),
                 compress: Vec::new(),
                 decompress: Vec::new(),