From a48380106d19624641f63b0fca70a41cd35fe811 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Fri, 25 Oct 2019 02:01:17 -0400
Subject: use TryFrom instead

---
 src/error.rs  |  6 ++++++
 src/ttyrec.rs | 27 +++++++++++++++++++--------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/error.rs b/src/error.rs
index 662f860..ee160ce 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -98,6 +98,12 @@ pub enum Error {
     #[snafu(display("failed to write to stdout: {}", source))]
     FlushTerminalSync { source: std::io::Error },
 
+    #[snafu(display("failed to create ttyrec frame: got {} bytes of data, but ttyrec frames can be at most {} bytes", input, u32::max_value()))]
+    FrameTooBig { input: usize },
+
+    #[snafu(display("failed to create ttyrec frame: got {} seconds, but ttyrecs can be at most {} seconds", input, u32::max_value()))]
+    FrameTooLong { input: u64 },
+
     #[snafu(display(
         "failed to get recurse center profile data: {}",
         source
diff --git a/src/ttyrec.rs b/src/ttyrec.rs
index c6f627e..2312181 100644
--- a/src/ttyrec.rs
+++ b/src/ttyrec.rs
@@ -7,17 +7,27 @@ pub struct Frame {
     pub data: Vec<u8>,
 }
 
-impl Frame {
-    fn as_bytes(&self) -> Vec<u8> {
-        let secs = u32::try_from(self.time.as_secs()).unwrap();
-        let micros = self.time.subsec_micros();
-        let len = u32::try_from(self.data.len()).unwrap();
+impl std::convert::TryFrom<Frame> for Vec<u8> {
+    type Error = Error;
+
+    fn try_from(frame: Frame) -> Result<Self> {
+        let secs = u32::try_from(frame.time.as_secs()).map_err(|_| {
+            Error::FrameTooLong {
+                input: frame.time.as_secs(),
+            }
+        })?;
+        let micros = frame.time.subsec_micros();
+        let len = u32::try_from(frame.data.len()).map_err(|_| {
+            Error::FrameTooBig {
+                input: frame.data.len(),
+            }
+        })?;
         let mut bytes = vec![];
         bytes.extend(secs.to_le_bytes().iter());
         bytes.extend(micros.to_le_bytes().iter());
         bytes.extend(len.to_le_bytes().iter());
-        bytes.extend(self.data.iter());
-        bytes
+        bytes.extend(frame.data.iter());
+        Ok(bytes)
     }
 }
 
@@ -76,7 +86,8 @@ impl File {
             if self.writing.is_empty() {
                 match self.rframe.poll().context(crate::error::ReadChannel)? {
                     futures::Async::Ready(Some(frame)) => {
-                        self.writing.extend(frame.as_bytes().iter());
+                        self.writing
+                            .extend(Vec::<u8>::try_from(frame)?.iter());
                         self.waiting -= 1;
                     }
                     futures::Async::Ready(None) => unreachable!(),
-- 
cgit v1.2.3-54-g00ecf