From 686f6f1abfa8b297386e7f57106ca37a8ee7e404 Mon Sep 17 00:00:00 2001
From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com>
Date: Mon, 29 Apr 2024 19:16:31 -0700
Subject: [PATCH] feat: Improve ErrorKind in ZipError to io::Error conversion
 (previously https://github.com/zip-rs/zip-old/pull/421)

---
 src/build.rs  |  2 +-
 src/result.rs | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/build.rs b/src/build.rs
index c9feaa0a..8ec1aeab 100644
--- a/src/build.rs
+++ b/src/build.rs
@@ -4,4 +4,4 @@ fn main() {
     if var("CARGO_FEATURE_DEFLATE_MINIZ").is_ok() {
         println!("cargo:warning=Feature `deflate-miniz` is deprecated; replace it with `deflate`");
     }
-}
\ No newline at end of file
+}
diff --git a/src/result.rs b/src/result.rs
index 98d9943d..f2bb4609 100644
--- a/src/result.rs
+++ b/src/result.rs
@@ -79,7 +79,15 @@ impl ZipError {
 
 impl From<ZipError> for io::Error {
     fn from(err: ZipError) -> io::Error {
-        io::Error::new(io::ErrorKind::Other, err)
+        let kind = match &err {
+            ZipError::Io(err) => err.kind(),
+            ZipError::InvalidArchive(_) => io::ErrorKind::InvalidData,
+            ZipError::UnsupportedArchive(_) => io::ErrorKind::Unsupported,
+            ZipError::FileNotFound => io::ErrorKind::NotFound,
+            ZipError::InvalidPassword => io::ErrorKind::InvalidInput,
+        };
+
+        io::Error::new(kind, err)
     }
 }