aboutsummaryrefslogtreecommitdiff
path: root/src/raw
diff options
context:
space:
mode:
Diffstat (limited to 'src/raw')
-rw-r--r--src/raw/mod.rs13
-rw-r--r--src/raw/parser.rs8
2 files changed, 19 insertions, 2 deletions
diff --git a/src/raw/mod.rs b/src/raw/mod.rs
index 7cbe483..7a079a1 100644
--- a/src/raw/mod.rs
+++ b/src/raw/mod.rs
@@ -6,6 +6,8 @@
//! functions whenever possible.
mod types;
+use zip::ZipArchive;
+
pub use self::types::{
Agent, CbtActivation, CbtBuffRemove, CbtCustomSkill, CbtEvent, CbtResult, CbtStateChange,
Language, Skill, IFF,
@@ -13,4 +15,13 @@ pub use self::types::{
pub mod parser;
-pub use self::parser::{parse_file, Evtc, ParseError};
+pub use self::parser::{parse_file, Evtc, ParseError, ParseResult};
+
+use std::io::{Read, Seek};
+
+/// Parse a complete log that was compressed as a zip file.
+pub fn parse_zip<T: Read + Seek>(input: &mut T) -> ParseResult<Evtc> {
+ let mut archive = ZipArchive::new(input)?;
+ let mut file = archive.by_index(0)?;
+ parse_file(&mut file)
+}
diff --git a/src/raw/parser.rs b/src/raw/parser.rs
index 8e931a2..97c0bc7 100644
--- a/src/raw/parser.rs
+++ b/src/raw/parser.rs
@@ -117,11 +117,17 @@ quick_error! {
MalformedHeader {
description("malformed header")
}
+ InvalidZip(err: ::zip::result::ZipError) {
+ from()
+ description("zip error")
+ display("Archive error: {}", err)
+ cause(err)
+ }
}
}
/// A type indicating the parse result.
-type ParseResult<T> = Result<T, ParseError>;
+pub type ParseResult<T> = Result<T, ParseError>;
/// Parse the header of an evtc file.
///