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

Refactor: simplify FileOperation by factoring out shared fields

Browse source
This commit is contained in:
Chris Hennick 2023-05-13 15:58:45 -07:00
parent 089f194fd6
commit f7acf6fe9c
No known key found for this signature in database
GPG key ID: 25653935CC8B6C74
1 changed files with 14 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
fuzz/fuzz_targets/fuzz_write.rs
View file

@ -18,46 +18,26 @@ pub enum BasicFileOperation {
file: File, file: File,
options: zip_next::write::FileOptions, options: zip_next::write::FileOptions,
}, },
WriteDirectory { WriteDirectory(zip_next::write::FileOptions),
name: String, WriteSymlinkWithTarget {
options: zip_next::write::FileOptions,
},
WriteSymlink {
name: String,
target: Box<PathBuf>, target: Box<PathBuf>,
options: zip_next::write::FileOptions, options: zip_next::write::FileOptions,
}, },
ShallowCopy { ShallowCopy(Box<FileOperation>),
base: Box<FileOperation>, DeepCopy(Box<FileOperation>),
new_name: String,
},
DeepCopy {
base: Box<FileOperation>,
new_name: String,
}
} }
#[derive(Arbitrary,Debug)] #[derive(Arbitrary,Debug)]
pub struct FileOperation { pub struct FileOperation {
basic: BasicFileOperation, basic: BasicFileOperation,
name: String,
reopen: bool, reopen: bool,
} }
impl FileOperation {
pub fn get_name(&self) -> String {
match &self.basic {
BasicFileOperation::WriteNormalFile {file, ..} => &file.name,
BasicFileOperation::WriteDirectory {name, ..} => name,
BasicFileOperation::WriteSymlink {name, ..} => name,
BasicFileOperation::ShallowCopy {new_name, ..} => new_name,
BasicFileOperation::DeepCopy {new_name, ..} => new_name
}.to_owned()
}
}
fn do_operation<T>(writer: &mut RefCell<zip_next::ZipWriter<T>>, fn do_operation<T>(writer: &mut RefCell<zip_next::ZipWriter<T>>,
operation: FileOperation) -> Result<(), Box<dyn std::error::Error>> operation: FileOperation) -> Result<(), Box<dyn std::error::Error>>
where T: Read + Write + Seek { where T: Read + Write + Seek {
let name = operation.name;
match operation.basic { match operation.basic {
BasicFileOperation::WriteNormalFile {file, mut options, ..} => { BasicFileOperation::WriteNormalFile {file, mut options, ..} => {
if file.contents.iter().map(Vec::len).sum::<usize>() >= u32::MAX as usize { if file.contents.iter().map(Vec::len).sum::<usize>() >= u32::MAX as usize {
@ -68,21 +48,21 @@ fn do_operation<T>(writer: &mut RefCell<zip_next::ZipWriter<T>>,
writer.borrow_mut().write_all(chunk.as_slice())?; writer.borrow_mut().write_all(chunk.as_slice())?;
} }
} }
BasicFileOperation::WriteDirectory {name, options, ..} => { BasicFileOperation::WriteDirectory(options) => {
writer.borrow_mut().add_directory(name, options)?; writer.borrow_mut().add_directory(name, options)?;
} }
BasicFileOperation::WriteSymlink {name, target, options, ..} => { BasicFileOperation::WriteSymlinkWithTarget {target, options} => {
writer.borrow_mut().add_symlink(name, target.to_string_lossy(), options)?; writer.borrow_mut().add_symlink(name, target.to_string_lossy(), options)?;
} }
BasicFileOperation::ShallowCopy {base, ref new_name, .. } => { BasicFileOperation::ShallowCopy(base) => {
let base_name = base.get_name(); let base_name = base.name.to_owned();
do_operation(writer, *base)?; do_operation(writer, *base)?;
writer.borrow_mut().shallow_copy_file(&base_name, new_name)?; writer.borrow_mut().shallow_copy_file(&base_name, &name)?;
} }
BasicFileOperation::DeepCopy {base, ref new_name, .. } => { BasicFileOperation::DeepCopy(base) => {
let base_name = base.get_name(); let base_name = base.name.to_owned();
do_operation(writer, *base)?; do_operation(writer, *base)?;
writer.borrow_mut().deep_copy_file(&base_name, new_name)?; writer.borrow_mut().deep_copy_file(&base_name, &name)?;
} }
} }
if operation.reopen { if operation.reopen {