leon/csdemo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix formatting and minor restructuring

Browse Source 
Fixed formatting using cargo fmt.
Change some parser structure to reduce code deduplication
This commit is contained in:
Lol3rrr
2024-09-22 20:31:38 +02:00
parent c1e85d77dc
commit 67d33f64c0
6 changed files with 53 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/ancient-entity.rs
View File

@@ -3,7 +3,11 @@ const DATA: &[u8] = include_bytes!("../testfiles/de_ancient.dem");
fn main() {
let container = csdemo::Container::parse(DATA).unwrap();
let output = csdemo::parser::parse(csdemo::FrameIterator::parse(container.inner), csdemo::parser::EntityFilter::all()).unwrap();
let output = csdemo::parser::parse(
csdemo::FrameIterator::parse(container.inner),
csdemo::parser::EntityFilter::all(),
)
.unwrap();
println!("Header: {:?}", output.header);
println!("Players: {:?}", output.player_info);

6
examples/ancient-noentity.rs
View File

@@ -3,7 +3,11 @@ const DATA: &[u8] = include_bytes!("../testfiles/de_ancient.dem");
fn main() {
let container = csdemo::Container::parse(DATA).unwrap();
let output = csdemo::parser::parse(csdemo::FrameIterator::parse(container.inner), csdemo::parser::EntityFilter::disabled()).unwrap();
let output = csdemo::parser::parse(
csdemo::FrameIterator::parse(container.inner),
csdemo::parser::EntityFilter::disabled(),
)
.unwrap();
println!("Header: {:?}", output.header);
println!("Players: {:?}", output.player_info);

9
src/frame.rs
View File

@@ -39,7 +39,10 @@ impl<'b> Frame<'b> {
Some(self.inner.as_ref())
}
pub fn decompress_with_buf<'s, 'buf>(&'s self, buf: &'b mut Vec<u8>) -> Result<&'buf [u8], ()> where 's: 'buf {
pub fn decompress_with_buf<'s, 'buf>(&'s self, buf: &'b mut Vec<u8>) -> Result<&'buf [u8], ()>
where
's: 'buf,
{
if !self.compressed {
return Ok(&self.inner);
}
@@ -50,7 +53,9 @@ impl<'b> Frame<'b> {
})?;
buf.resize(uncompressed_len, 0);
snap::raw::Decoder::new().decompress(&self.inner, buf.as_mut_slice()).map_err(|e| {
snap::raw::Decoder::new()
.decompress(&self.inner, buf.as_mut_slice())
.map_err(|e| {
println!("Decompressing");
()
})?;

81
src/parser.rs
View File

@@ -109,7 +109,9 @@ where
let mut buffer = Vec::new();
for frame in frames.into_iter() {
let data = frame.decompress_with_buf(&mut buffer).map_err(|e| FirstPassError::DecompressFrame)?;
let data = frame
.decompress_with_buf(&mut buffer)
.map_err(|e| FirstPassError::DecompressFrame)?;
match frame.cmd {
DemoCommand::FileHeader => {
@@ -121,8 +123,10 @@ where
file_info = Some(raw);
}
DemoCommand::SignonPacket | DemoCommand::Packet => {
parse_packet(
data,
let raw: crate::csgo_proto::CDemoPacket = prost::Message::decode(data)?;
inner_parse_packet(
&raw,
&mut events,
&mut event_mapping,
&mut player_info,
@@ -135,8 +139,11 @@ where
)?;
}
DemoCommand::FullPacket => {
parse_fullpacket(
data,
let packet = parse_fullpacket(data)?;
if let Some(packet) = packet {
inner_parse_packet(
&packet,
&mut events,
&mut event_mapping,
&mut player_info,
@@ -148,6 +155,7 @@ where
&mut entity_states,
)?;
}
}
// TODO
DemoCommand::AnimationData => {}
DemoCommand::AnimationHeader => {}
@@ -222,18 +230,7 @@ where
})
}
fn parse_fullpacket(
data: &[u8],
events: &mut Vec<DemoEvent>,
event_mapper: &mut GameEventMapping,
player_info: &mut std::collections::HashMap<UserId, Player>,
entity_ctx: &mut entities::EntityContext,
paths: &mut Paths,
qf_mapper: &mut decoder::QfMapper,
baselines: &mut std::collections::HashMap<u32, Vec<u8>>,
prop_controller: &propcontroller::PropController,
entity_states: &mut Vec<entities::EntityState>,
) -> Result<(), FirstPassError> {
fn parse_fullpacket(data: &[u8]) -> Result<Option<crate::csgo_proto::CDemoPacket>, FirstPassError> {
let raw: crate::csgo_proto::CDemoFullPacket = prost::Message::decode(data)?;
// TODO
@@ -242,55 +239,7 @@ fn parse_fullpacket(
// dbg!(&item.table_name);
}
match raw.packet {
Some(packet) => {
inner_parse_packet(
&packet,
events,
event_mapper,
player_info,
entity_ctx,
paths,
qf_mapper,
baselines,
prop_controller,
entity_states,
)?;
Ok(())
}
None => Ok(()),
}
}
fn parse_packet(
data: &[u8],
events: &mut Vec<DemoEvent>,
event_mapper: &mut GameEventMapping,
player_info: &mut std::collections::HashMap<UserId, Player>,
entity_ctx: &mut entities::EntityContext,
paths: &mut Paths,
qf_mapper: &mut decoder::QfMapper,
baselines: &mut std::collections::HashMap<u32, Vec<u8>>,
prop_controller: &propcontroller::PropController,
entity_states: &mut Vec<entities::EntityState>,
) -> Result<(), FirstPassError> {
let raw: crate::csgo_proto::CDemoPacket = prost::Message::decode(data)?;
inner_parse_packet(
&raw,
events,
event_mapper,
player_info,
entity_ctx,
paths,
qf_mapper,
baselines,
prop_controller,
entity_states,
)?;
Ok(())
Ok(raw.packet)
}
fn inner_parse_packet(

4
src/parser/entities.rs
View File

@@ -83,9 +83,7 @@ impl EntityContext {
let result = decoder.decode(bitreader, qf_mapper)?;
if let Some(fi) = field_info {
if let Some(prop_info) = prop_controller
.prop_infos.get(&fi.prop_id)
{
if let Some(prop_info) = prop_controller.prop_infos.get(&fi.prop_id) {
fields.push(EntityProp {
field_info: fi,
prop_info: prop_info.clone(),

7
src/parser/propcontroller.rs
View File

@@ -271,10 +271,13 @@ impl PropController {
}
fn insert_propinfo(&mut self, prop_name: &str, f: &mut ValueField) {
self.prop_infos.insert(f.prop_id, PropInfo {
self.prop_infos.insert(
f.prop_id,
PropInfo {
id: f.prop_id as u32,
prop_name: prop_name.into(),
});
},
);
}
pub fn set_special_ids(&mut self, weap_prop: &str, is_grenade_or_weapon: bool, id: u32) {