Use external crate to convert an MsDos datetime

Cargo.toml

@@ -16,3 +16,4 @@ flate2 = "0.2"
 bzip2 = "0.2"
 time = "0.1"
 podio = "0.1"
+msdos_time = "0.1"

src/lib.rs

@@ -2,16 +2,16 @@
 
 #![warn(missing_docs)]
 
-extern crate time;
-extern crate flate2;
 extern crate bzip2;
+extern crate flate2;
+extern crate msdos_time;
 extern crate podio;
+extern crate time;
 
 pub use read::ZipArchive;
 pub use write::ZipWriter;
 pub use compression::CompressionMethod;
 
-mod util;
 mod spec;
 mod crc32;
 mod types;

src/read.rs

@@ -10,10 +10,10 @@ use std::collections::HashMap;
 use flate2;
 use flate2::FlateReadExt;
 use bzip2::reader::BzDecompressor;
-use util;
 use podio::{ReadPodExt, LittleEndian};
 use types::ZipFileData;
 use cp437::FromCp437;
+use msdos_time::{TmMsDosExt, MsDosDateTime};
 
 /// Wrapper for reading the contents of a ZIP file.
 ///
@@ -232,7 +232,7 @@ fn central_header_to_zip_file<R: Read+io::Seek>(reader: &mut R) -> ZipResult<Zip
     {
         encrypted: encrypted,
         compression_method: CompressionMethod::from_u16(compression_method),
-        last_modified_time: util::msdos_datetime_to_tm(last_mod_time, last_mod_date),
+        last_modified_time: try!(::time::Tm::from_msdos(MsDosDateTime::new(last_mod_time, last_mod_date))),
         crc32: crc32,
         compressed_size: compressed_size as u64,
         uncompressed_size: uncompressed_size as u64,

src/util.rs

@@ -1,110 +0,0 @@
-use time::{self, Tm};
-
-pub fn msdos_datetime_to_tm(time: u16, date: u16) -> Tm
-{
-    let seconds = (time & 0b0000000000011111) << 1;
-    let minutes = (time & 0b0000011111100000) >> 5;
-    let hours =   (time & 0b1111100000000000) >> 11;
-    let days =    (date & 0b0000000000011111) >> 0;
-    let months =  (date & 0b0000000111100000) >> 5;
-    let years =   (date & 0b1111111000000000) >> 9;
-
-    // Month range: Dos [1..12], Tm [0..11]
-    // Year zero: Dos 1980, Tm 1900
-
-    let tm = Tm {
-        tm_sec: seconds as i32,
-        tm_min: minutes as i32,
-        tm_hour: hours as i32,
-        tm_mday: days as i32,
-        tm_mon: months as i32 - 1,
-        tm_year: years as i32 + 80,
-        ..time::empty_tm()
-    };
-
-    // Re-parse the possibly incorrect timestamp to get a correct one.
-    // This ensures every value will be in range
-    // TODO: Find an alternative way to do this since it may panic on Windows.
-    //time::at_utc(tm.to_timespec())
-    tm
-}
-
-pub fn tm_to_msdos_time(time: Tm) -> u16
-{
-    ((time.tm_sec >> 1) | (time.tm_min << 5) | (time.tm_hour << 11)) as u16
-}
-
-pub fn tm_to_msdos_date(time: Tm) -> u16
-{
-    (time.tm_mday | ((time.tm_mon + 1) << 5) | ((time.tm_year - 80) << 9)) as u16
-}
-
-#[cfg(test)]
-mod dos_tm_test {
-    use super::*;
-    use time::{self, Tm};
-
-    fn check_date(input: Tm, day: i32, month: i32, year: i32) {
-        assert_eq!(input.tm_mday, day);
-        assert_eq!(input.tm_mon + 1, month);
-        assert_eq!(input.tm_year + 1900, year);
-    }
-
-    fn check_time(input: Tm, hour: i32, minute: i32, second: i32) {
-        assert_eq!(input.tm_hour, hour);
-        assert_eq!(input.tm_min, minute);
-        assert_eq!(input.tm_sec, second);
-    }
-
-    #[test]
-    fn dos_zero() {
-        // The 0 date is actually not a correct msdos date, but we
-        // will parse it and adjust accordingly.
-        let tm = msdos_datetime_to_tm(0, 0);
-        //check_date(tm, 30, 11, 1979); // TODO: this is actually the preferred result, but not possible to obtain on Windows
-        check_date(tm, 0, 0, 1980);
-        check_time(tm, 0, 0, 0);
-
-        // This is the actual smallest date possible
-        let tm = msdos_datetime_to_tm(0, 0b100001);
-        check_date(tm, 1, 1, 1980);
-        check_time(tm, 0, 0, 0);
-    }
-
-    #[test]
-    fn dos_today() {
-        let tm = msdos_datetime_to_tm(0b01001_100000_10101, 0b0100011_0110_11110);
-        check_date(tm, 30, 6, 2015);
-        check_time(tm, 9, 32, 42);
-    }
-
-    #[test]
-    fn zero_dos() {
-        let tm = Tm {
-            tm_year: 80,
-            tm_mon: 0,
-            tm_mday: 1,
-            tm_hour: 0,
-            tm_min: 0,
-            tm_sec: 0,
-            ..time::empty_tm()
-        };
-        assert_eq!(tm_to_msdos_date(tm), 0b100001);
-        assert_eq!(tm_to_msdos_time(tm), 0);
-    }
-
-    #[test]
-    fn today_dos() {
-        let tm = Tm {
-            tm_year: 115,
-            tm_mon: 5,
-            tm_mday: 30,
-            tm_hour: 9,
-            tm_min: 32,
-            tm_sec: 42,
-            ..time::empty_tm()
-        };
-        assert_eq!(tm_to_msdos_date(tm), 0b0100011_0110_11110);
-        assert_eq!(tm_to_msdos_time(tm), 0b01001_100000_10101);
-    }
-}

src/write.rs

@@ -16,8 +16,8 @@ use flate2::FlateWriteExt;
 use flate2::write::DeflateEncoder;
 use bzip2;
 use bzip2::writer::BzCompressor;
-use util;
 use podio::{WritePodExt, LittleEndian};
+use msdos_time::TmMsDosExt;
 
 enum GenericZipWriter<W: Write + io::Seek>
 {
@@ -309,8 +309,9 @@ fn write_local_file_header<T: Write>(writer: &mut T, file: &ZipFileData) -> ZipR
     let flag = if !file.file_name.is_ascii() { 1u16 << 11 } else { 0 };
     try!(writer.write_u16::<LittleEndian>(flag));
     try!(writer.write_u16::<LittleEndian>(file.compression_method.to_u16()));
-    try!(writer.write_u16::<LittleEndian>(util::tm_to_msdos_time(file.last_modified_time)));
+    let msdos_datetime = try!(file.last_modified_time.to_msdos());
-    try!(writer.write_u16::<LittleEndian>(util::tm_to_msdos_date(file.last_modified_time)));
+    try!(writer.write_u16::<LittleEndian>(msdos_datetime.timepart));
+    try!(writer.write_u16::<LittleEndian>(msdos_datetime.datepart));
     try!(writer.write_u32::<LittleEndian>(file.crc32));
     try!(writer.write_u32::<LittleEndian>(file.compressed_size as u32));
     try!(writer.write_u32::<LittleEndian>(file.uncompressed_size as u32));
@@ -341,8 +342,9 @@ fn write_central_directory_header<T: Write>(writer: &mut T, file: &ZipFileData)
     let flag = if !file.file_name.is_ascii() { 1u16 << 11 } else { 0 };
     try!(writer.write_u16::<LittleEndian>(flag));
     try!(writer.write_u16::<LittleEndian>(file.compression_method.to_u16()));
-    try!(writer.write_u16::<LittleEndian>(util::tm_to_msdos_time(file.last_modified_time)));
+    let msdos_datetime = try!(file.last_modified_time.to_msdos());
-    try!(writer.write_u16::<LittleEndian>(util::tm_to_msdos_date(file.last_modified_time)));
+    try!(writer.write_u16::<LittleEndian>(msdos_datetime.timepart));
+    try!(writer.write_u16::<LittleEndian>(msdos_datetime.datepart));
     try!(writer.write_u32::<LittleEndian>(file.crc32));
     try!(writer.write_u32::<LittleEndian>(file.compressed_size as u32));
     try!(writer.write_u32::<LittleEndian>(file.uncompressed_size as u32));