Fix pipe backend

* Move all code that can fail to `start` where errors can be returned to prevent a panic!
* Replace unwrap
This commit is contained in:
JasonLG1979 2021-06-18 00:32:04 -05:00
parent b0a94f901d
commit 0bece0d867

View file

@ -6,31 +6,57 @@ use std::fs::OpenOptions;
use std::io::{self, Write}; use std::io::{self, Write};
pub struct StdoutSink { pub struct StdoutSink {
output: Box<dyn Write>, output: Option<Box<dyn Write>>,
path: Option<String>,
format: AudioFormat, format: AudioFormat,
} }
impl Open for StdoutSink { impl Open for StdoutSink {
fn open(path: Option<String>, format: AudioFormat) -> Self { fn open(path: Option<String>, format: AudioFormat) -> Self {
info!("Using pipe sink with format: {:?}", format); info!("Using pipe sink with format: {:?}", format);
Self {
let output: Box<dyn Write> = match path { output: None,
Some(path) => Box::new(OpenOptions::new().write(true).open(path).unwrap()), path: path,
_ => Box::new(io::stdout()), format,
}; }
Self { output, format }
} }
} }
impl Sink for StdoutSink { impl Sink for StdoutSink {
fn start(&mut self) -> io::Result<()> {
if self.output.is_none() {
let output: Box<dyn Write> = match self.path.as_deref() {
Some(path) => {
let open_op = OpenOptions::new()
.write(true)
.open(path)
.map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
Box::new(open_op)
}
None => Box::new(io::stdout()),
};
self.output = Some(output);
}
Ok(())
}
sink_as_bytes!(); sink_as_bytes!();
} }
impl SinkAsBytes for StdoutSink { impl SinkAsBytes for StdoutSink {
fn write_bytes(&mut self, data: &[u8]) -> io::Result<()> { fn write_bytes(&mut self, data: &[u8]) -> io::Result<()> {
self.output.write_all(data)?; match self.output.as_deref_mut() {
self.output.flush()?; Some(output) => {
output.write_all(data)?;
output.flush()?;
}
None => {
return Err(io::Error::new(io::ErrorKind::Other, "Output is None"));
}
}
Ok(()) Ok(())
} }
} }