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

refactor: use a MIN_VERSION constant

Browse source
This commit is contained in:
Chris Hennick 2024-05-25 14:27:59 -07:00
parent 40f20d8a6b
commit edbb7343f5
No known key found for this signature in database
GPG key ID: DA47AABA4961C509
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/types.rs
View file

@ -388,6 +388,7 @@ impl TryFrom<DateTime> for OffsetDateTime {
} }
} }
pub const MIN_VERSION: u8 = 10;
pub const DEFAULT_VERSION: u8 = 45; pub const DEFAULT_VERSION: u8 = 45;
/// Structure representing a ZIP file. /// Structure representing a ZIP file.
@ -524,7 +525,7 @@ impl ZipFileData {
/// PKZIP version needed to open this file (from APPNOTE 4.4.3.2). /// PKZIP version needed to open this file (from APPNOTE 4.4.3.2).
pub fn version_needed(&self) -> u16 { pub fn version_needed(&self) -> u16 {
let compression_version: u16 = match self.compression_method { let compression_version: u16 = match self.compression_method {
CompressionMethod::Stored => 10, CompressionMethod::Stored => MIN_VERSION.into(),
#[cfg(feature = "_deflate-any")] #[cfg(feature = "_deflate-any")]
CompressionMethod::Deflated => 20, CompressionMethod::Deflated => 20,
#[cfg(feature = "bzip2")] #[cfg(feature = "bzip2")]

6
src/write.rs
View file

@ -8,9 +8,7 @@ use crate::result::{ZipError, ZipResult};
use crate::spec::{self, Block}; use crate::spec::{self, Block};
#[cfg(feature = "aes-crypto")] #[cfg(feature = "aes-crypto")]
use crate::types::AesMode; use crate::types::AesMode;
use crate::types::{ use crate::types::{ffi, AesVendorVersion, DateTime, ZipFileData, ZipLocalEntryBlock, ZipRawValues, DEFAULT_VERSION, MIN_VERSION};
ffi, AesVendorVersion, DateTime, ZipFileData, ZipLocalEntryBlock, ZipRawValues, DEFAULT_VERSION,
};
use crate::write::ffi::S_IFLNK; use crate::write::ffi::S_IFLNK;
#[cfg(any(feature = "_deflate-any", feature = "bzip2", feature = "zstd",))] #[cfg(any(feature = "_deflate-any", feature = "bzip2", feature = "zstd",))]
use core::num::NonZeroU64; use core::num::NonZeroU64;
@ -1357,7 +1355,7 @@ impl<W: Write + Seek> ZipWriter<W> {
fn write_central_and_footer(&mut self) -> Result<u64, ZipError> { fn write_central_and_footer(&mut self) -> Result<u64, ZipError> {
let writer = self.inner.get_plain(); let writer = self.inner.get_plain();
let mut version_needed = 10; // Lowest value; even an empty ZIP file needs 1.0 let mut version_needed = MIN_VERSION as u16;
let central_start = writer.stream_position()?; let central_start = writer.stream_position()?;
for file in self.files.values() { for file in self.files.values() {
write_central_directory_header(writer, file)?; write_central_directory_header(writer, file)?;