From 02657ee5bcfa70e1785bcf119202e2ca738582cf Mon Sep 17 00:00:00 2001
From: Spyros Roum <spyrosr1@gmail.com>
Date: Fri, 22 Oct 2021 14:44:13 +0300
Subject: [PATCH] Remove the variants from `CompressionFormat`

---
 src/commands.rs  | 40 ----------------------------------------
 src/extension.rs | 18 +++++-------------
 2 files changed, 5 insertions(+), 53 deletions(-)

diff --git a/src/commands.rs b/src/commands.rs
index 2a627dd..ba4e0b8 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -222,26 +222,6 @@ fn compress_files(files: Vec<PathBuf>, formats: Vec<CompressionFormat>, output_f
             let mut writer = archive::tar::build_archive_from_paths(&files, writer)?;
             writer.flush()?;
         }
-        Tgz => {
-            let encoder = flate2::write::GzEncoder::new(writer, Default::default());
-            let writer = archive::tar::build_archive_from_paths(&files, encoder)?;
-            writer.finish()?.flush()?;
-        }
-        Tbz => {
-            let encoder = bzip2::write::BzEncoder::new(writer, Default::default());
-            let writer = archive::tar::build_archive_from_paths(&files, encoder)?;
-            writer.finish()?.flush()?;
-        }
-        Tlzma => {
-            let encoder = xz2::write::XzEncoder::new(writer, 6);
-            let writer = archive::tar::build_archive_from_paths(&files, encoder)?;
-            writer.finish()?.flush()?;
-        }
-        Tzst => {
-            let encoder = zstd::stream::write::Encoder::new(writer, Default::default())?;
-            let writer = archive::tar::build_archive_from_paths(&files, encoder)?;
-            writer.finish()?.flush()?;
-        }
         Zip => {
             eprintln!("{yellow}Warning:{reset}", yellow = *colors::YELLOW, reset = *colors::RESET);
             eprintln!("\tCompressing .zip entirely in memory.");
@@ -334,26 +314,6 @@ fn decompress_file(
             let _ = crate::archive::tar::unpack_archive(reader, output_folder, skip_questions_positively)?;
             info!("Successfully decompressed archive in {}.", nice_directory_display(output_folder));
         }
-        Tgz => {
-            let reader = chain_reader_decoder(&Gzip, reader)?;
-            let _ = crate::archive::tar::unpack_archive(reader, output_folder, skip_questions_positively)?;
-            info!("Successfully decompressed archive in {}.", nice_directory_display(output_folder));
-        }
-        Tbz => {
-            let reader = chain_reader_decoder(&Bzip, reader)?;
-            let _ = crate::archive::tar::unpack_archive(reader, output_folder, skip_questions_positively)?;
-            info!("Successfully decompressed archive in {}.", nice_directory_display(output_folder));
-        }
-        Tlzma => {
-            let reader = chain_reader_decoder(&Lzma, reader)?;
-            let _ = crate::archive::tar::unpack_archive(reader, output_folder, skip_questions_positively)?;
-            info!("Successfully decompressed archive in {}.", nice_directory_display(output_folder));
-        }
-        Tzst => {
-            let reader = chain_reader_decoder(&Zstd, reader)?;
-            let _ = crate::archive::tar::unpack_archive(reader, output_folder, skip_questions_positively)?;
-            info!("Successfully decompressed archive in {}.", nice_directory_display(output_folder));
-        }
         Zip => {
             eprintln!("Compressing first into .zip.");
             eprintln!("Warning: .zip archives with extra extensions have a downside.");
diff --git a/src/extension.rs b/src/extension.rs
index 9ff200f..1349a28 100644
--- a/src/extension.rs
+++ b/src/extension.rs
@@ -11,17 +11,13 @@ pub enum CompressionFormat {
     Bzip,  // .bz
     Lzma,  // .lzma
     Tar,   // .tar (technically not a compression extension, but will do for now)
-    Tgz,   // .tgz
-    Tbz,   // .tbz
-    Tlzma, // .tlzma
-    Tzst,  // .tzst
     Zstd,  // .zst
     Zip,   // .zip
 }
 
 impl CompressionFormat {
     pub fn is_archive_format(&self) -> bool {
-        matches!(self, Tar | Tgz | Tbz | Tlzma | Tzst | Zip)
+        matches!(self, Tar | Zip)
     }
 }
 
@@ -36,10 +32,6 @@ impl fmt::Display for CompressionFormat {
                 Zstd => ".zst",
                 Lzma => ".lz",
                 Tar => ".tar",
-                Tgz => ".tgz",
-                Tbz => ".tbz",
-                Tlzma => ".tlz",
-                Tzst => ".tzst",
                 Zip => ".zip",
             }
         )
@@ -61,10 +53,10 @@ pub fn separate_known_extensions_from_name(mut path: &Path) -> (&Path, Vec<Compr
     while let Some(extension) = path.extension().and_then(OsStr::to_str) {
         extensions.push(match extension {
             "tar" => Tar,
-            "tgz" => Tgz,
-            "tbz" | "tbz2" => Tbz,
-            "txz" | "tlz" | "tlzma" => Tlzma,
-            "tzst" => Tzst,
+            // "tgz" => Tgz,
+            // "tbz" | "tbz2" => Tbz,
+            // "txz" | "tlz" | "tlzma" => Tlzma,
+            // "tzst" => Tzst,
             "zip" => Zip,
             "bz" | "bz2" => Bzip,
             "gz" => Gzip,