1 files changed, 21 insertions, 17 deletions

diff --git a/src/zip/driver.rs b/src/zip/driver.rs
index 650344e..0db845d 100644
--- a/src/zip/driver.rs
+++ b/src/zip/driver.rs
@@ -1,27 +1,27 @@
 use crate::driver::{ArchiveRead, ArchiveWrite, Driver};
-use crate::zip::file::{BitFlag, CompressionMethod};
 use crate::zip::structs::{deserialize, EOCDR64Locator, ExtraHeader, CDR, EOCDR, EOCDR64};
-use crate::zip::{ZipError, ZipFile, ZipResult};
+use crate::zip::{BitFlag, CompressionMethod, ZipError, ZipFile, ZipFileInfo, ZipResult};
 use chrono::{Local, NaiveDate, NaiveDateTime, NaiveTime};
 use std::collections::HashMap as Map;
 use std::io::{Read, Seek, SeekFrom, Write};
 
-pub struct Zip<IO> {
-    io: IO,
+pub struct Zip<Io> {
+    io: Io,
 
-    files: Map<String, ZipFile>,
+    files: Map<String, ZipFileInfo>,
     comment: String,
 }
 
-impl<IO> Driver for Zip<IO> {
+impl<Io> Driver for Zip<Io> {
     type Error = ZipError;
 
-    type IO = IO;
-    type File = ZipFile;
+    type Io = Io;
+    type FileDriver<'d> = ZipFile<'d, Self::Io> where Self::Io: 'd;
+    type FileInfo = ZipFileInfo;
 }
 
-impl<IO: Read + Seek> ArchiveRead for Zip<IO> {
-    fn read(mut io: Self::IO) -> ZipResult<Self> {
+impl<Io: Read + Seek> ArchiveRead for Zip<Io> {
+    fn read(mut io: Self::Io) -> ZipResult<Self> {
         // Search eocdr
         let limit = 65557.min(io.seek(SeekFrom::End(0))?) as i64;
         let start = io.seek(SeekFrom::End(-limit))?;
@@ -137,7 +137,7 @@ impl<IO: Read + Seek> ArchiveRead for Zip<IO> {
 
             files.insert(
                 name.clone(),
-                ZipFile::new(
+                ZipFileInfo::new(
                     CompressionMethod::from_struct_id(cdr.compression_method)?,
                     BitFlag::new(cdr.bit_flag),
                     NaiveDateTime::new(
@@ -169,23 +169,27 @@ impl<IO: Read + Seek> ArchiveRead for Zip<IO> {
         Ok(Self { io, files, comment })
     }
 
-    fn files(&self) -> Vec<&Self::File> {
-        let mut files: Vec<&Self::File> = self.files.values().collect();
+    fn files(&self) -> Vec<&Self::FileInfo> {
+        let mut files: Vec<&Self::FileInfo> = self.files.values().collect();
         files.sort_by_key(|f| &f.name);
         files
     }
 
-    fn get_file(&self, name: &str) -> Option<&Self::File> {
+    fn get_file_info(&self, name: &str) -> Option<&Self::FileInfo> {
         self.files.get(name)
     }
+
+    fn get_file_reader<'d>(&'d mut self, name: &str) -> Option<Self::FileDriver<'d>> {
+        Some(ZipFile::new(&mut self.io, self.files.get(name)?).unwrap())
+    }
 }
 
-impl<IO: Read + Seek> Zip<IO> {
+impl<Io: Read + Seek> Zip<Io> {
     pub fn comment(&self) -> &String {
         &self.comment
     }
 }
 
-impl<IO: Read + Write + Seek> ArchiveWrite for Zip<IO> {}
+impl<Io: Read + Write + Seek> ArchiveWrite for Zip<Io> {}
 
-impl<IO: Read + Write + Seek> Zip<IO> {}
+impl<Io: Read + Write + Seek> Zip<Io> {}