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

fix: release preparation

Browse source 
- mark CompressionMethod enum as non-exhaustive
- add again Aes to enum

Tested:
- Local unit-tests run
This commit is contained in:
Alexander Zaitsev 2022-02-17 21:42:56 +03:00
parent a9e1436655
commit c7b599c1fe
No known key found for this signature in database
GPG key ID: FC891851263F1E5D
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/compression.rs
View file

@ -11,6 +11,7 @@ use std::fmt;
/// When creating ZIP files, you may choose the method to use with /// When creating ZIP files, you may choose the method to use with
/// [`crate::write::FileOptions::compression_method`] /// [`crate::write::FileOptions::compression_method`]
#[derive(Copy, Clone, PartialEq, Eq, Debug)] #[derive(Copy, Clone, PartialEq, Eq, Debug)]
#[non_exhaustive]
pub enum CompressionMethod { pub enum CompressionMethod {
/// Store the file as is /// Store the file as is
Stored, Stored,
@ -24,6 +25,12 @@ pub enum CompressionMethod {
/// Compress the file using BZIP2 /// Compress the file using BZIP2
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]
Bzip2, Bzip2,
/// Encrypted using AES.
///
/// The actual compression method has to be taken from the AES extra data field
/// or from `ZipFileData`.
#[cfg(feature = "aes-crypto")]
Aes,
/// Compress the file using ZStandard /// Compress the file using ZStandard
#[cfg(feature = "zstd")] #[cfg(feature = "zstd")]
Zstd, Zstd,
@ -72,10 +79,9 @@ impl CompressionMethod {
pub const JPEG: Self = CompressionMethod::Unsupported(96); pub const JPEG: Self = CompressionMethod::Unsupported(96);
pub const WAVPACK: Self = CompressionMethod::Unsupported(97); pub const WAVPACK: Self = CompressionMethod::Unsupported(97);
pub const PPMD: Self = CompressionMethod::Unsupported(98); pub const PPMD: Self = CompressionMethod::Unsupported(98);
/// Encrypted using AES. #[cfg(feature = "aes-crypto")]
/// pub const AES: Self = CompressionMethod::Aes;
/// The actual compression method has to be taken from the AES extra data field #[cfg(not(feature = "aes-crypto"))]
/// or from `ZipFileData`.
pub const AES: Self = CompressionMethod::Unsupported(99); pub const AES: Self = CompressionMethod::Unsupported(99);
} }
impl CompressionMethod { impl CompressionMethod {
@ -98,7 +104,8 @@ impl CompressionMethod {
12 => CompressionMethod::Bzip2, 12 => CompressionMethod::Bzip2,
#[cfg(feature = "zstd")] #[cfg(feature = "zstd")]
93 => CompressionMethod::Zstd, 93 => CompressionMethod::Zstd,
99 => CompressionMethod::AES, #[cfg(feature = "aes-crypto")]
99 => CompressionMethod::Aes,
v => CompressionMethod::Unsupported(v), v => CompressionMethod::Unsupported(v),
} }
@ -121,7 +128,8 @@ impl CompressionMethod {
CompressionMethod::Deflated => 8, CompressionMethod::Deflated => 8,
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]
CompressionMethod::Bzip2 => 12, CompressionMethod::Bzip2 => 12,
CompressionMethod::AES => 99, #[cfg(feature = "aes-crypto")]
CompressionMethod::Aes => 99,
#[cfg(feature = "zstd")] #[cfg(feature = "zstd")]
CompressionMethod::Zstd => 93, CompressionMethod::Zstd => 93,