DevComp/zip-rs-wasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add supported_methods() to CompressionMethod enum

Browse source
This commit is contained in:
Jack Fletcher 2021-06-07 00:45:06 +01:00
parent 88df24c5e2
commit e43ac72f7d
2 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/compression.rs
View file

@ -121,6 +121,27 @@ impl CompressionMethod {
CompressionMethod::Unsupported(v) => v, CompressionMethod::Unsupported(v) => v,
} }
} }
pub fn supported_methods() -> &'static [CompressionMethod] {
static METHODS: [CompressionMethod; 4] = [
CompressionMethod::Stored,
//
#[cfg(any(
feature = "deflate",
feature = "deflate-miniz",
feature = "deflate-zlib"
))]
CompressionMethod::Deflated,
//
#[cfg(feature = "bzip2")]
CompressionMethod::Bzip2,
//
#[cfg(feature = "zstd")]
CompressionMethod::Zstd,
];
&METHODS
}
} }
impl fmt::Display for CompressionMethod { impl fmt::Display for CompressionMethod {

23
tests/end_to_end.rs
View file

@ -10,7 +10,7 @@ use zip::CompressionMethod;
// the extracted data will *always* be exactly the same as the original data. // the extracted data will *always* be exactly the same as the original data.
#[test] #[test]
fn end_to_end() { fn end_to_end() {
for method in SUPPORTED_METHODS.iter() { for method in CompressionMethod::supported_methods().iter() {
let file = &mut Cursor::new(Vec::new()); let file = &mut Cursor::new(Vec::new());
write_to_zip(file, *method).expect("Couldn't write to test file"); write_to_zip(file, *method).expect("Couldn't write to test file");
@ -23,7 +23,7 @@ fn end_to_end() {
// contents back out, the extracted data will *always* be exactly the same as the original data. // contents back out, the extracted data will *always* be exactly the same as the original data.
#[test] #[test]
fn copy() { fn copy() {
for method in SUPPORTED_METHODS.iter() { for method in CompressionMethod::supported_methods().iter() {
let src_file = &mut Cursor::new(Vec::new()); let src_file = &mut Cursor::new(Vec::new());
write_to_zip(src_file, *method).expect("Couldn't write to test file"); write_to_zip(src_file, *method).expect("Couldn't write to test file");
@ -62,7 +62,7 @@ fn copy() {
// both the prior data and the appended data will be exactly the same as their originals. // both the prior data and the appended data will be exactly the same as their originals.
#[test] #[test]
fn append() { fn append() {
for method in SUPPORTED_METHODS.iter() { for method in CompressionMethod::supported_methods().iter() {
let mut file = &mut Cursor::new(Vec::new()); let mut file = &mut Cursor::new(Vec::new());
write_to_zip(file, *method).expect("Couldn't write to test file"); write_to_zip(file, *method).expect("Couldn't write to test file");
@ -188,20 +188,3 @@ const EXTRA_DATA: &'static [u8] = b"Extra Data";
const ENTRY_NAME: &str = "test/lorem_ipsum.txt"; const ENTRY_NAME: &str = "test/lorem_ipsum.txt";
const COPY_ENTRY_NAME: &str = "test/lorem_ipsum_renamed.txt"; const COPY_ENTRY_NAME: &str = "test/lorem_ipsum_renamed.txt";
const SUPPORTED_METHODS: &'static [CompressionMethod] = &[
CompressionMethod::Stored,
//
#[cfg(any(
feature = "deflate",
feature = "deflate-miniz",
feature = "deflate-zlib"
))]
CompressionMethod::Deflated,
//
#[cfg(feature = "bzip2")]
CompressionMethod::Bzip2,
//
#[cfg(feature = "zstd")]
CompressionMethod::Zstd,
];