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

Expose the raw file name of a file

Browse source 
We still do most operations with normal Strings, but a user can now also get the raw bytes.

Resolves #26
This commit is contained in:
Mathijs van de Nes 2017-02-12 17:18:40 +01:00
parent 88445219ec
commit 1831edbbdd
5 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "zip" name = "zip"
version = "0.2.0" version = "0.2.1"
authors = ["Mathijs van de Nes <git@mathijs.vd-nes.nl>"] authors = ["Mathijs van de Nes <git@mathijs.vd-nes.nl>"]
license = "MIT" license = "MIT"
repository = "https://github.com/mvdnes/zip-rs.git" repository = "https://github.com/mvdnes/zip-rs.git"

2
examples/extract.rs
View file

@ -39,7 +39,7 @@ fn real_main() -> i32
if (&*file.name()).ends_with("/") { if (&*file.name()).ends_with("/") {
create_directory(&outpath, perms); create_directory(&outpath, perms);
} }
else { else {
write_file(&mut file, &outpath, perms); write_file(&mut file, &outpath, perms);

7
src/read.rs
View file

@ -212,7 +212,7 @@ fn central_header_to_zip_file<R: Read+io::Seek>(reader: &mut R) -> ZipResult<Zip
let file_name = match is_utf8 let file_name = match is_utf8
{ {
true => String::from_utf8_lossy(&*file_name_raw).into_owned(), true => String::from_utf8_lossy(&*file_name_raw).into_owned(),
false => file_name_raw.from_cp437(), false => file_name_raw.clone().from_cp437(),
}; };
let file_comment = match is_utf8 let file_comment = match is_utf8
{ {
@ -249,6 +249,7 @@ fn central_header_to_zip_file<R: Read+io::Seek>(reader: &mut R) -> ZipResult<Zip
compressed_size: compressed_size as u64, compressed_size: compressed_size as u64,
uncompressed_size: uncompressed_size as u64, uncompressed_size: uncompressed_size as u64,
file_name: file_name, file_name: file_name,
file_name_raw: file_name_raw,
file_comment: file_comment, file_comment: file_comment,
header_start: offset, header_start: offset,
data_start: data_start, data_start: data_start,
@ -297,6 +298,10 @@ impl<'a> ZipFile<'a> {
pub fn name(&self) -> &str { pub fn name(&self) -> &str {
&*self.data.file_name &*self.data.file_name
} }
/// Get the name of the file, in the raw (internal) byte representation.
pub fn name_raw(&self) -> &[u8] {
&*self.data.file_name_raw
}
/// Get the comment of the file /// Get the comment of the file
pub fn comment(&self) -> &str { pub fn comment(&self) -> &str {
&*self.data.file_comment &*self.data.file_comment

2
src/types.rs
View file

@ -49,6 +49,8 @@ pub struct ZipFileData
pub uncompressed_size: u64, pub uncompressed_size: u64,
/// Name of the file /// Name of the file
pub file_name: String, pub file_name: String,
/// Raw file name. To be used when file_name was incorrectly decoded.
pub file_name_raw: Vec<u8>,
/// File comment /// File comment
pub file_comment: String, pub file_comment: String,
/// Specifies where the local header of the file starts /// Specifies where the local header of the file starts

5
src/write.rs
View file

@ -178,6 +178,8 @@ impl<W: Write+io::Seek> ZipWriter<W>
let header_start = try!(writer.seek(io::SeekFrom::Current(0))); let header_start = try!(writer.seek(io::SeekFrom::Current(0)));
let permissions = options.permissions.unwrap_or(0o100644); let permissions = options.permissions.unwrap_or(0o100644);
let file_name = name.into();
let file_name_raw = file_name.clone().into_bytes();
let mut file = ZipFileData let mut file = ZipFileData
{ {
system: System::Unix, system: System::Unix,
@ -188,7 +190,8 @@ impl<W: Write+io::Seek> ZipWriter<W>
crc32: 0, crc32: 0,
compressed_size: 0, compressed_size: 0,
uncompressed_size: 0, uncompressed_size: 0,
file_name: name.into(), file_name: file_name,
file_name_raw: file_name_raw,
file_comment: String::new(), file_comment: String::new(),
header_start: header_start, header_start: header_start,
data_start: 0, data_start: 0,