Create file driver and implement file reader

1 files changed, 17 insertions, 10 deletions

diff --git a/src/driver/driver.rs b/src/driver/driver.rs
index 9c18e1f..5bd2319 100644
--- a/src/driver/driver.rs
+++ b/src/driver/driver.rs
@@ -1,4 +1,4 @@
-use crate::driver::ArchiveFile;
+use crate::driver::{ArchiveFileInfo, FileDriver};
 use crate::ArchiveResult;
 use std::error::Error;
 use std::io::{Read, Write};
@@ -6,26 +6,33 @@ use std::io::{Read, Write};
 pub trait Driver: Sized {
     type Error: Error;
 
-    type IO;
-    type File: ArchiveFile;
+    type Io;
+    type FileInfo: ArchiveFileInfo;
+    type FileDriver<'d>: FileDriver
+    where
+        Self::FileInfo: 'd,
+        Self::Io: 'd;
 }
 
 pub trait ArchiveRead: Driver
 where
-    Self::IO: Read,
+    Self::Io: Read,
 {
     // Create driver instance
-    fn read(io: Self::IO) -> ArchiveResult<Self, Self::Error>;
+    fn read(io: Self::Io) -> ArchiveResult<Self, Self::Error>;
 
     // Return vec of files (sorted by name)
-    fn files(&self) -> Vec<&Self::File>;
+    fn files(&self) -> Vec<&Self::FileInfo>;
 
-    // Return file by name
-    fn get_file(&self, name: &str) -> Option<&Self::File>;
+    // Return file info by name
+    fn get_file_info(&self, name: &str) -> Option<&Self::FileInfo>;
+
+    // Return file reader by name
+    fn get_file_reader<'d>(&'d mut self, name: &str) -> Option<Self::FileDriver<'d>>;
 }
 
-pub trait ArchiveWrite: ArchiveRead
+pub trait ArchiveWrite: Driver
 where
-    Self::IO: Read + Write,
+    Self::Io: Read + Write,
 {
 }