Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions crates/tui-test/src/record.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ pub(crate) fn sidecar_path(target: &std::path::Path) -> PathBuf {
#[cfg(test)]
mod tests {
use super::*;
use std::sync::atomic::{AtomicU64, Ordering};

#[test]
fn flush_acknowledges_all_prior_capture_messages() {
Expand All @@ -203,4 +204,68 @@ mod tests {
drop(recorder);
std::fs::remove_file(path).unwrap();
}

#[test]
fn stopped_recording_finishes_pending_decoder_bytes() {
let primary = temp_path("primary");
let target = temp_path("selected");
let recorder = Recorder::create(
primary.clone(),
80,
30,
&[],
Arc::new(crate::logger::Logger::disabled()),
);
recorder
.start(StartRecording {
target_path: target.clone(),
capture_path: target.clone(),
format: RecordingFormat::Cast,
cols: 80,
rows: 30,
env: Vec::new(),
initial_output: String::new(),
#[cfg(feature = "recording-raster")]
timeline: frames::TimelineOptions::default(),
})
.unwrap();
recorder.capture().on_data(b"tail\x1b[?");
recorder.stop().unwrap();

let cast = std::fs::read_to_string(&target).unwrap();
assert!(cast.contains("tail"));
assert!(cast.contains(r#"\u001b[?"#));

drop(recorder);
std::fs::remove_file(primary).unwrap();
std::fs::remove_file(target).unwrap();
}

#[test]
fn shutdown_finishes_pending_primary_decoder_bytes() {
let path = temp_path("shutdown");
let recorder = Recorder::create(
path.clone(),
80,
30,
&[],
Arc::new(crate::logger::Logger::disabled()),
);
recorder.capture().on_data(b"tail\x1b[?");
drop(recorder);

let cast = std::fs::read_to_string(&path).unwrap();
assert!(cast.contains("tail"));
assert!(cast.contains(r#"\u001b[?"#));
std::fs::remove_file(path).unwrap();
}

fn temp_path(label: &str) -> PathBuf {
static SEQUENCE: AtomicU64 = AtomicU64::new(0);
std::env::temp_dir().join(format!(
"tui-test-recorder-{label}-{}-{}.cast",
std::process::id(),
SEQUENCE.fetch_add(1, Ordering::Relaxed)
))
}
}
1 change: 0 additions & 1 deletion crates/tui-test/src/record/cast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ impl IncrementalDecoder {
output
}

#[allow(dead_code)] // The capture worker finalizes independent decoders in a later stack layer.
pub fn finish(&mut self) -> String {
self.utf8_pending.append(&mut self.filter_pending);
let output = String::from_utf8_lossy(&self.utf8_pending).into_owned();
Expand Down
47 changes: 38 additions & 9 deletions crates/tui-test/src/record/worker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ use super::{cast, CaptureError, Message, StartRecording, StoppedRecording};

struct ActiveRecording {
writer: cast::CastWriter,
decoder: cast::IncrementalDecoder,
request: StartRecording,
started: Instant,
last_at: Instant,
error: Option<String>,
}

Expand All @@ -15,24 +17,30 @@ pub(super) fn worker_loop(
mut primary: Option<cast::CastWriter>,
logger: Arc<crate::logger::Logger>,
) {
let mut decoder = cast::IncrementalDecoder::default();
let mut primary_decoder = cast::IncrementalDecoder::default();
let mut primary_last_at = Instant::now();
let mut active: Option<ActiveRecording> = None;

while let Ok(message) = receiver.recv() {
match message {
Message::Data { at, bytes } => {
let text = decoder.push(&bytes);
if text.is_empty() {
continue;
}
if let Some(writer) = primary.as_mut() {
if let Err(error) = writer.write_output(at, &text) {
logger.event(&format!("automatic recording failed: {error}"));
primary = None;
primary_last_at = at;
let text = primary_decoder.push(&bytes);
if !text.is_empty() {
if let Some(writer) = primary.as_mut() {
if let Err(error) = writer.write_output(at, &text) {
logger.event(&format!("automatic recording failed: {error}"));
primary = None;
}
}
}
if let Some(recording) = active.as_mut().filter(|recording| at >= recording.started)
{
recording.last_at = at;
let text = recording.decoder.push(&bytes);
if text.is_empty() {
continue;
}
let result = recording.writer.write_output(at, &text);
remember_error(recording, result);
}
Expand Down Expand Up @@ -75,8 +83,10 @@ pub(super) fn worker_loop(
}
active = Some(ActiveRecording {
writer,
decoder: primary_decoder.clone(),
request,
started: at,
last_at: at,
error: None,
});
let _ = reply.send(Ok(()));
Expand All @@ -86,6 +96,11 @@ pub(super) fn worker_loop(
let _ = reply.send(Err(CaptureError::NotActive));
continue;
};
let tail = recording.decoder.finish();
if !tail.is_empty() {
let result = recording.writer.write_output(recording.last_at, &tail);
remember_error(&mut recording, result);
}
if recording.error.is_none() {
if let Err(error) = recording.writer.flush() {
recording.error = Some(error.to_string());
Expand Down Expand Up @@ -125,10 +140,24 @@ pub(super) fn worker_loop(
let _ = reply.send(result);
}
Message::Shutdown => {
let tail = primary_decoder.finish();
if !tail.is_empty() {
if let Some(writer) = primary.as_mut() {
if let Err(error) = writer.write_output(primary_last_at, &tail) {
logger.event(&format!("automatic recording failed: {error}"));
primary = None;
}
}
}
if let Some(writer) = primary.as_mut() {
let _ = writer.flush();
}
if let Some(recording) = active.as_mut() {
let tail = recording.decoder.finish();
if !tail.is_empty() {
let result = recording.writer.write_output(recording.last_at, &tail);
remember_error(recording, result);
}
let _ = recording.writer.flush();
}
break;
Expand Down
Loading