From 0cd915f1857ad68f1bcece6be043d7a07c38220d Mon Sep 17 00:00:00 2001 From: Mathijs van de Nes Date: Mon, 15 Sep 2014 21:33:58 +0200 Subject: [PATCH] Split compression from types and pub use ZipFile --- src/bin/write_sample.rs | 4 ++-- src/compression.rs | 41 ++++++++++++++++++++++++++++++++++++++++ src/lib.rs | 4 +++- src/reader.rs | 6 +++--- src/spec.rs | 4 ++-- src/types.rs | 42 +---------------------------------------- src/writer.rs | 14 +++++++------- 7 files changed, 59 insertions(+), 56 deletions(-) create mode 100644 src/compression.rs diff --git a/src/bin/write_sample.rs b/src/bin/write_sample.rs index d692f0a1..61af6aa3 100644 --- a/src/bin/write_sample.rs +++ b/src/bin/write_sample.rs @@ -18,10 +18,10 @@ fn doit(filename: &str) -> std::io::IoResult<()> let mut zip = zip::ZipWriter::new(file); - try!(zip.start_file("test/☃.txt", zip::types::Stored)); + try!(zip.start_file("test/☃.txt", zip::compression::Stored)); try!(zip.write(b"Hello, World!\n")); - try!(zip.start_file("test/lorem_ipsum.txt", zip::types::Deflated)); + try!(zip.start_file("test/lorem_ipsum.txt", zip::compression::Deflated)); try!(zip.write(LOREM_IPSUM)); zip.finalize() diff --git a/src/compression.rs b/src/compression.rs new file mode 100644 index 00000000..ff04df20 --- /dev/null +++ b/src/compression.rs @@ -0,0 +1,41 @@ +//! Possible ZIP compression methods. + +/// Compression methods for the contents of a ZIP file. +#[deriving(FromPrimitive, Clone)] +pub enum CompressionMethod +{ + /// The file is stored (no compression) + Stored = 0, + /// The file is Shrunk + Shrunk = 1, + /// The file is Reduced with compression factor 1 + Reduced1 = 2, + /// The file is Reduced with compression factor 2 + Reduced2 = 3, + /// The file is Reduced with compression factor 3 + Reduced3 = 4, + /// The file is Reduced with compression factor 4 + Reduced4 = 5, + /// The file is Imploded + Imploded = 6, + /// The file is Deflated + Deflated = 8, + /// Enhanced Deflating using Deflate64(tm) + Deflate64 = 9, + /// PKWARE Data Compression Library Imploding (old IBM TERSE) + PkwareImploding = 10, + /// File is compressed using BZIP2 algorithm + Bzip2 = 12, + /// LZMA (EFS) + LZMA = 14, + /// File is compressed using IBM TERSE (new) + IBMTerse = 18, + /// IBM LZ77 z Architecture (PFS) + LZ77 = 19, + /// WavPack compressed data + WavPack = 97, + /// PPMd version I, Rev 1 + PPMdI1 = 98, + /// Unknown (invalid) compression + Unknown = 100000, +} diff --git a/src/lib.rs b/src/lib.rs index 76aac06f..a453d296 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -10,11 +10,13 @@ extern crate flate2; pub use reader::ZipReader; pub use writer::ZipWriter; +pub use types::ZipFile; mod util; mod spec; mod crc32; mod reader; -pub mod types; +mod types; +pub mod compression; mod writer; mod cp437; diff --git a/src/reader.rs b/src/reader.rs index dd49a86a..e24cd4da 100644 --- a/src/reader.rs +++ b/src/reader.rs @@ -1,7 +1,7 @@ use spec; use crc32::Crc32Reader; use types::ZipFile; -use types; +use compression; use std::io; use std::io::{IoResult, IoError}; use std::cell::RefCell; @@ -107,7 +107,7 @@ impl ZipReader let reader = match file.compression_method { - types::Stored => + compression::Stored => { box Crc32Reader::new( @@ -115,7 +115,7 @@ impl ZipReader file.crc32) as Box }, - types::Deflated => + compression::Deflated => { let deflate_reader = limit_reader.deflate_decode(); box diff --git a/src/spec.rs b/src/spec.rs index 735cc729..d7152189 100644 --- a/src/spec.rs +++ b/src/spec.rs @@ -1,7 +1,7 @@ use std::io; use std::io::{IoResult, IoError}; use std::iter::range_step_inclusive; -use types; +use compression; use types::ZipFile; use util; @@ -78,7 +78,7 @@ pub fn central_header_to_zip_file(reader: &mut R) -> IoResult /// let w = std::io::BufWriter::new(&mut buf); /// let mut zip = zip::ZipWriter::new(w); /// -/// try!(zip.start_file("hello_world.txt", zip::types::Stored)); +/// try!(zip.start_file("hello_world.txt", zip::compression::Stored)); /// try!(zip.write(b"Hello, World!")); /// /// // Optionally finish the zip. (this is also done on drop) @@ -99,7 +99,7 @@ impl ZipWriter } /// Start a new file for with the requested compression method. - pub fn start_file(&mut self, name: &str, compression: types::CompressionMethod) -> IoResult<()> + pub fn start_file(&mut self, name: &str, compression: compression::CompressionMethod) -> IoResult<()> { try!(self.finish_file()); @@ -139,7 +139,7 @@ impl ZipWriter fn finish_file(&mut self) -> IoResult<()> { - try!(self.inner.switch_to(types::Stored)); + try!(self.inner.switch_to(compression::Stored)); let writer = self.inner.get_plain(); let file = match self.files.mut_last() @@ -209,7 +209,7 @@ impl Drop for ZipWriter impl GenericZipWriter { - fn switch_to(&mut self, compression: types::CompressionMethod) -> IoResult<()> + fn switch_to(&mut self, compression: compression::CompressionMethod) -> IoResult<()> { let bare = match mem::replace(self, Closed) { @@ -220,8 +220,8 @@ impl GenericZipWriter *self = match compression { - types::Stored => Storer(bare), - types::Deflated => Deflater(bare.deflate_encode(flate2::Default)), + compression::Stored => Storer(bare), + compression::Deflated => Deflater(bare.deflate_encode(flate2::Default)), _ => return Err(IoError { kind: io::OtherIoError, desc: "Unsupported compression requested", detail: None }), };