matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Merge pull request #1403 from matthiasbeyer/remove-pipe-magic

Browse source 
Revert "Implement pipe magic in libimagrt"
This commit is contained in:
Matthias Beyer 2018-04-17 17:39:54 +02:00 committed by GitHub
commit 88b57910df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/core/libimagrt/src/runtime.rs
View file

@ -52,7 +52,6 @@ pub struct Runtime<'a> {
configuration: Option<Value>, configuration: Option<Value>,
cli_matches: ArgMatches<'a>, cli_matches: ArgMatches<'a>,
store: Store, store: Store,
use_pipe_magic: bool,
stdin_is_tty: bool, stdin_is_tty: bool,
stdout_is_tty: bool, stdout_is_tty: bool,
} }
@ -139,15 +138,12 @@ impl<'a> Runtime<'a> {
Store::new(storepath, &config) Store::new(storepath, &config)
}; };
let pipe_magic = matches.is_present(Runtime::pipe_magic_name());
store_result.map(|store| { store_result.map(|store| {
Runtime { Runtime {
cli_matches: matches, cli_matches: matches,
configuration: config, configuration: config,
rtp: rtp, rtp: rtp,
store: store, store: store,
use_pipe_magic: pipe_magic,
stdout_is_tty: ::atty::is(::atty::Stream::Stdout), stdout_is_tty: ::atty::is(::atty::Stream::Stdout),
stdin_is_tty: ::atty::is(::atty::Stream::Stdin), stdin_is_tty: ::atty::is(::atty::Stream::Stdin),
} }
@ -237,13 +233,6 @@ impl<'a> Runtime<'a> {
.takes_value(true) .takes_value(true)
.value_name("LOGDESTS")) .value_name("LOGDESTS"))
.arg(Arg::with_name(Runtime::pipe_magic_name())
.long(Runtime::pipe_magic_name())
.short("P")
.help("Use pipe-detection. With this flag, imag expects a JSON store on STDIN if stdin is not a TTY and prints the store to STDOUT if it is not a TTY.")
.required(false)
.takes_value(false))
} }
/// Get the argument names of the Runtime which are available /// Get the argument names of the Runtime which are available
@ -328,11 +317,6 @@ impl<'a> Runtime<'a> {
"logging-destinations" "logging-destinations"
} }
/// Get the argument name for pipe magic
pub fn pipe_magic_name() -> &'static str {
"pipe-magic"
}
/// Initialize the internal logger /// Initialize the internal logger
fn init_logger(matches: &ArgMatches, config: Option<&Value>) { fn init_logger(matches: &ArgMatches, config: Option<&Value>) {
use log::set_max_level; use log::set_max_level;
@ -461,10 +445,10 @@ impl<'a> Runtime<'a> {
} }
pub fn stdout(&self) -> OutputProxy { pub fn stdout(&self) -> OutputProxy {
if self.use_pipe_magic && !self.stdout_is_tty { if self.stdout_is_tty {
OutputProxy::Err(::std::io::stderr())
} else {
OutputProxy::Out(::std::io::stdout()) OutputProxy::Out(::std::io::stdout())
} else {
OutputProxy::Err(::std::io::stderr())
} }
} }
@ -473,10 +457,10 @@ impl<'a> Runtime<'a> {
} }
pub fn stdin(&self) -> Option<Stdin> { pub fn stdin(&self) -> Option<Stdin> {
if self.use_pipe_magic && !self.stdin_is_tty { if self.stdin_is_tty {
None
} else {
Some(::std::io::stdin()) Some(::std::io::stdin())
} else {
None
} }
} }