demostf/parser
1
0
Fork 0
mirror of https://codeberg.org/demostf/parser.git synced 2026-06-03 18:24:05 +02:00
Code Issues Releases Wiki Activity

minor cleanip

Browse source
This commit is contained in:
Robin Appelman 2019-03-16 16:29:57 +01:00
commit a333e26a6d
5 changed files with 54 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,3 +1,5 @@
/target
**/*.rs.bk
*.dem
*.svg
*.data*

8
Cargo.lock generated
View file

@ -3,16 +3,14 @@
[[package]]
name = "bitstream_reader"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitstream_reader_derive 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bitstream_reader_derive 0.4.0",
"num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "bitstream_reader_derive"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
@ -177,7 +175,7 @@ dependencies = [
name = "tf-demo-parser"
version = "0.1.0"
dependencies = [
"bitstream_reader 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bitstream_reader 0.4.0",
"enum-primitive-derive 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"enumflags2 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"enumflags2_derive 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -199,8 +197,6 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[metadata]
"checksum bitstream_reader 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d3433dad8c395743f514171664564ae4348b425ca8f2894c218e5c9a9c4c2a7"
"checksum bitstream_reader_derive 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "567ca1132e573c5e163a990aaf0e0e2b117da516d9e351398b7410597ab1e3e7"
"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb"
"checksum enum-primitive-derive 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2b90e520ec62c1864c8c78d637acbfe8baf5f63240f2fb8165b8325c07812dd"
"checksum enumflags2 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "801303a673e02d2110a196d70e4a807f0ff0a68ce1060eebc1e6a0d598db65e8"

2
Cargo.toml
View file

@ -12,7 +12,7 @@ name = "parse_demo"
path = "src/bin/main.rs"
[dependencies]
bitstream_reader = "0.4"
bitstream_reader = { version = "0.4", path = "../../bitbuffer" }
enum-primitive-derive = "0.1.2"
num-traits = "0.2"
enumflags2 = "0.5"

46
src/demo/packet/datatable.rs
View file

@ -18,31 +18,18 @@ pub struct SendTable {
pub flattened_props: Option<Vec<SendPropDefinition>>,
}
#[derive(Debug)]
pub struct DataTablePacket {
pub tick: u32,
pub tables: Vec<SendTable>,
pub server_classes: Vec<ServerClass>,
}
impl Parse for DataTablePacket {
impl Parse for SendTable {
fn parse(stream: &mut Stream, _state: &ParserState) -> Result<Self> {
let tick = stream.read()?;
let len = stream.read_int::<usize>(32)?;
let mut packet_data = stream.read_bits(len * 8)?;
let mut tables = vec![];
while packet_data.read_bool()? {
let needs_decoder = packet_data.read()?;
let name: String = packet_data.read()?;
let prop_count = packet_data.read_int(10)?;
let needs_decoder = stream.read()?;
let name: String = stream.read()?;
let prop_count = stream.read_int(10)?;
let mut array_element_prop = None;
let mut props = Vec::with_capacity(prop_count);
for _ in 0..prop_count {
let prop: SendPropDefinition =
SendPropDefinition::read(&mut packet_data, name.clone())?;
SendPropDefinition::read(stream, name.clone())?;
if prop.flags.contains(SendPropFlag::InsideArray) {
if array_element_prop.is_some()
|| prop.flags.contains(SendPropFlag::ChangesOften)
@ -65,12 +52,31 @@ impl Parse for DataTablePacket {
}
}
let table = SendTable {
Ok(SendTable {
name,
flattened_props: None,
needs_decoder,
props,
};
})
}
}
#[derive(Debug)]
pub struct DataTablePacket {
pub tick: u32,
pub tables: Vec<SendTable>,
pub server_classes: Vec<ServerClass>,
}
impl Parse for DataTablePacket {
fn parse(stream: &mut Stream, state: &ParserState) -> Result<Self> {
let tick = stream.read()?;
let len = stream.read_int::<usize>(32)?;
let mut packet_data = stream.read_bits(len * 8)?;
let mut tables = Vec::new();
while packet_data.read_bool()? {
let table = SendTable::parse(&mut packet_data, state)?;
tables.push(table);
}

9
src/demo/parser/mod.rs
View file

@ -87,15 +87,10 @@ impl DemoParser {
}
}
#[inline(always)]
pub fn read<T: Parse>(&mut self) -> Result<T> {
T::parse(&mut self.stream, self.handler.get_parser_state())
}
pub fn parse_demo(mut self) -> Result<(Header, MatchState)> {
let header = self.read::<Header>()?;
let header = Header::read(&mut self.stream)?;
loop {
let packet = self.read::<Packet>()?;
let packet = Packet::parse(&mut self.stream, self.handler.get_parser_state())?;
match packet {
Packet::Stop(_) => break,
packet => self.handler.handle_packet(packet),