mirror of
https://github.com/Ap0dexMe0/unixtract.git
synced 2026-07-16 13:14:22 +02:00
newreg: simplify getting file/dir and context
This commit is contained in:
+4
-4
@@ -1,5 +1,5 @@
|
||||
use std::any::Any;
|
||||
use crate::{InputTarget, AppContext, formats::Format};
|
||||
use crate::{AppContext, formats::Format};
|
||||
pub fn format() -> Format {
|
||||
Format { name: "epk1", detector_func: is_epk1_file, extractor_func: extract_epk1 }
|
||||
}
|
||||
@@ -41,7 +41,7 @@ struct Pak {
|
||||
}
|
||||
|
||||
pub fn is_epk1_file(app_ctx: &AppContext) -> Result<Option<Box<dyn Any>>, Box<dyn std::error::Error>> {
|
||||
let file = match &app_ctx.input {InputTarget::File(f) => f, InputTarget::Directory(_) => return Ok(None)};
|
||||
let file = match app_ctx.file() {Some(f) => f, None => return Ok(None)};
|
||||
|
||||
let epk2_magic = common::read_file(&file, 12, 4)?; //for epk2b
|
||||
let epak_magic = common::read_file(&file, 0, 4)?;
|
||||
@@ -52,8 +52,8 @@ pub fn is_epk1_file(app_ctx: &AppContext) -> Result<Option<Box<dyn Any>>, Box<dy
|
||||
}
|
||||
}
|
||||
|
||||
pub fn extract_epk1(app_ctx: &AppContext, _ctx: Option<Box<dyn Any>>) -> Result<(), Box<dyn std::error::Error>> {
|
||||
let mut file = match &app_ctx.input {InputTarget::File(f) => f, InputTarget::Directory(_) => return Err("Extractor expected file, not directory".into())};
|
||||
pub fn extract_epk1(app_ctx: &AppContext, _ctx: Box<dyn Any>) -> Result<(), Box<dyn std::error::Error>> {
|
||||
let mut file = app_ctx.file().ok_or("Extractor expected file")?;
|
||||
//check type of epk1
|
||||
let epk1_type;
|
||||
let init_pak_count_bytes = common::read_file(&file, 8, 4)?;
|
||||
|
||||
Reference in New Issue
Block a user