mirror of
https://github.com/nushell/nushell.git
synced 2025-05-12 05:54:27 +02:00
de08b68ba8
# Description Fixes #13991. This was done by more clearly separating the case when a pipeline is drained vs when it is being written (to a file). I also added an `OutDest::Print` case which might not be strictly necessary, but is a helpful addition. # User-Facing Changes Bug fix. # Tests + Formatting Added a test. # After Submitting There are still a few redirection bugs that I found, but they require larger code changes, so I'll leave them until after the release.
66 lines
2.6 KiB
Rust
66 lines
2.6 KiB
Rust
use std::{fs::File, io, process::Stdio, sync::Arc};
|
|
|
|
/// Describes where to direct the stdout or stderr output stream of external command to.
|
|
#[derive(Debug, Clone)]
|
|
pub enum OutDest {
|
|
/// Redirect the stdout and/or stderr of one command as the input for the next command in the pipeline.
|
|
///
|
|
/// The output pipe will be available as the `stdout` of [`ChildProcess`](crate::process::ChildProcess).
|
|
///
|
|
/// If stdout and stderr are both set to `Pipe`,
|
|
/// then they will combined into the `stdout` of [`ChildProcess`](crate::process::ChildProcess).
|
|
Pipe,
|
|
/// Redirect the stdout and/or stderr of one command as the input for the next command in the pipeline.
|
|
///
|
|
/// The output stream(s) will be available in the `stdout` or `stderr` of [`ChildProcess`](crate::process::ChildProcess).
|
|
///
|
|
/// This is similar to `Pipe` but will never combine stdout and stderr
|
|
/// or place an external command's stderr into `stdout` of [`ChildProcess`](crate::process::ChildProcess).
|
|
PipeSeparate,
|
|
/// Signifies the result of the pipeline will be immediately collected into a value after this command.
|
|
///
|
|
/// So, it is fine to collect the stream ahead of time in the current command.
|
|
Value,
|
|
/// Ignore output.
|
|
///
|
|
/// This will forward output to the null device for the platform.
|
|
Null,
|
|
/// Output to nushell's stdout or stderr (only for external commands).
|
|
///
|
|
/// This causes external commands to inherit nushell's stdout or stderr. This also causes
|
|
/// [`ListStream`](crate::ListStream)s to be drained, but not to be printed.
|
|
Inherit,
|
|
/// Print to nushell's stdout or stderr.
|
|
///
|
|
/// This is just like `Inherit`, except that [`ListStream`](crate::ListStream)s and
|
|
/// [`Value`](crate::Value)s are also printed.
|
|
Print,
|
|
/// Redirect output to a file.
|
|
File(Arc<File>), // Arc<File>, since we sometimes need to clone `OutDest` into iterators, etc.
|
|
}
|
|
|
|
impl From<File> for OutDest {
|
|
fn from(file: File) -> Self {
|
|
Arc::new(file).into()
|
|
}
|
|
}
|
|
|
|
impl From<Arc<File>> for OutDest {
|
|
fn from(file: Arc<File>) -> Self {
|
|
Self::File(file)
|
|
}
|
|
}
|
|
|
|
impl TryFrom<&OutDest> for Stdio {
|
|
type Error = io::Error;
|
|
|
|
fn try_from(out_dest: &OutDest) -> Result<Self, Self::Error> {
|
|
match out_dest {
|
|
OutDest::Pipe | OutDest::PipeSeparate | OutDest::Value => Ok(Self::piped()),
|
|
OutDest::Null => Ok(Self::null()),
|
|
OutDest::Print | OutDest::Inherit => Ok(Self::inherit()),
|
|
OutDest::File(file) => Ok(file.try_clone()?.into()),
|
|
}
|
|
}
|
|
}
|