mirror of
https://github.com/asciinema/asciinema.git
synced 2025-12-16 19:58:03 +01:00
Refactor ALiS event serialization
This commit is contained in:
50
src/alis.rs
50
src/alis.rs
@@ -15,24 +15,21 @@ use crate::stream::Event;
|
||||
|
||||
static MAGIC_STRING: &str = "ALiS\x01";
|
||||
|
||||
struct EventSerializer(u64);
|
||||
|
||||
pub async fn stream<S: Stream<Item = Result<Event, BroadcastStreamRecvError>>>(
|
||||
stream: S,
|
||||
) -> Result<impl Stream<Item = Result<Vec<u8>, BroadcastStreamRecvError>>> {
|
||||
let header = stream::once(future::ready(Ok(MAGIC_STRING.into())));
|
||||
let mut serializer = EventSerializer(0);
|
||||
|
||||
let events = stream.scan(0u64, |prev_event_time, event| {
|
||||
future::ready(Some(event.map(|event| {
|
||||
let (bytes, time) = serialize_event(event, *prev_event_time);
|
||||
*prev_event_time = time;
|
||||
|
||||
bytes
|
||||
})))
|
||||
});
|
||||
let events = stream.map(move |event| event.map(|event| serializer.serialize_event(event)));
|
||||
|
||||
Ok(header.chain(events))
|
||||
}
|
||||
|
||||
fn serialize_event(event: Event, prev_event_time: u64) -> (Vec<u8>, u64) {
|
||||
impl EventSerializer {
|
||||
fn serialize_event(&mut self, event: Event) -> Vec<u8> {
|
||||
use Event::*;
|
||||
|
||||
match event {
|
||||
@@ -75,12 +72,14 @@ fn serialize_event(event: Event, prev_event_time: u64) -> (Vec<u8>, u64) {
|
||||
msg.extend_from_slice(&init_len_bytes);
|
||||
msg.extend_from_slice(init.as_bytes());
|
||||
|
||||
(msg, time)
|
||||
self.0 = time;
|
||||
|
||||
msg
|
||||
}
|
||||
|
||||
Output(id, time, text) => {
|
||||
let id_bytes = leb128::encode(id);
|
||||
let time_bytes = leb128::encode(time - prev_event_time);
|
||||
let time_bytes = leb128::encode(time - self.0);
|
||||
let text_len = text.len() as u32;
|
||||
let text_len_bytes = leb128::encode(text_len);
|
||||
|
||||
@@ -90,12 +89,14 @@ fn serialize_event(event: Event, prev_event_time: u64) -> (Vec<u8>, u64) {
|
||||
msg.extend_from_slice(&text_len_bytes);
|
||||
msg.extend_from_slice(text.as_bytes());
|
||||
|
||||
(msg, time)
|
||||
self.0 = time;
|
||||
|
||||
msg
|
||||
}
|
||||
|
||||
Input(id, time, text) => {
|
||||
let id_bytes = leb128::encode(id);
|
||||
let time_bytes = leb128::encode(time - prev_event_time);
|
||||
let time_bytes = leb128::encode(time - self.0);
|
||||
let text_len = text.len() as u32;
|
||||
let text_len_bytes = leb128::encode(text_len);
|
||||
|
||||
@@ -105,12 +106,14 @@ fn serialize_event(event: Event, prev_event_time: u64) -> (Vec<u8>, u64) {
|
||||
msg.extend_from_slice(&text_len_bytes);
|
||||
msg.extend_from_slice(text.as_bytes());
|
||||
|
||||
(msg, time)
|
||||
self.0 = time;
|
||||
|
||||
msg
|
||||
}
|
||||
|
||||
Resize(id, time, size) => {
|
||||
let id_bytes = leb128::encode(id);
|
||||
let time_bytes = leb128::encode(time - prev_event_time);
|
||||
let time_bytes = leb128::encode(time - self.0);
|
||||
let cols_bytes = leb128::encode(size.0);
|
||||
let rows_bytes = leb128::encode(size.1);
|
||||
|
||||
@@ -120,12 +123,14 @@ fn serialize_event(event: Event, prev_event_time: u64) -> (Vec<u8>, u64) {
|
||||
msg.extend_from_slice(&cols_bytes);
|
||||
msg.extend_from_slice(&rows_bytes);
|
||||
|
||||
(msg, time)
|
||||
self.0 = time;
|
||||
|
||||
msg
|
||||
}
|
||||
|
||||
Marker(id, time, text) => {
|
||||
let id_bytes = leb128::encode(id);
|
||||
let time_bytes = leb128::encode(time - prev_event_time);
|
||||
let time_bytes = leb128::encode(time - self.0);
|
||||
let text_len = text.len() as u32;
|
||||
let text_len_bytes = leb128::encode(text_len);
|
||||
|
||||
@@ -135,12 +140,14 @@ fn serialize_event(event: Event, prev_event_time: u64) -> (Vec<u8>, u64) {
|
||||
msg.extend_from_slice(&text_len_bytes);
|
||||
msg.extend_from_slice(text.as_bytes());
|
||||
|
||||
(msg, time)
|
||||
self.0 = time;
|
||||
|
||||
msg
|
||||
}
|
||||
|
||||
Exit(id, time, status) => {
|
||||
let id_bytes = leb128::encode(id);
|
||||
let time_bytes = leb128::encode(time - prev_event_time);
|
||||
let time_bytes = leb128::encode(time - self.0);
|
||||
let status_bytes = leb128::encode(status.max(0) as u64);
|
||||
|
||||
let mut msg = vec![b'x'];
|
||||
@@ -148,7 +155,10 @@ fn serialize_event(event: Event, prev_event_time: u64) -> (Vec<u8>, u64) {
|
||||
msg.extend_from_slice(&time_bytes);
|
||||
msg.extend_from_slice(&status_bytes);
|
||||
|
||||
(msg, time)
|
||||
self.0 = time;
|
||||
|
||||
msg
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user