From bdf5090844ed267621ab9e3e9bdda6de6a05b68a Mon Sep 17 00:00:00 2001 From: Spyros Roum Date: Fri, 22 Oct 2021 02:21:31 +0300 Subject: [PATCH] zst is not an archive format.. --- src/archive/zip.rs | 2 +- src/extension.rs | 2 +- tests/compress_and_decompress.rs | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/archive/zip.rs b/src/archive/zip.rs index db35727..f15e650 100644 --- a/src/archive/zip.rs +++ b/src/archive/zip.rs @@ -11,7 +11,7 @@ use zip::{self, read::ZipFile, ZipArchive}; use crate::{ info, - utils::{self, dir_is_empty,strip_cur_dir, Bytes}, + utils::{self, dir_is_empty, strip_cur_dir, Bytes}, }; use self::utf8::get_invalid_utf8_paths; diff --git a/src/extension.rs b/src/extension.rs index 87efbc6..9ff200f 100644 --- a/src/extension.rs +++ b/src/extension.rs @@ -21,7 +21,7 @@ pub enum CompressionFormat { impl CompressionFormat { pub fn is_archive_format(&self) -> bool { - matches!(self, Tar | Tgz | Tbz | Tlzma | Tzst | Zstd | Zip) + matches!(self, Tar | Tgz | Tbz | Tlzma | Tzst | Zip) } } diff --git a/tests/compress_and_decompress.rs b/tests/compress_and_decompress.rs index 0a34f47..77d929d 100644 --- a/tests/compress_and_decompress.rs +++ b/tests/compress_and_decompress.rs @@ -32,7 +32,7 @@ fn sanity_check_through_mime() { let formats = [ "tar", "zip", "tar.gz", "tgz", "tbz", "tbz2", "txz", "tlz", "tlzma", "tzst", "tar.bz", "tar.bz2", "tar.lzma", - "tar.xz", "zst", + "tar.xz", "tar.zst", ]; let expected_mimes = [ @@ -79,6 +79,7 @@ fn test_each_format() { test_compressing_and_decompressing_archive("tar.xz"); test_compressing_and_decompressing_archive("tar.lz"); test_compressing_and_decompressing_archive("tar.lzma"); + test_compressing_and_decompressing_archive("tar.zst"); test_compressing_and_decompressing_archive("tgz"); test_compressing_and_decompressing_archive("tbz"); test_compressing_and_decompressing_archive("tbz2"); @@ -96,7 +97,7 @@ fn test_each_format() { // Why not test_compressing_and_decompressing_archive( - "tar.gz.gz.gz.gz.gz.gz.gz.gz.gz.gz.gz.gz.gz.gz.gz.gz.gz.gz.lz.lz.lz.lz.lz.lz.lz.lz.lz.lz.bz.bz.bz.bz.bz.bz.bz", + "tar.gz.gz.gz.gz.gz.gz.gz.gz.zst.gz.gz.gz.gz.gz.gz.gz.gz.gz.gz.lz.lz.lz.lz.lz.lz.lz.lz.lz.lz.bz.bz.bz.bz.bz.bz.bz", ); }