mirror of
https://github.com/storytold/craft-libs.git
synced 2026-11-18 08:15:29 +00:00
Keep aligned stored entry headers compatible with USDZ exporter
This commit is contained in:
1 parent
e66b3a7954
commit
6128eabbfb
1 file changed
+6
-4
@@ -44,11 +44,13 @@ impl Writer {
|
||||
|
||||
/// Adds an entry from a byte slice. A name the archive already has is an error.
|
||||
pub fn add(&mut self, name: &str, data: &[u8], compression: Compression) -> Result<(), Error> {
|
||||
self.add_entry(name, data, compression, 1)
|
||||
self.add_entry(name, data, compression, 1, data.len() as u64 >= u64::from(u32::MAX) / 2)
|
||||
}
|
||||
|
||||
/// Adds a stored entry whose payload starts on an `alignment`-byte boundary.
|
||||
///
|
||||
/// Entries use ordinary ZIP headers, matching the USDZ writer this replaces;
|
||||
/// oversized entries fail rather than opting into ZIP64 headers.
|
||||
/// USDZ uses 64. Only powers of two from 1 through 4096 are accepted, bounding
|
||||
/// per-entry padding. This does not impose a total archive-size budget; callers
|
||||
/// retain their format-specific size and name policies. Discard the writer after
|
||||
@@ -58,10 +60,10 @@ impl Writer {
|
||||
if !alignment.is_power_of_two() || alignment > 4096 {
|
||||
return Err(Error::Write("alignment must be a power of two between 1 and 4096".into()));
|
||||
}
|
||||
self.add_entry(name, data, Compression::Stored, alignment)
|
||||
self.add_entry(name, data, Compression::Stored, alignment, false)
|
||||
}
|
||||
|
||||
fn add_entry(&mut self, name: &str, data: &[u8], compression: Compression, alignment: u16) -> Result<(), Error> {
|
||||
fn add_entry(&mut self, name: &str, data: &[u8], compression: Compression, alignment: u16, large_file: bool) -> Result<(), Error> {
|
||||
let (method, level) = match compression {
|
||||
Compression::Stored => (zip::CompressionMethod::Stored, None),
|
||||
Compression::Deflated => (zip::CompressionMethod::Deflated, Some(6)),
|
||||
@@ -71,7 +73,7 @@ impl Writer {
|
||||
.compression_method(method)
|
||||
.compression_level(level)
|
||||
.last_modified_time(zip::DateTime::default())
|
||||
.large_file(data.len() as u64 >= u64::from(u32::MAX) / 2)
|
||||
.large_file(large_file)
|
||||
.with_alignment(alignment);
|
||||
let fail = |e: &dyn std::fmt::Display| Error::Write(format!("{name}: {e}"));
|
||||
self.zip.start_file(name, options).map_err(|e| fail(&e))?;
|
||||
|
||||
Reference in new issue
Block a user