fix truncated demos during reencode

src/bin/reencode.rs

@@ -3,13 +3,14 @@
 use std::env;
 use std::fs;
 
-use bitbuffer::{BitRead, BitWrite, BitWriteStream, LittleEndian};
+use bitbuffer::{BitError, BitRead, BitWrite, BitWriteStream, LittleEndian};
 use main_error::MainError;
 use tf_demo_parser::demo::header::Header;
-use tf_demo_parser::demo::message::Message;
+use tf_demo_parser::demo::message::{setconvar::SetConVarMessage, Message, NetTickMessage};
+use tf_demo_parser::demo::packet::stop::StopPacket;
 use tf_demo_parser::demo::packet::{Packet, PacketType};
 use tf_demo_parser::demo::parser::{DemoHandler, Encode, RawPacketStream};
-use tf_demo_parser::Demo;
+use tf_demo_parser::{Demo, ParseError};
 
 const COPY_TYPES: &[PacketType] = &[
     // PacketType::Sigon,
@@ -22,6 +23,8 @@ const COPY_TYPES: &[PacketType] = &[
 ];
 
 fn main() -> Result<(), MainError> {
+    tracing_subscriber::fmt::init();
+
     #[cfg(feature = "better_panic")]
     better_panic::install();
 
@@ -33,6 +36,7 @@ fn main() -> Result<(), MainError> {
     let path = args[1].clone();
     let out_path = args[2].clone();
     let file = fs::read(path)?;
+    let strip_pov = true;
 
     let mut out_buffer = Vec::with_capacity(file.len());
     {
@@ -40,22 +44,32 @@ fn main() -> Result<(), MainError> {
 
         let demo = Demo::new(&file);
         let mut stream = demo.get_stream();
-        let header = Header::read(&mut stream)?;
+        let mut header = Header::read(&mut stream)?;
+        let mut packets = RawPacketStream::new(stream.clone());
+
+        // demos that are closed unexpectedly have no length set
+        if header.ticks == 0 {
+            header_fixup(&mut header, packets.clone())?;
+        }
         header.write(&mut out_stream)?;
 
-        let mut packets = RawPacketStream::new(stream.clone());
         let mut handler = DemoHandler::default();
 
         let mut packet_start = packets.pos();
+        let mut has_stop = false;
+        let mut last_tick = 0;
 
         while let Some(mut packet) = packets.next(&handler.state_handler)? {
             let packet_end = packets.pos();
+            last_tick = packet.tick();
             let packet_bits = stream.read_bits(packet_end - packet_start)?;
             if COPY_TYPES.contains(&packet.packet_type()) {
                 packet_bits.write(&mut out_stream)?;
             } else {
                 match &mut packet {
-                    Packet::Sigon(message_packet) | Packet::Message(message_packet) => {
+                    Packet::Sigon(message_packet) | Packet::Message(message_packet)
+                        if strip_pov =>
+                    {
                         message_packet.meta.view_angles = Default::default();
                         message_packet.messages.iter_mut().for_each(|msg| {
                             if let Message::ServerInfo(info) = msg {
@@ -63,6 +77,9 @@ fn main() -> Result<(), MainError> {
                             }
                         });
                     }
+                    Packet::Stop(_) => {
+                        has_stop = true;
+                    }
                     _ => {}
                 }
 
@@ -75,10 +92,46 @@ fn main() -> Result<(), MainError> {
             handler.handle_packet(packet).unwrap();
             packet_start = packet_end;
         }
-        assert_eq!(false, packets.incomplete);
+
+        if packets.incomplete {
+            eprintln!("Warning: truncated demo");
+        }
+
+        if !has_stop {
+            Packet::Stop(StopPacket { tick: last_tick })
+                .encode(&mut out_stream, &handler.state_handler)
+                .unwrap();
+        }
     }
 
     fs::write(out_path, out_buffer)?;
 
     Ok(())
 }
+
+fn header_fixup(header: &mut Header, mut packets: RawPacketStream) -> Result<(), MainError> {
+    let mut ticks = 0;
+    let mut handler = DemoHandler::default();
+    let mut tickrate = 66;
+
+    while let Some(packet) = packets.next(&handler.state_handler)? {
+        ticks = packet.tick();
+
+        if let Packet::Sigon(message_packet) = &packet {
+            for message in &message_packet.messages {
+                if let Message::SetConVar(SetConVarMessage { vars, .. }) = message {
+                    for cvar in vars {
+                        if cvar.key == "sv_minupdaterate" {
+                            tickrate = cvar.value.parse().expect("invalid sv_minupdaterate");
+                        }
+                    }
+                }
+            }
+        }
+        handler.handle_packet(packet).unwrap();
+    }
+
+    header.ticks = ticks;
+    header.duration = ticks as f32 / tickrate as f32;
+    Ok(())
+}

src/demo/message/setconvar.rs

@@ -6,8 +6,8 @@ use crate::ReadResult;
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[derive(Debug, BitWrite, PartialEq, Serialize, Deserialize, Clone)]
 pub struct ConVar {
-    key: String,
+    pub key: String,
-    value: String,
+    pub value: String,
 }
 
 impl<E: Endianness> BitRead<'_, E> for ConVar {
@@ -25,9 +25,9 @@ impl<E: Endianness> BitRead<'_, E> for ConVar {
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[derive(Debug, BitRead, PartialEq, Serialize, Deserialize, Clone)]
 pub struct SetConVarMessage {
-    length: u8,
+    pub length: u8,
     #[size = "length"]
-    vars: Vec<ConVar>,
+    pub vars: Vec<ConVar>,
 }
 
 impl<E: Endianness> BitWrite<E> for SetConVarMessage {

src/demo/parser/mod.rs

@@ -136,7 +136,7 @@ impl<'a> RawPacketStream<'a> {
                     Ok(Some(packet))
                 }
                 Ok(packet) => Ok(Some(packet)),
-                Err(ParseError::ReadError(BitError::NotEnoughData { .. })) if false => {
+                Err(ParseError::ReadError(BitError::NotEnoughData { .. })) => {
                     self.ended = true;
                     self.incomplete = true;
                     Ok(None)