Break: improve the docs and rename type_ into packet_type

This commit is contained in:
eigenein committed 2023-05-08 20:53:48 +02:00
1 parent 0ac983832b
commit 181da1ae96
6 files changed
+36 -38

No files matched your search

-23
View File
@@ -36,26 +36,3 @@ fn main() -> Result<()> {
Ok(()) Ok(())
} }
``` ```
## Replay structure
`*.wotbreplay` is a ZIP-archive containing:
- `battle_results.dat`
- `meta.json`
- `data.wotreplay`
### `battle_results.dat`
This is a [pickled](https://docs.python.org/3/library/pickle.html) 2-tuple:
- Some big number
- Battle results serialized with [Protocol Buffers](https://developers.google.com/protocol-buffers)
#### Useful tools
- [Protobuf Decoder](https://protobuf-decoder.netlify.app/)
- [`protobuf-inspector`](https://github.com/mildsunrise/protobuf-inspector)
- [Hex Fiend](https://hexfiend.com/)
### `meta.json`
### `data.wotreplay`
+4 -1
View File
@@ -7,7 +7,10 @@ use crate::result::Result;
impl BattleResults { impl BattleResults {
/// Parse battle results from the buffer. /// Parse battle results from the buffer.
/// ///
/// Note, that this does NOT parse `battle_results.dat` itself, but the un-pickled tuple element. /// # Note
///
/// This does **not** parse `battle_results.dat` itself, but the un-pickled tuple element.
/// To parse `battle_results.dat`, use [`crate::models::battle_results_dat::BattleResultsDat`].
pub fn from_buffer(buffer: impl Buf) -> Result<Self> { pub fn from_buffer(buffer: impl Buf) -> Result<Self> {
Ok(Self::decode(buffer)?) Ok(Self::decode(buffer)?)
} }
+11 -7
View File
@@ -8,7 +8,14 @@ use crate::error::Error;
use crate::models::battle_results::BattleResults; use crate::models::battle_results::BattleResults;
use crate::result::Result; use crate::result::Result;
/// Represents un-pickled `battle_results.dat`. /// Un-pickled `battle_results.dat`.
///
/// # `battle_results.dat` structure
///
/// Entire file is a [pickled](https://docs.python.org/3/library/pickle.html) 2-tuple:
///
/// - Arena unique ID
/// - Battle results serialized with [Protocol Buffers](https://developers.google.com/protocol-buffers)
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]
#[serde(from = "(u64, ByteBuf)")] #[serde(from = "(u64, ByteBuf)")]
pub struct BattleResultsDat { pub struct BattleResultsDat {
@@ -20,15 +27,12 @@ pub struct BattleResultsDat {
impl From<(u64, ByteBuf)> for BattleResultsDat { impl From<(u64, ByteBuf)> for BattleResultsDat {
fn from((arena_unique_id, buffer): (u64, ByteBuf)) -> Self { fn from((arena_unique_id, buffer): (u64, ByteBuf)) -> Self {
Self { Self { arena_unique_id, buffer }
arena_unique_id,
buffer,
}
} }
} }
impl BattleResultsDat { impl BattleResultsDat {
/// Parses the pickled structure from the reader which contains `battle_results.dat`. /// Parse the pickled structure from the reader which contains `battle_results.dat`.
/// ///
/// It can be used either on the `battle_results.dat` for a replay archive, /// It can be used either on the `battle_results.dat` for a replay archive,
/// or directly on `**/DAVAProject/battle_results/*/*_full.dat`. /// or directly on `**/DAVAProject/battle_results/*/*_full.dat`.
@@ -40,7 +44,7 @@ impl BattleResultsDat {
impl TryInto<BattleResults> for BattleResultsDat { impl TryInto<BattleResults> for BattleResultsDat {
type Error = Error; type Error = Error;
/// Decodes the battle results from the internal buffer. /// Decode the battle results from the internal buffer.
fn try_into(self) -> Result<BattleResults> { fn try_into(self) -> Result<BattleResults> {
Ok(BattleResults::decode(self.buffer.as_ref())?) Ok(BattleResults::decode(self.buffer.as_ref())?)
} }
+2
View File
@@ -1,3 +1,5 @@
//! Structures for «entity method» call packets.
use byteorder::{LittleEndian, ReadBytesExt}; use byteorder::{LittleEndian, ReadBytesExt};
use prost::encoding::decode_varint; use prost::encoding::decode_varint;
use prost::Message; use prost::Message;
+6 -4
View File
@@ -9,6 +9,7 @@ use crate::models::data::entity_method::EntityMethod;
use crate::models::data::{read_pickled, read_quirky_length, read_string}; use crate::models::data::{read_pickled, read_quirky_length, read_string};
use crate::result::Result; use crate::result::Result;
/// Packet payload.
#[serde_as] #[serde_as]
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
pub enum Payload { pub enum Payload {
@@ -25,7 +26,7 @@ pub enum Payload {
/// Default payload when type is not known by the parser. /// Default payload when type is not known by the parser.
Unknown { Unknown {
type_: u32, packet_type: u32,
/// Whole packet payload. /// Whole packet payload.
#[serde_as(as = "serde_with::hex::Hex")] #[serde_as(as = "serde_with::hex::Hex")]
@@ -34,8 +35,9 @@ pub enum Payload {
} }
impl Payload { impl Payload {
pub fn new(type_: u32, payload: Vec<u8>) -> Result<Self> { /// Parse the packet payload.
let this = match type_ { pub fn new(packet_type: u32, payload: Vec<u8>) -> Result<Self> {
let this = match packet_type {
0 => { 0 => {
let mut reader = payload.as_slice(); let mut reader = payload.as_slice();
reader.read_exact(&mut [0; 10])?; reader.read_exact(&mut [0; 10])?;
@@ -57,7 +59,7 @@ impl Payload {
8 => Self::EntityMethod(EntityMethod::new(payload)?), 8 => Self::EntityMethod(EntityMethod::new(payload)?),
_ => Self::Unknown { raw: payload, type_ }, _ => Self::Unknown { raw: payload, packet_type },
}; };
Ok(this) Ok(this)
} }
+13 -3
View File
@@ -9,7 +9,15 @@ use crate::models::data::Data;
use crate::models::meta::Meta; use crate::models::meta::Meta;
use crate::result::Result; use crate::result::Result;
/// Opened (but not yet parsed) replay. /// World of Tanks Blitz replay.
///
/// # Replay structure
///
/// `*.wotbreplay` is a ZIP-archive containing:
///
/// - `battle_results.dat`
/// - `meta.json`
/// - `data.wotreplay`
pub struct Replay<R>(pub(crate) ZipArchive<R>); pub struct Replay<R>(pub(crate) ZipArchive<R>);
impl<R: Read + Seek> Replay<R> { impl<R: Read + Seek> Replay<R> {
@@ -18,22 +26,24 @@ impl<R: Read + Seek> Replay<R> {
Ok(Self(ZipArchive::new(reader)?)) Ok(Self(ZipArchive::new(reader)?))
} }
/// Reads and parses the battle results from the replay. /// Read and parse the full battle results structure from `battle_results.dat`.
pub fn read_battle_results(&mut self) -> Result<BattleResults> { pub fn read_battle_results(&mut self) -> Result<BattleResults> {
self.read_battle_results_dat()?.try_into() self.read_battle_results_dat()?.try_into()
} }
/// Reads and parses the included `battle_results.dat`. /// Read and parse the root 2-tuple from `battle_results.dat`.
pub fn read_battle_results_dat(&mut self) -> Result<BattleResultsDat> { pub fn read_battle_results_dat(&mut self) -> Result<BattleResultsDat> {
let pickled_battle_results = self.0.by_name("battle_results.dat")?; let pickled_battle_results = self.0.by_name("battle_results.dat")?;
BattleResultsDat::from_reader(pickled_battle_results) BattleResultsDat::from_reader(pickled_battle_results)
} }
/// Read and parse the included `meta.json`.
#[cfg(feature = "meta")] #[cfg(feature = "meta")]
pub fn read_meta(&mut self) -> Result<Meta> { pub fn read_meta(&mut self) -> Result<Meta> {
Meta::from_reader(self.0.by_name("meta.json")?) Meta::from_reader(self.0.by_name("meta.json")?)
} }
/// Read and parse the included `data.wotreplay`.
pub fn read_data(&mut self) -> Result<Data> { pub fn read_data(&mut self) -> Result<Data> {
Data::from_reader(self.0.by_name("data.wotreplay")?) Data::from_reader(self.0.by_name("data.wotreplay")?)
} }