lifning
/
one-rust
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename OneJod -> OneJodArchive

This commit is contained in:
lif 2021-01-13 00:27:12 -08:00
parent 85dd397d62
commit 9d76a56506
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.rs
View File

@ -7,7 +7,7 @@ fn main() -> std::io::Result<()> {
let args: Vec<String> = env::args().collect(); let args: Vec<String> = env::args().collect();
for arg in &args[1..] { for arg in &args[1..] {
let mut infile = File::open(arg)?; let mut infile = File::open(arg)?;
one::OneJod::from_archive(&mut infile)?.extract()?; one::OneJodArchive::from_file(&mut infile)?.extract()?;
} }
Ok(()) Ok(())
} }

8
src/one/mod.rs
View File

@ -7,14 +7,14 @@ use std::fs::File;
use std::io::{Read, Seek, SeekFrom, Write}; use std::io::{Read, Seek, SeekFrom, Write};
use std::str; use std::str;
pub struct OneJod<R: Read + Seek> { pub struct OneJodArchive<R: Read + Seek> {
read_handle: R, read_handle: R,
_header: OneJodHead, _header: OneJodHead,
entries: Vec<OneJodEntry>, entries: Vec<OneJodEntry>,
} }
impl<R: Read + Seek> OneJod<R> { impl<R: Read + Seek> OneJodArchive<R> {
pub fn from_archive(mut input: R) -> std::io::Result<OneJod<R>> { pub fn from_file(mut input: R) -> std::io::Result<OneJodArchive<R>> {
let mut magic = [0; 16]; let mut magic = [0; 16];
input.read_exact(&mut magic)?; input.read_exact(&mut magic)?;
let _unknown1 = input.read_u32::<LittleEndian>()?; let _unknown1 = input.read_u32::<LittleEndian>()?;
@ -57,7 +57,7 @@ impl<R: Read + Seek> OneJod<R> {
entries.push(entry); entries.push(entry);
} }
Ok(OneJod { Ok(OneJodArchive {
read_handle: input, read_handle: input,
_header: head, _header: head,
entries, entries,