little refactor
This commit is contained in:
parent
6c78133819
commit
bf5810c4d7
4 changed files with 2 additions and 25 deletions
|
|
@ -15,19 +15,6 @@ pub struct Raw {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Raw {
|
impl Raw {
|
||||||
pub fn join(offset: usize, size: usize, raws: &mut [Raw]) -> Raw {
|
|
||||||
let mut mem: Vec<u8> = Vec::new();
|
|
||||||
for raw in raws.iter_mut() {
|
|
||||||
mem.append(&mut raw.mem);
|
|
||||||
}
|
|
||||||
|
|
||||||
Raw {
|
|
||||||
offset: offset,
|
|
||||||
size: size,
|
|
||||||
mem: mem,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn find_str(&self, str: &str, offset: usize) -> Option<usize> {
|
pub fn find_str(&self, str: &str, offset: usize) -> Option<usize> {
|
||||||
let search = TwoWaySearcher::new(str.as_bytes());
|
let search = TwoWaySearcher::new(str.as_bytes());
|
||||||
search.search_in(&self.mem[offset..])
|
search.search_in(&self.mem[offset..])
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
use super::decoder::{Decoder, DecoderCtx};
|
use super::decoder::DecoderCtx;
|
||||||
use super::raw::Raw;
|
use super::raw::Raw;
|
||||||
use super::stream::{ReadStream, WriteStream};
|
use super::stream::{ReadStream, WriteStream};
|
||||||
use super::world::World;
|
use super::world::World;
|
||||||
|
|
|
||||||
|
|
@ -115,10 +115,6 @@ impl WriteStream {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn offset(&self) -> usize {
|
|
||||||
self.buf.position() as usize
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn skip(&mut self, size: usize) {
|
pub fn skip(&mut self, size: usize) {
|
||||||
self.buf.set_position(self.buf.position() + size as u64);
|
self.buf.set_position(self.buf.position() + size as u64);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,7 @@
|
||||||
use crate::fot::attributes;
|
|
||||||
|
|
||||||
use super::decoder::DecoderCtx;
|
use super::decoder::DecoderCtx;
|
||||||
use super::entitylist::{EntityEncoding, EntityList};
|
use super::entitylist::{EntityEncoding, EntityList};
|
||||||
|
use super::esh::ESHValue;
|
||||||
use super::fstring::FString;
|
use super::fstring::FString;
|
||||||
use super::raw::Raw;
|
|
||||||
use super::sgd::SGD;
|
use super::sgd::SGD;
|
||||||
use super::ssg::SSG;
|
use super::ssg::SSG;
|
||||||
use super::stream::{ReadStream, WriteStream};
|
use super::stream::{ReadStream, WriteStream};
|
||||||
|
|
@ -13,10 +11,6 @@ use anyhow::Result;
|
||||||
use deflate::deflate_bytes_zlib;
|
use deflate::deflate_bytes_zlib;
|
||||||
use inflate::inflate_bytes_zlib;
|
use inflate::inflate_bytes_zlib;
|
||||||
|
|
||||||
use super::attributes::Attributes;
|
|
||||||
use super::esh::{ESHValue, ESH};
|
|
||||||
use std::path::Path;
|
|
||||||
|
|
||||||
pub struct World {
|
pub struct World {
|
||||||
pub offset: usize,
|
pub offset: usize,
|
||||||
pub size: usize,
|
pub size: usize,
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue