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

Named the deflate algorithm feature gate "deflate"

Browse source
This commit is contained in:
jhwgh1968 2018-01-07 13:39:35 -06:00
parent 19274b497a
commit 7c2d4e2901
5 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Cargo.toml
View file

@ -22,4 +22,5 @@ bzip2 = { version = "0.3", optional = true }
walkdir = "1.0" walkdir = "1.0"
[features] [features]
default = ["bzip2", "flate2"] deflate = ["flate2"]
default = ["bzip2", "deflate"]

14
src/compression.rs
View file

@ -9,7 +9,7 @@ pub enum CompressionMethod
/// The file is stored (no compression) /// The file is stored (no compression)
Stored, Stored,
/// The file is Deflated /// The file is Deflated
#[cfg(feature = "flate2")] #[cfg(feature = "deflate")]
Deflated, Deflated,
/// File is compressed using BZIP2 algorithm /// File is compressed using BZIP2 algorithm
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]
@ -23,7 +23,7 @@ impl CompressionMethod {
pub fn from_u16(val: u16) -> CompressionMethod { pub fn from_u16(val: u16) -> CompressionMethod {
match val { match val {
0 => CompressionMethod::Stored, 0 => CompressionMethod::Stored,
#[cfg(feature = "flate2")] #[cfg(feature = "deflate")]
8 => CompressionMethod::Deflated, 8 => CompressionMethod::Deflated,
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]
12 => CompressionMethod::Bzip2, 12 => CompressionMethod::Bzip2,
@ -35,7 +35,7 @@ impl CompressionMethod {
pub fn to_u16(self) -> u16 { pub fn to_u16(self) -> u16 {
match self { match self {
CompressionMethod::Stored => 0, CompressionMethod::Stored => 0,
#[cfg(feature = "flate2")] #[cfg(feature = "deflate")]
CompressionMethod::Deflated => 8, CompressionMethod::Deflated => 8,
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]
CompressionMethod::Bzip2 => 12, CompressionMethod::Bzip2 => 12,
@ -65,22 +65,22 @@ mod test {
} }
} }
#[cfg(all(not(feature = "bzip2"), feature = "flate2"))] #[cfg(all(not(feature = "bzip2"), feature = "deflate"))]
fn methods() -> Vec<CompressionMethod> { fn methods() -> Vec<CompressionMethod> {
vec![CompressionMethod::Stored, CompressionMethod::Deflated] vec![CompressionMethod::Stored, CompressionMethod::Deflated]
} }
#[cfg(all(not(feature = "flate2"), feature = "bzip2"))] #[cfg(all(not(feature = "deflate"), feature = "bzip2"))]
fn methods() -> Vec<CompressionMethod> { fn methods() -> Vec<CompressionMethod> {
vec![CompressionMethod::Stored, CompressionMethod::Bzip2] vec![CompressionMethod::Stored, CompressionMethod::Bzip2]
} }
#[cfg(all(feature = "bzip2", feature = "flate2"))] #[cfg(all(feature = "bzip2", feature = "deflate"))]
fn methods() -> Vec<CompressionMethod> { fn methods() -> Vec<CompressionMethod> {
vec![CompressionMethod::Stored, CompressionMethod::Deflated, CompressionMethod::Bzip2] vec![CompressionMethod::Stored, CompressionMethod::Deflated, CompressionMethod::Bzip2]
} }
#[cfg(all(not(feature = "bzip2"), not(feature = "flate2")))] #[cfg(all(not(feature = "bzip2"), not(feature = "deflate")))]
fn methods() -> Vec<CompressionMethod> { fn methods() -> Vec<CompressionMethod> {
vec![CompressionMethod::Stored] vec![CompressionMethod::Stored]
} }

2
src/lib.rs
View file

@ -4,7 +4,7 @@
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]
extern crate bzip2; extern crate bzip2;
#[cfg(feature = "flate2")] #[cfg(feature = "deflate")]
extern crate flate2; extern crate flate2;
extern crate msdos_time; extern crate msdos_time;
extern crate podio; extern crate podio;

10
src/read.rs
View file

@ -13,9 +13,9 @@ use types::{ZipFileData, System};
use cp437::FromCp437; use cp437::FromCp437;
use msdos_time::{TmMsDosExt, MsDosDateTime}; use msdos_time::{TmMsDosExt, MsDosDateTime};
#[cfg(feature = "flate2")] #[cfg(feature = "deflate")]
use flate2; use flate2;
#[cfg(feature = "flate2")] #[cfg(feature = "deflate")]
use flate2::read::DeflateDecoder; use flate2::read::DeflateDecoder;
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]
@ -63,7 +63,7 @@ pub struct ZipArchive<R: Read + io::Seek>
enum ZipFileReader<'a> { enum ZipFileReader<'a> {
Stored(Crc32Reader<io::Take<&'a mut Read>>), Stored(Crc32Reader<io::Take<&'a mut Read>>),
#[cfg(feature = "flate2")] #[cfg(feature = "deflate")]
Deflated(Crc32Reader<flate2::read::DeflateDecoder<io::Take<&'a mut Read>>>), Deflated(Crc32Reader<flate2::read::DeflateDecoder<io::Take<&'a mut Read>>>),
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]
Bzip2(Crc32Reader<BzDecoder<io::Take<&'a mut Read>>>), Bzip2(Crc32Reader<BzDecoder<io::Take<&'a mut Read>>>),
@ -240,7 +240,7 @@ impl<R: Read+io::Seek> ZipArchive<R>
limit_reader, limit_reader,
data.crc32)) data.crc32))
}, },
#[cfg(feature = "flate2")] #[cfg(feature = "deflate")]
CompressionMethod::Deflated => CompressionMethod::Deflated =>
{ {
let deflate_reader = DeflateDecoder::new(limit_reader); let deflate_reader = DeflateDecoder::new(limit_reader);
@ -383,7 +383,7 @@ impl<'a> ZipFile<'a> {
fn get_reader(&mut self) -> &mut Read { fn get_reader(&mut self) -> &mut Read {
match self.reader { match self.reader {
ZipFileReader::Stored(ref mut r) => r as &mut Read, ZipFileReader::Stored(ref mut r) => r as &mut Read,
#[cfg(feature = "flate2")] #[cfg(feature = "deflate")]
ZipFileReader::Deflated(ref mut r) => r as &mut Read, ZipFileReader::Deflated(ref mut r) => r as &mut Read,
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]
ZipFileReader::Bzip2(ref mut r) => r as &mut Read, ZipFileReader::Bzip2(ref mut r) => r as &mut Read,

18
src/write.rs
View file

@ -13,9 +13,9 @@ use time;
use podio::{WritePodExt, LittleEndian}; use podio::{WritePodExt, LittleEndian};
use msdos_time::TmMsDosExt; use msdos_time::TmMsDosExt;
#[cfg(feature = "flate2")] #[cfg(feature = "deflate")]
use flate2; use flate2;
#[cfg(feature = "flate2")] #[cfg(feature = "deflate")]
use flate2::write::DeflateEncoder; use flate2::write::DeflateEncoder;
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]
@ -27,7 +27,7 @@ enum GenericZipWriter<W: Write + io::Seek>
{ {
Closed, Closed,
Storer(W), Storer(W),
#[cfg(feature = "flate2")] #[cfg(feature = "deflate")]
Deflater(DeflateEncoder<W>), Deflater(DeflateEncoder<W>),
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]
Bzip2(BzEncoder<W>), Bzip2(BzEncoder<W>),
@ -81,7 +81,7 @@ pub struct FileOptions {
} }
impl FileOptions { impl FileOptions {
#[cfg(feature = "flate2")] #[cfg(feature = "deflate")]
/// Construct a new FileOptions object /// Construct a new FileOptions object
pub fn default() -> FileOptions { pub fn default() -> FileOptions {
FileOptions { FileOptions {
@ -91,7 +91,7 @@ impl FileOptions {
} }
} }
#[cfg(not(feature = "flate2"))] #[cfg(not(feature = "deflate"))]
/// Construct a new FileOptions object /// Construct a new FileOptions object
pub fn default() -> FileOptions { pub fn default() -> FileOptions {
FileOptions { FileOptions {
@ -347,7 +347,7 @@ impl<W: Write+io::Seek> GenericZipWriter<W>
let bare = match mem::replace(self, GenericZipWriter::Closed) let bare = match mem::replace(self, GenericZipWriter::Closed)
{ {
GenericZipWriter::Storer(w) => w, GenericZipWriter::Storer(w) => w,
#[cfg(feature = "flate2")] #[cfg(feature = "deflate")]
GenericZipWriter::Deflater(w) => try!(w.finish()), GenericZipWriter::Deflater(w) => try!(w.finish()),
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]
GenericZipWriter::Bzip2(w) => try!(w.finish()), GenericZipWriter::Bzip2(w) => try!(w.finish()),
@ -357,7 +357,7 @@ impl<W: Write+io::Seek> GenericZipWriter<W>
*self = match compression *self = match compression
{ {
CompressionMethod::Stored => GenericZipWriter::Storer(bare), CompressionMethod::Stored => GenericZipWriter::Storer(bare),
#[cfg(feature = "flate2")] #[cfg(feature = "deflate")]
CompressionMethod::Deflated => GenericZipWriter::Deflater(DeflateEncoder::new(bare, flate2::Compression::default())), CompressionMethod::Deflated => GenericZipWriter::Deflater(DeflateEncoder::new(bare, flate2::Compression::default())),
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]
CompressionMethod::Bzip2 => GenericZipWriter::Bzip2(BzEncoder::new(bare, bzip2::Compression::Default)), CompressionMethod::Bzip2 => GenericZipWriter::Bzip2(BzEncoder::new(bare, bzip2::Compression::Default)),
@ -370,7 +370,7 @@ impl<W: Write+io::Seek> GenericZipWriter<W>
fn ref_mut(&mut self) -> Option<&mut Write> { fn ref_mut(&mut self) -> Option<&mut Write> {
match *self { match *self {
GenericZipWriter::Storer(ref mut w) => Some(w as &mut Write), GenericZipWriter::Storer(ref mut w) => Some(w as &mut Write),
#[cfg(feature = "flate2")] #[cfg(feature = "deflate")]
GenericZipWriter::Deflater(ref mut w) => Some(w as &mut Write), GenericZipWriter::Deflater(ref mut w) => Some(w as &mut Write),
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]
GenericZipWriter::Bzip2(ref mut w) => Some(w as &mut Write), GenericZipWriter::Bzip2(ref mut w) => Some(w as &mut Write),
@ -399,7 +399,7 @@ impl<W: Write+io::Seek> GenericZipWriter<W>
fn current_compression(&self) -> Option<CompressionMethod> { fn current_compression(&self) -> Option<CompressionMethod> {
match *self { match *self {
GenericZipWriter::Storer(..) => Some(CompressionMethod::Stored), GenericZipWriter::Storer(..) => Some(CompressionMethod::Stored),
#[cfg(feature = "flate2")] #[cfg(feature = "deflate")]
GenericZipWriter::Deflater(..) => Some(CompressionMethod::Deflated), GenericZipWriter::Deflater(..) => Some(CompressionMethod::Deflated),
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]
GenericZipWriter::Bzip2(..) => Some(CompressionMethod::Bzip2), GenericZipWriter::Bzip2(..) => Some(CompressionMethod::Bzip2),