From b9af51e654793931af39f221f143b9dea524f349 Mon Sep 17 00:00:00 2001
From: Damien Collard <damien.collard@laposte.net>
Date: Sun, 27 Jan 2019 15:57:30 +0100
Subject: [PATCH 1/2] Add ZipFile::is_dir() and ZipFile::is_file().

The naming matches that of std::fs::Metadata.

An entry is determined to be a directory based on the presence of
a trailing path separator, i.e. '/' or '\'.

This patch adds a small test zip containing files and directories.
Their names match their type so as to make testing easy.
---
 src/read.rs                   |  28 ++++++++++++++++++++++++++++
 tests/data/files_and_dirs.zip | Bin 0 -> 979 bytes
 2 files changed, 28 insertions(+)
 create mode 100644 tests/data/files_and_dirs.zip

diff --git a/src/read.rs b/src/read.rs
index ba20214c..e01e1edc 100644
--- a/src/read.rs
+++ b/src/read.rs
@@ -465,6 +465,14 @@ impl<'a> ZipFile<'a> {
     pub fn last_modified(&self) -> DateTime {
         self.data.last_modified_time
     }
+    /// Returns whether the file is actually a directory
+    pub fn is_dir(&self) -> bool {
+        self.name().chars().rev().next().map_or(false, |c| c == '/' || c == '\\')
+    }
+    /// Returns whether the file is a regular file
+    pub fn is_file(&self) -> bool {
+        !self.is_dir()
+    }
     /// Get unix mode for the file
     pub fn unix_mode(&self) -> Option<u32> {
         if self.data.external_attributes == 0 {
@@ -711,4 +719,24 @@ mod test {
         assert_eq!(buf3, buf4);
         assert!(buf1 != buf3);
     }
+
+    #[test]
+    fn file_and_dir_predicates() {
+        use super::ZipArchive;
+        use std::io;
+
+        let mut v = Vec::new();
+        v.extend_from_slice(include_bytes!("../tests/data/files_and_dirs.zip"));
+        let mut zip = ZipArchive::new(io::Cursor::new(v)).unwrap();
+
+        for i in 0..zip.len() {
+            let zip_file = zip.by_index(i).unwrap();
+            let full_name = zip_file.sanitized_name();
+            let file_name = full_name.file_name().unwrap().to_str().unwrap();
+            assert!(
+                (file_name.starts_with("dir") && zip_file.is_dir())
+                    || (file_name.starts_with("file") && zip_file.is_file())
+            );
+        }
+    }
 }
diff --git a/tests/data/files_and_dirs.zip b/tests/data/files_and_dirs.zip
new file mode 100644
index 0000000000000000000000000000000000000000..c011beba39a6a764d8009e8f66d73529401f9a9f
GIT binary patch
literal 979
zcmWIWW@h1H0D-3!)_!0Hlwf6$VMxg=GSm+Z;bdUu+wB|E2*jlo+zgB?Ul|z~SVVvd
z1K`@91GSeXGVd1xih?j7OnX{pPO70^Nks|R93h|?!kFf`0Tn4^<`rkAq$+?c)#E~#
zd;`0~j35sCv5SDi-k@pchB(YfA83ye)ORwteFyR-2g3)TA$@1AwTJ_G5<o19Y6!@W
zMhH(T1C0Y=w7@Dpea18N#2M{#KAxc-Cv}W2u?x0U#UO>@BcLsd6@Nv*!jKba3&>~#
zc<^xmP36Qi8613xB?=`OsR~8;`6Zy>V`P$J#uc+5FMxmm!&^rX4UK13NIauC8`&t#
zScVt{Ob-l88tq|5fgBAD4xpK!ILBiqX8a;MZzjY{P;3K@0>w5SqcGzd*{B;ZqhK))
zG!PW?SPjG#@5ug@1$rA~7Bnd#rvjkSSW*CTP+~?lveC^zqmiN>XdEc&F<i>Z2J{mH
O8xTGPYPbQ41_l6XR=Yv~

literal 0
HcmV?d00001


From d9c3c085a8aa272607ba3773cdbfa5f8d24f198b Mon Sep 17 00:00:00 2001
From: Damien Collard <damien.collard@laposte.net>
Date: Thu, 31 Jan 2019 13:39:30 +0100
Subject: [PATCH 2/2] Fix CI test with --no-default-features failing.

This fix replaces the compressed test archive with a non-compressed
one.
---
 tests/data/files_and_dirs.zip | Bin 979 -> 462 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/data/files_and_dirs.zip b/tests/data/files_and_dirs.zip
index c011beba39a6a764d8009e8f66d73529401f9a9f..c444078a4af387356e2047deb1bfbe653dfd55b1 100644
GIT binary patch
delta 93
zcmcc2evWx^Got}B%j=-Y+Za_QGHEfZybhYEFEw$o5{NZ9j@g8R0SJ~fGB8Y@#jHBH
sfSGIZ6Gl14(8<h9I+L53<QS(+Uc{s{c|S87A2S0p!&9K*%OD*L04@I+4*&oF

literal 979
zcmWIWW@h1H0D-3!)_!0Hlwf6$VMxg=GSm+Z;bdUu+wB|E2*jlo+zgB?Ul|z~SVVvd
z1K`@91GSeXGVd1xih?j7OnX{pPO70^Nks|R93h|?!kFf`0Tn4^<`rkAq$+?c)#E~#
zd;`0~j35sCv5SDi-k@pchB(YfA83ye)ORwteFyR-2g3)TA$@1AwTJ_G5<o19Y6!@W
zMhH(T1C0Y=w7@Dpea18N#2M{#KAxc-Cv}W2u?x0U#UO>@BcLsd6@Nv*!jKba3&>~#
zc<^xmP36Qi8613xB?=`OsR~8;`6Zy>V`P$J#uc+5FMxmm!&^rX4UK13NIauC8`&t#
zScVt{Ob-l88tq|5fgBAD4xpK!ILBiqX8a;MZzjY{P;3K@0>w5SqcGzd*{B;ZqhK))
zG!PW?SPjG#@5ug@1$rA~7Bnd#rvjkSSW*CTP+~?lveC^zqmiN>XdEc&F<i>Z2J{mH
O8xTGPYPbQ41_l6XR=Yv~