diff --git a/Cargo.toml b/Cargo.toml index 379e121..32cf6aa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ serde_json = { version = "1", optional = true } sqpack = { git = "https://git.anna.lgbt/anna/sqpack-rs", features = ["read", "write"], optional = true } tempfile = { version = "3", optional = true } thiserror = { version = "1", optional = true } -zip = { version = "1", default-features = false, features = ["deflate-zlib"], optional = true } +zip = { version = "2", default-features = false, features = ["deflate-zlib"], optional = true } [dev-dependencies] anyhow = "1" @@ -45,7 +45,7 @@ criterion = "0.5" data-encoding = "2" sha3 = "0.10" tempfile = "3" -zip = { version = "1", default-features = false, features = ["deflate-zlib"] } +zip = { version = "2", default-features = false, features = ["deflate-zlib"] } [[bench]] name = "extract" diff --git a/examples/deduplicate.rs b/examples/deduplicate.rs index 182094e..568386f 100644 --- a/examples/deduplicate.rs +++ b/examples/deduplicate.rs @@ -69,7 +69,7 @@ fn main() -> anyhow::Result<()> { let new_file = File::create(new_path)?; let mut zip = ZipWriter::new(new_file); - zip.start_file("TTMPL.mpl", FileOptions::default().compression_method(CompressionMethod::Deflated))?; + zip.start_file("TTMPL.mpl", FileOptions::<()>::default().compression_method(CompressionMethod::Deflated))?; match manifest { ManifestKind::V1(mods) => for mod_ in mods { serde_json::to_writer(&mut zip, &mod_)?; @@ -78,7 +78,7 @@ fn main() -> anyhow::Result<()> { ManifestKind::V2(pack) => serde_json::to_writer(&mut zip, &pack)?, } - zip.start_file("TTMPD.mpd", FileOptions::default().compression_method(CompressionMethod::Stored))?; + zip.start_file("TTMPD.mpd", FileOptions::<()>::default().compression_method(CompressionMethod::Stored))?; std::io::copy(&mut mpd, &mut zip)?; zip.finish()?; diff --git a/examples/repack.rs b/examples/repack.rs index e0c13a9..321bb65 100644 --- a/examples/repack.rs +++ b/examples/repack.rs @@ -23,7 +23,7 @@ fn main() { .read(true) .open("temp.mpd") .unwrap(); - let mut encoder = MpdEncoder::new(temp_mpd, extractor.manifest().clone()); + let mut encoder = MpdEncoder::with_compression_level(temp_mpd, extractor.manifest().clone(), 4, 6); for file in extractor.all_files_sorted() { let mut data = Cursor::new(Vec::new()); @@ -54,10 +54,10 @@ fn main() { let repacked = BufWriter::new(File::create("repacked.ttmp2").unwrap()); let mut zip = ZipWriter::new(repacked); - zip.start_file("TTMPD.mpd", FileOptions::default().compression_method(CompressionMethod::Stored)).unwrap(); + zip.start_file("TTMPD.mpd", FileOptions::<()>::default().compression_method(CompressionMethod::Stored)).unwrap(); std::io::copy(&mut file, &mut zip).unwrap(); - zip.start_file("TTMPL.mpl", FileOptions::default().compression_method(CompressionMethod::Deflated)).unwrap(); + zip.start_file("TTMPL.mpl", FileOptions::<()>::default().compression_method(CompressionMethod::Deflated)).unwrap(); match manifest { ManifestKind::V1(mods) => { for mod_ in mods {