1 files changed, 11 insertions, 8 deletions

diff --git a/src/driver/driver.rs b/src/driver/driver.rs
index 4c6baad..f7f1f24 100644
--- a/src/driver/driver.rs
+++ b/src/driver/driver.rs
@@ -8,34 +8,37 @@ pub trait Driver: Sized {
 
     type Io;
     type FileInfo: ArchiveFileInfo;
-    type FileDriver<'d>: FileDriver
-    where
-        Self::FileInfo: 'd,
-        Self::Io: 'd;
 }
 
 pub trait ArchiveRead: Driver
 where
     Self::Io: Read,
 {
+    type FileReader<'d>: FileDriver
+    where
+        Self: 'd;
+
     // Create driver instance
     fn read(io: Self::Io) -> ArchiveResult<Self, Self::Error>;
 
     // Return vec of file info
-    fn files(&self) -> &Vec<Self::FileInfo>;
+    fn files(&self) -> Vec<&Self::FileInfo>;
 
     // Return file info by index
-    fn get_file_info(&self, index: usize) -> ArchiveResult<&Self::FileInfo, Self::Error>;
+    fn get_file_info(&self, name: &str) -> ArchiveResult<&Self::FileInfo, Self::Error>;
 
     // Return file reader by index
     fn get_file_reader<'d>(
         &'d mut self,
-        index: usize,
-    ) -> ArchiveResult<Self::FileDriver<'d>, Self::Error>;
+        name: &str,
+    ) -> ArchiveResult<Self::FileReader<'d>, Self::Error>;
 }
 
 pub trait ArchiveWrite: Driver
 where
     Self::Io: Read + Write,
 {
+    type FileWriter<'d>: FileDriver
+    where
+        Self: 'd;
 }