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

Save the unsupported value of CompressionMethod

Browse source
This commit is contained in:
Mathijs van de Nes 2015-03-16 10:47:16 +01:00
parent c7df8157a9
commit c4cf221f70
2 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/compression.rs
View file

@ -5,13 +5,13 @@
pub enum CompressionMethod pub enum CompressionMethod
{ {
/// The file is stored (no compression) /// The file is stored (no compression)
Stored = 0, Stored,
/// The file is Deflated /// The file is Deflated
Deflated = 8, Deflated,
/// File is compressed using BZIP2 algorithm /// File is compressed using BZIP2 algorithm
Bzip2 = 12, Bzip2,
/// Unsupported compression method /// Unsupported compression method
Unsupported = ::std::u16::MAX as isize, Unsupported(u16),
} }
impl CompressionMethod { impl CompressionMethod {
@ -21,7 +21,17 @@ impl CompressionMethod {
0 => CompressionMethod::Stored, 0 => CompressionMethod::Stored,
8 => CompressionMethod::Deflated, 8 => CompressionMethod::Deflated,
12 => CompressionMethod::Bzip2, 12 => CompressionMethod::Bzip2,
_ => CompressionMethod::Unsupported, v => CompressionMethod::Unsupported(v),
}
}
/// Converts a CompressionMethod to a u16
pub fn to_u16(self) -> u16 {
match self {
CompressionMethod::Stored => 0,
CompressionMethod::Deflated => 8,
CompressionMethod::Bzip2 => 12,
CompressionMethod::Unsupported(v) => v,
} }
} }
} }
@ -31,26 +41,26 @@ mod test {
use super::CompressionMethod; use super::CompressionMethod;
#[test] #[test]
fn from_u16() { fn from_eq_to() {
for v in (0..::std::u16::MAX as u32 + 1) for v in (0..::std::u16::MAX as u32 + 1)
{ {
let method = CompressionMethod::from_u16(v as u16); let from = CompressionMethod::from_u16(v as u16);
match method { let to = from.to_u16() as u32;
CompressionMethod::Unsupported => {}, assert_eq!(v, to);
supported => assert_eq!(v, supported as u32),
}
} }
} }
#[test] #[test]
fn to_u16() { fn to_eq_from() {
fn check_match(method: CompressionMethod) { fn check_match(method: CompressionMethod) {
assert!(method as u32 == CompressionMethod::from_u16(method as u16) as u32); let to = method.to_u16();
let from = CompressionMethod::from_u16(to);
let back = from.to_u16();
assert_eq!(to, back);
} }
check_match(CompressionMethod::Stored); check_match(CompressionMethod::Stored);
check_match(CompressionMethod::Deflated); check_match(CompressionMethod::Deflated);
check_match(CompressionMethod::Bzip2); check_match(CompressionMethod::Bzip2);
check_match(CompressionMethod::Unsupported);
} }
} }

4
src/write.rs
View file

@ -289,7 +289,7 @@ fn write_local_file_header<T: Write>(writer: &mut T, file: &ZipFileData) -> ZipR
try!(writer.write_u16::<LittleEndian>(20)); try!(writer.write_u16::<LittleEndian>(20));
let flag = if !file.file_name.is_ascii() { 1u16 << 11 } else { 0 }; let flag = if !file.file_name.is_ascii() { 1u16 << 11 } else { 0 };
try!(writer.write_u16::<LittleEndian>(flag)); try!(writer.write_u16::<LittleEndian>(flag));
try!(writer.write_u16::<LittleEndian>(file.compression_method as u16)); try!(writer.write_u16::<LittleEndian>(file.compression_method.to_u16()));
try!(writer.write_u16::<LittleEndian>(util::tm_to_msdos_time(file.last_modified_time))); try!(writer.write_u16::<LittleEndian>(util::tm_to_msdos_time(file.last_modified_time)));
try!(writer.write_u16::<LittleEndian>(util::tm_to_msdos_date(file.last_modified_time))); try!(writer.write_u16::<LittleEndian>(util::tm_to_msdos_date(file.last_modified_time)));
try!(writer.write_u32::<LittleEndian>(file.crc32)); try!(writer.write_u32::<LittleEndian>(file.crc32));
@ -321,7 +321,7 @@ fn write_central_directory_header<T: Write>(writer: &mut T, file: &ZipFileData)
try!(writer.write_u16::<LittleEndian>(20)); try!(writer.write_u16::<LittleEndian>(20));
let flag = if !file.file_name.is_ascii() { 1u16 << 11 } else { 0 }; let flag = if !file.file_name.is_ascii() { 1u16 << 11 } else { 0 };
try!(writer.write_u16::<LittleEndian>(flag)); try!(writer.write_u16::<LittleEndian>(flag));
try!(writer.write_u16::<LittleEndian>(file.compression_method as u16)); try!(writer.write_u16::<LittleEndian>(file.compression_method.to_u16()));
try!(writer.write_u16::<LittleEndian>(util::tm_to_msdos_time(file.last_modified_time))); try!(writer.write_u16::<LittleEndian>(util::tm_to_msdos_time(file.last_modified_time)));
try!(writer.write_u16::<LittleEndian>(util::tm_to_msdos_date(file.last_modified_time))); try!(writer.write_u16::<LittleEndian>(util::tm_to_msdos_date(file.last_modified_time)));
try!(writer.write_u32::<LittleEndian>(file.crc32)); try!(writer.write_u32::<LittleEndian>(file.crc32));