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

add to_and_from_le! macro

Browse source
This commit is contained in:
Danny McClanahan 2024-05-18 04:13:11 -04:00
parent 83cdbadae8
commit 03c92a1184
No known key found for this signature in database
GPG key ID: 6105C10F1A199CC7
2 changed files with 79 additions and 203 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

156
src/spec.rs
View file

@ -143,6 +143,24 @@ macro_rules! to_le {
}; };
} }
/* TODO: derive macro to generate these fields? */
/// Implement `from_le()` and `to_le()`, providing the field specification to both macros
/// and methods.
macro_rules! to_and_from_le {
($($args:tt),+ $(,)?) => {
#[inline(always)]
fn from_le(mut self) -> Self {
from_le![self, [$($args),+]];
self
}
#[inline(always)]
fn to_le(mut self) -> Self {
to_le![self, [$($args),+]];
self
}
};
}
#[derive(Copy, Clone, Debug)] #[derive(Copy, Clone, Debug)]
#[repr(packed)] #[repr(packed)]
pub struct Zip32CDEBlock { pub struct Zip32CDEBlock {
@ -166,41 +184,16 @@ impl Block for Zip32CDEBlock {
const ERROR: ZipError = ZipError::InvalidArchive("Invalid digital signature header"); const ERROR: ZipError = ZipError::InvalidArchive("Invalid digital signature header");
#[inline(always)] to_and_from_le![
fn from_le(mut self) -> Self { (magic, Magic),
from_le![ (disk_number, u16),
self, (disk_with_central_directory, u16),
[ (number_of_files_on_this_disk, u16),
(magic, Magic), (number_of_files, u16),
(disk_number, u16), (central_directory_size, u32),
(disk_with_central_directory, u16), (central_directory_offset, u32),
(number_of_files_on_this_disk, u16), (zip_file_comment_length, u16)
(number_of_files, u16), ];
(central_directory_size, u32),
(central_directory_offset, u32),
(zip_file_comment_length, u16)
]
];
self
}
#[inline(always)]
fn to_le(mut self) -> Self {
to_le![
self,
[
(magic, Magic),
(disk_number, u16),
(disk_with_central_directory, u16),
(number_of_files_on_this_disk, u16),
(number_of_files, u16),
(central_directory_size, u32),
(central_directory_offset, u32),
(zip_file_comment_length, u16)
]
];
self
}
} }
#[derive(Debug)] #[derive(Debug)]
@ -368,33 +361,12 @@ impl Block for Zip64CDELocatorBlock {
const ERROR: ZipError = const ERROR: ZipError =
ZipError::InvalidArchive("Invalid zip64 locator digital signature header"); ZipError::InvalidArchive("Invalid zip64 locator digital signature header");
#[inline(always)] to_and_from_le![
fn from_le(mut self) -> Self { (magic, Magic),
from_le![ (disk_with_central_directory, u32),
self, (end_of_central_directory_offset, u64),
[ (number_of_disks, u32),
(magic, Magic), ];
(disk_with_central_directory, u32),
(end_of_central_directory_offset, u64),
(number_of_disks, u32),
]
];
self
}
#[inline(always)]
fn to_le(mut self) -> Self {
to_le![
self,
[
(magic, Magic),
(disk_with_central_directory, u32),
(end_of_central_directory_offset, u64),
(number_of_disks, u32),
]
];
self
}
} }
pub struct Zip64CentralDirectoryEndLocator { pub struct Zip64CentralDirectoryEndLocator {
@ -463,45 +435,18 @@ impl Block for Zip64CDEBlock {
const ERROR: ZipError = ZipError::InvalidArchive("Invalid digital signature header"); const ERROR: ZipError = ZipError::InvalidArchive("Invalid digital signature header");
#[inline(always)] to_and_from_le![
fn from_le(mut self) -> Self { (magic, Magic),
from_le![ (record_size, u64),
self, (version_made_by, u16),
[ (version_needed_to_extract, u16),
(magic, Magic), (disk_number, u32),
(record_size, u64), (disk_with_central_directory, u32),
(version_made_by, u16), (number_of_files_on_this_disk, u64),
(version_needed_to_extract, u16), (number_of_files, u64),
(disk_number, u32), (central_directory_size, u64),
(disk_with_central_directory, u32), (central_directory_offset, u64),
(number_of_files_on_this_disk, u64), ];
(number_of_files, u64),
(central_directory_size, u64),
(central_directory_offset, u64),
]
];
self
}
#[inline(always)]
fn to_le(mut self) -> Self {
to_le![
self,
[
(magic, Magic),
(record_size, u64),
(version_made_by, u16),
(version_needed_to_extract, u16),
(disk_number, u32),
(disk_with_central_directory, u32),
(number_of_files_on_this_disk, u64),
(number_of_files, u64),
(central_directory_size, u64),
(central_directory_offset, u64),
]
];
self
}
} }
pub struct Zip64CentralDirectoryEnd { pub struct Zip64CentralDirectoryEnd {
@ -730,14 +675,7 @@ mod test {
const ERROR: ZipError = ZipError::InvalidArchive("unreachable"); const ERROR: ZipError = ZipError::InvalidArchive("unreachable");
fn from_le(mut self) -> Self { to_and_from_le![(magic, Magic), (file_name_length, u16)];
from_le![self, [(magic, Magic), (file_name_length, u16)]];
self
}
fn to_le(mut self) -> Self {
to_le![self, [(magic, Magic), (file_name_length, u16)]];
self
}
} }
/// Demonstrate that a block object can be safely written to memory and deserialized back out. /// Demonstrate that a block object can be safely written to memory and deserialized back out.

126
src/types.rs
View file

@ -820,59 +820,25 @@ impl Block for ZipEntryBlock {
const ERROR: ZipError = ZipError::InvalidArchive("Invalid Central Directory header"); const ERROR: ZipError = ZipError::InvalidArchive("Invalid Central Directory header");
#[inline(always)] to_and_from_le![
fn from_le(mut self) -> Self { (magic, spec::Magic),
from_le![ (version_made_by, u16),
self, (version_to_extract, u16),
[ (flags, u16),
(magic, spec::Magic), (compression_method, u16),
(version_made_by, u16), (last_mod_time, u16),
(version_to_extract, u16), (last_mod_date, u16),
(flags, u16), (crc32, u32),
(compression_method, u16), (compressed_size, u32),
(last_mod_time, u16), (uncompressed_size, u32),
(last_mod_date, u16), (file_name_length, u16),
(crc32, u32), (extra_field_length, u16),
(compressed_size, u32), (file_comment_length, u16),
(uncompressed_size, u32), (disk_number, u16),
(file_name_length, u16), (internal_file_attributes, u16),
(extra_field_length, u16), (external_file_attributes, u32),
(file_comment_length, u16), (offset, u32),
(disk_number, u16), ];
(internal_file_attributes, u16),
(external_file_attributes, u32),
(offset, u32),
]
];
self
}
#[inline(always)]
fn to_le(mut self) -> Self {
to_le![
self,
[
(magic, spec::Magic),
(version_made_by, u16),
(version_to_extract, u16),
(flags, u16),
(compression_method, u16),
(last_mod_time, u16),
(last_mod_date, u16),
(crc32, u32),
(compressed_size, u32),
(uncompressed_size, u32),
(file_name_length, u16),
(extra_field_length, u16),
(file_comment_length, u16),
(disk_number, u16),
(internal_file_attributes, u16),
(external_file_attributes, u32),
(offset, u32),
]
];
self
}
} }
#[derive(Copy, Clone, Debug)] #[derive(Copy, Clone, Debug)]
@ -901,47 +867,19 @@ impl Block for ZipLocalEntryBlock {
const ERROR: ZipError = ZipError::InvalidArchive("Invalid local file header"); const ERROR: ZipError = ZipError::InvalidArchive("Invalid local file header");
#[inline(always)] to_and_from_le![
fn from_le(mut self) -> Self { (magic, spec::Magic),
from_le![ (version_made_by, u16),
self, (flags, u16),
[ (compression_method, u16),
(magic, spec::Magic), (last_mod_time, u16),
(version_made_by, u16), (last_mod_date, u16),
(flags, u16), (crc32, u32),
(compression_method, u16), (compressed_size, u32),
(last_mod_time, u16), (uncompressed_size, u32),
(last_mod_date, u16), (file_name_length, u16),
(crc32, u32), (extra_field_length, u16),
(compressed_size, u32), ];
(uncompressed_size, u32),
(file_name_length, u16),
(extra_field_length, u16),
]
];
self
}
#[inline(always)]
fn to_le(mut self) -> Self {
to_le![
self,
[
(magic, spec::Magic),
(version_made_by, u16),
(flags, u16),
(compression_method, u16),
(last_mod_time, u16),
(last_mod_date, u16),
(crc32, u32),
(compressed_size, u32),
(uncompressed_size, u32),
(file_name_length, u16),
(extra_field_length, u16),
]
];
self
}
} }
/// The encryption specification used to encrypt a file with AES. /// The encryption specification used to encrypt a file with AES.