From a9a3fb521e76b34c25f882d641aee2a68d4e4866 Mon Sep 17 00:00:00 2001 From: Sam Rijs Date: Tue, 6 Nov 2018 23:46:06 +1100 Subject: [PATCH] Defer conversion to time::Tm on read --- src/read.rs | 24 +++++------------------- src/types.rs | 41 +++++++++++++++++++++++++++++++++++++++-- src/write.rs | 5 ++--- 3 files changed, 46 insertions(+), 24 deletions(-) diff --git a/src/read.rs b/src/read.rs index 246e1604..e37be2c6 100644 --- a/src/read.rs +++ b/src/read.rs @@ -10,9 +10,9 @@ use std::collections::HashMap; use std::borrow::Cow; use podio::{ReadPodExt, LittleEndian}; -use types::{ZipFileData, System}; +use types::{ZipFileData, System, DateTime}; use cp437::FromCp437; -use msdos_time::{TmMsDosExt, MsDosDateTime}; +use msdos_time::MsDosDateTime; #[cfg(feature = "flate2")] use flate2; @@ -27,20 +27,6 @@ mod ffi { pub const S_IFREG: u32 = 0o0100000; } -const TM_1980_01_01 : ::time::Tm = ::time::Tm { - tm_sec: 0, - tm_min: 0, - tm_hour: 0, - tm_mday: 1, - tm_mon: 0, - tm_year: 80, - tm_wday: 2, - tm_yday: 0, - tm_isdst: -1, - tm_utcoff: 0, - tm_nsec: 0 -}; - /// Wrapper for reading the contents of a ZIP file. /// /// ``` @@ -367,7 +353,7 @@ fn central_header_to_zip_file(reader: &mut R, archive_offset: version_made_by: version_made_by as u8, encrypted: encrypted, compression_method: CompressionMethod::from_u16(compression_method), - last_modified_time: ::time::Tm::from_msdos(MsDosDateTime::new(last_mod_time, last_mod_date)).unwrap_or(TM_1980_01_01), + last_modified_time: DateTime::MsDos(MsDosDateTime::new(last_mod_time, last_mod_date)), crc32: crc32, compressed_size: compressed_size as u64, uncompressed_size: uncompressed_size as u64, @@ -480,7 +466,7 @@ impl<'a> ZipFile<'a> { } /// Get the time the file was last modified pub fn last_modified(&self) -> ::time::Tm { - self.data.last_modified_time + self.data.last_modified_time.to_tm() } /// Get unix mode for the file pub fn unix_mode(&self) -> Option { @@ -608,7 +594,7 @@ pub fn read_zipfile_from_stream<'a, R: io::Read>(reader: &'a mut R) -> ZipResult version_made_by: version_made_by as u8, encrypted: encrypted, compression_method: compression_method, - last_modified_time: ::time::Tm::from_msdos(MsDosDateTime::new(last_mod_time, last_mod_date)).unwrap_or(TM_1980_01_01), + last_modified_time: DateTime::MsDos(MsDosDateTime::new(last_mod_time, last_mod_date)), crc32: crc32, compressed_size: compressed_size as u64, uncompressed_size: uncompressed_size as u64, diff --git a/src/types.rs b/src/types.rs index a8609b3b..ba7dce5b 100644 --- a/src/types.rs +++ b/src/types.rs @@ -1,6 +1,7 @@ //! Types that specify what is contained in a ZIP. use time; +use msdos_time::{TmMsDosExt, MsDosDateTime}; #[derive(Clone, Copy, Debug, PartialEq)] pub enum System @@ -25,6 +26,42 @@ impl System { } } +const TM_1980_01_01 : time::Tm = time::Tm { + tm_sec: 0, + tm_min: 0, + tm_hour: 0, + tm_mday: 1, + tm_mon: 0, + tm_year: 80, + tm_wday: 2, + tm_yday: 0, + tm_isdst: -1, + tm_utcoff: 0, + tm_nsec: 0 +}; + +#[derive(Debug, Clone)] +pub enum DateTime { + Tm(time::Tm), + MsDos(MsDosDateTime) +} + +impl DateTime { + pub fn to_tm(&self) -> time::Tm { + match self { + &DateTime::Tm(ref tm) => *tm, + &DateTime::MsDos(ref ms) => time::Tm::from_msdos(*ms).unwrap_or(TM_1980_01_01) + } + } + + pub fn to_msdos(&self) -> Result { + match self { + &DateTime::Tm(ref tm) => tm.to_msdos(), + &DateTime::MsDos(ref ms) => Ok(*ms) + } + } +} + pub const DEFAULT_VERSION: u8 = 46; /// Structure representing a ZIP file. @@ -40,7 +77,7 @@ pub struct ZipFileData /// Compression method used to store the file pub compression_method: ::compression::CompressionMethod, /// Last modified time. This will only have a 2 second precision. - pub last_modified_time: time::Tm, + pub last_modified_time: DateTime, /// CRC32 checksum pub crc32: u32, /// Size of the file in the ZIP @@ -120,7 +157,7 @@ mod test { version_made_by: 0, encrypted: false, compression_method: ::compression::CompressionMethod::Stored, - last_modified_time: time::empty_tm(), + last_modified_time: DateTime::Tm(time::empty_tm()), crc32: 0, compressed_size: 0, uncompressed_size: 0, diff --git a/src/write.rs b/src/write.rs index d981bd1f..03fa7e6f 100644 --- a/src/write.rs +++ b/src/write.rs @@ -1,7 +1,7 @@ //! Structs for creating a new zip archive use compression::CompressionMethod; -use types::{ZipFileData, System, DEFAULT_VERSION}; +use types::{ZipFileData, System, DEFAULT_VERSION, DateTime}; use spec; use crc32; use result::{ZipResult, ZipError}; @@ -11,7 +11,6 @@ use std::io::prelude::*; use std::mem; use time; use podio::{WritePodExt, LittleEndian}; -use msdos_time::TmMsDosExt; #[cfg(feature = "flate2")] use flate2; @@ -204,7 +203,7 @@ impl ZipWriter version_made_by: DEFAULT_VERSION, encrypted: false, compression_method: options.compression_method, - last_modified_time: options.last_modified_time, + last_modified_time: DateTime::Tm(options.last_modified_time), crc32: 0, compressed_size: 0, uncompressed_size: 0,