From a4e92ed9bec1f5879eb1c20dfe281c4d25ed5f89 Mon Sep 17 00:00:00 2001
From: Igor Tolmachev <me@igorek.dev>
Date: Sun, 23 Jun 2024 15:19:40 +0900
Subject: Improve ZipFile

---
 src/zip/error.rs | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

(limited to 'src/zip/error.rs')

diff --git a/src/zip/error.rs b/src/zip/error.rs
index 18bbb22..1c5527c 100644
--- a/src/zip/error.rs
+++ b/src/zip/error.rs
@@ -7,15 +7,14 @@ pub type ZipResult<T> = ArchiveResult<T, ZipError>;
 #[derive(Debug)]
 pub enum ZipError {
     EOCDRNotFound,
-    InvalidEOCDR,
-    InvalidArchiveComment,
-
-    InvalidEOCDR64Locator,
     InvalidEOCDR64Signature,
-    InvalidEOCDR64,
-
     InvalidCDRSignature,
-    InvalidCDR,
+
+    InvalidArchiveComment,
+    InvalidCompressionMethod,
+    UnsupportedCompressionMethod,
+    InvalidDate,
+    InvalidTime,
     InvalidFileName,
     InvalidFileComment,
 }
@@ -32,25 +31,24 @@ impl From<ZipError> for ArchiveError<ZipError> {
 impl Display for ZipError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            ZipError::EOCDRNotFound => write!(f, "End of central directory record not found"),
-            ZipError::InvalidEOCDR => write!(f, "Invalid end of central directory record"),
-            ZipError::InvalidArchiveComment => write!(f, "Invalid archive comment"),
-            ZipError::InvalidEOCDR64Locator => {
-                write!(f, "Invalid zip64 end of central directory locator")
-            }
-            ZipError::InvalidEOCDR64Signature => {
+            Self::EOCDRNotFound => write!(f, "End of central directory record not found"),
+            Self::InvalidEOCDR64Signature => {
                 write!(
                     f,
                     "Invalid signature of zip64 end of central directory record"
                 )
             }
-            ZipError::InvalidEOCDR64 => write!(f, "Invalid zip64 end of central directory record"),
-            ZipError::InvalidCDRSignature => {
+            Self::InvalidCDRSignature => {
                 write!(f, "Invalid signature of central directory record")
             }
-            ZipError::InvalidCDR => write!(f, "Invalid central directory record"),
-            ZipError::InvalidFileName => write!(f, "Invalid file name"),
-            ZipError::InvalidFileComment => write!(f, "Invalid file comment"),
+
+            Self::InvalidArchiveComment => write!(f, "Invalid archive comment"),
+            Self::InvalidCompressionMethod => writeln!(f, "Invalid compression method"),
+            Self::UnsupportedCompressionMethod => writeln!(f, "Unsupported compression method"),
+            Self::InvalidDate => write!(f, "Invalid date"),
+            Self::InvalidTime => write!(f, "Invalid time"),
+            Self::InvalidFileName => write!(f, "Invalid file name"),
+            Self::InvalidFileComment => write!(f, "Invalid file comment"),
         }
     }
 }
-- 
cgit v1.2.3