2023-01-20 21:20:38 +00:00
|
|
|
mod command;
|
2022-01-18 08:48:28 +00:00
|
|
|
mod config_files;
|
|
|
|
mod logger;
|
2023-02-05 21:20:35 +00:00
|
|
|
mod run;
|
2023-01-20 18:44:49 +00:00
|
|
|
mod signals;
|
2023-01-20 21:20:38 +00:00
|
|
|
mod terminal;
|
2022-02-09 22:08:16 +00:00
|
|
|
mod test_bins;
|
2021-08-10 18:57:08 +00:00
|
|
|
#[cfg(test)]
|
|
|
|
mod tests;
|
|
|
|
|
2023-01-20 21:20:38 +00:00
|
|
|
use crate::{
|
|
|
|
command::parse_commandline_args,
|
2023-02-05 21:20:35 +00:00
|
|
|
config_files::set_config_path,
|
2023-01-20 21:20:38 +00:00
|
|
|
logger::{configure, logger},
|
|
|
|
terminal::acquire_terminal,
|
|
|
|
};
|
2023-01-26 23:56:55 +00:00
|
|
|
use command::gather_commandline_args;
|
2023-01-24 20:28:59 +00:00
|
|
|
use log::Level;
|
2022-01-18 08:48:28 +00:00
|
|
|
use miette::Result;
|
2023-03-20 04:05:22 +00:00
|
|
|
use nu_cli::gather_parent_env_vars;
|
|
|
|
use nu_command::util::report_error_new;
|
|
|
|
use nu_command::{create_default_context, get_init_cwd};
|
2023-01-20 21:20:38 +00:00
|
|
|
use nu_protocol::{util::BufferedReader, PipelineData, RawStream};
|
2023-01-24 20:28:59 +00:00
|
|
|
use nu_utils::utils::perf;
|
2023-02-05 21:20:35 +00:00
|
|
|
use run::{run_commands, run_file, run_repl};
|
2023-01-20 18:44:49 +00:00
|
|
|
use signals::{ctrlc_protection, sigquit_protection};
|
2022-01-26 14:42:39 +00:00
|
|
|
use std::{
|
2022-05-17 18:28:18 +00:00
|
|
|
io::BufReader,
|
2023-01-23 18:57:40 +00:00
|
|
|
str::FromStr,
|
2023-01-20 18:44:49 +00:00
|
|
|
sync::{atomic::AtomicBool, Arc},
|
2022-01-26 14:42:39 +00:00
|
|
|
};
|
2022-09-29 18:37:48 +00:00
|
|
|
|
2021-09-20 21:37:26 +00:00
|
|
|
fn main() -> Result<()> {
|
2023-01-24 20:28:59 +00:00
|
|
|
let entire_start_time = std::time::Instant::now();
|
|
|
|
let mut start_time = std::time::Instant::now();
|
2021-10-01 16:39:50 +00:00
|
|
|
let miette_hook = std::panic::take_hook();
|
|
|
|
std::panic::set_hook(Box::new(move |x| {
|
2021-12-04 12:38:21 +00:00
|
|
|
crossterm::terminal::disable_raw_mode().expect("unable to disable raw mode");
|
2021-10-01 16:39:50 +00:00
|
|
|
miette_hook(x);
|
|
|
|
}));
|
2021-09-21 19:37:16 +00:00
|
|
|
|
2022-01-04 22:30:34 +00:00
|
|
|
// Get initial current working directory.
|
2022-03-16 18:17:06 +00:00
|
|
|
let init_cwd = get_init_cwd();
|
2022-07-14 14:09:27 +00:00
|
|
|
let mut engine_state = create_default_context();
|
2021-07-17 06:31:34 +00:00
|
|
|
|
2022-01-24 15:05:19 +00:00
|
|
|
// Custom additions
|
|
|
|
let delta = {
|
|
|
|
let mut working_set = nu_protocol::engine::StateWorkingSet::new(&engine_state);
|
|
|
|
working_set.add_decl(Box::new(nu_cli::NuHighlight));
|
2022-02-18 18:43:34 +00:00
|
|
|
working_set.add_decl(Box::new(nu_cli::Print));
|
2022-01-24 15:05:19 +00:00
|
|
|
working_set.render()
|
|
|
|
};
|
2022-07-14 14:09:27 +00:00
|
|
|
|
|
|
|
if let Err(err) = engine_state.merge_delta(delta) {
|
|
|
|
report_error_new(&engine_state, &err);
|
|
|
|
}
|
2022-01-24 15:05:19 +00:00
|
|
|
|
2021-10-28 04:13:10 +00:00
|
|
|
let ctrlc = Arc::new(AtomicBool::new(false));
|
2023-01-20 18:44:49 +00:00
|
|
|
// TODO: make this conditional in the future
|
|
|
|
ctrlc_protection(&mut engine_state, &ctrlc);
|
|
|
|
sigquit_protection(&mut engine_state);
|
2022-06-09 12:08:15 +00:00
|
|
|
|
2023-01-26 23:56:55 +00:00
|
|
|
let (args_to_nushell, script_name, args_to_script) = gather_commandline_args();
|
|
|
|
let parsed_nu_cli_args = parse_commandline_args(&args_to_nushell.join(" "), &mut engine_state)
|
2023-01-20 18:44:49 +00:00
|
|
|
.unwrap_or_else(|_| std::process::exit(1));
|
|
|
|
|
2023-03-09 02:59:33 +00:00
|
|
|
engine_state.is_interactive = parsed_nu_cli_args.interactive_shell.is_some();
|
|
|
|
engine_state.is_login = parsed_nu_cli_args.login_shell.is_some();
|
|
|
|
|
2023-02-01 23:03:05 +00:00
|
|
|
let use_color = engine_state.get_config().use_ansi_coloring;
|
2023-02-05 21:20:35 +00:00
|
|
|
if let Some(level) = parsed_nu_cli_args
|
|
|
|
.log_level
|
|
|
|
.as_ref()
|
|
|
|
.map(|level| level.item.clone())
|
|
|
|
{
|
2023-01-24 20:28:59 +00:00
|
|
|
let level = if Level::from_str(&level).is_ok() {
|
|
|
|
level
|
|
|
|
} else {
|
|
|
|
eprintln!(
|
|
|
|
"ERROR: log library did not recognize log level '{level}', using default 'info'"
|
|
|
|
);
|
|
|
|
"info".to_string()
|
|
|
|
};
|
|
|
|
let target = parsed_nu_cli_args
|
|
|
|
.log_target
|
2023-02-05 21:20:35 +00:00
|
|
|
.as_ref()
|
|
|
|
.map(|target| target.item.clone())
|
2023-01-24 20:28:59 +00:00
|
|
|
.unwrap_or_else(|| "stderr".to_string());
|
|
|
|
|
|
|
|
logger(|builder| configure(&level, &target, builder))?;
|
|
|
|
// info!("start logging {}:{}:{}", file!(), line!(), column!());
|
2023-02-01 23:03:05 +00:00
|
|
|
perf(
|
|
|
|
"start logging",
|
|
|
|
start_time,
|
|
|
|
file!(),
|
|
|
|
line!(),
|
|
|
|
column!(),
|
|
|
|
use_color,
|
|
|
|
);
|
2023-01-24 20:28:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
start_time = std::time::Instant::now();
|
2023-01-20 18:44:49 +00:00
|
|
|
set_config_path(
|
|
|
|
&mut engine_state,
|
|
|
|
&init_cwd,
|
|
|
|
"config.nu",
|
|
|
|
"config-path",
|
|
|
|
&parsed_nu_cli_args.config_file,
|
|
|
|
);
|
|
|
|
|
|
|
|
set_config_path(
|
|
|
|
&mut engine_state,
|
|
|
|
&init_cwd,
|
|
|
|
"env.nu",
|
|
|
|
"env-path",
|
|
|
|
&parsed_nu_cli_args.env_file,
|
|
|
|
);
|
2023-02-01 23:03:05 +00:00
|
|
|
perf(
|
|
|
|
"set_config_path",
|
|
|
|
start_time,
|
|
|
|
file!(),
|
|
|
|
line!(),
|
|
|
|
column!(),
|
|
|
|
use_color,
|
|
|
|
);
|
2023-01-20 18:44:49 +00:00
|
|
|
|
2023-01-24 20:28:59 +00:00
|
|
|
start_time = std::time::Instant::now();
|
2023-01-20 18:44:49 +00:00
|
|
|
// keep this condition in sync with the branches below
|
2023-03-09 02:59:33 +00:00
|
|
|
acquire_terminal(parsed_nu_cli_args.commands.is_none() && script_name.is_empty());
|
2023-02-01 23:03:05 +00:00
|
|
|
perf(
|
|
|
|
"acquire_terminal",
|
|
|
|
start_time,
|
|
|
|
file!(),
|
|
|
|
line!(),
|
|
|
|
column!(),
|
|
|
|
use_color,
|
|
|
|
);
|
2023-01-20 18:44:49 +00:00
|
|
|
|
2023-01-24 20:28:59 +00:00
|
|
|
start_time = std::time::Instant::now();
|
2023-02-05 21:20:35 +00:00
|
|
|
if let Some(t) = parsed_nu_cli_args.threads.clone() {
|
2023-01-20 18:44:49 +00:00
|
|
|
// 0 means to let rayon decide how many threads to use
|
|
|
|
let threads = t.as_i64().unwrap_or(0);
|
|
|
|
rayon::ThreadPoolBuilder::new()
|
|
|
|
.num_threads(threads as usize)
|
|
|
|
.build_global()
|
|
|
|
.expect("error setting number of threads");
|
2022-08-22 16:30:09 +00:00
|
|
|
}
|
2023-02-01 23:03:05 +00:00
|
|
|
perf(
|
|
|
|
"set rayon threads",
|
|
|
|
start_time,
|
|
|
|
file!(),
|
|
|
|
line!(),
|
|
|
|
column!(),
|
|
|
|
use_color,
|
|
|
|
);
|
2022-08-22 16:30:09 +00:00
|
|
|
|
2023-01-24 20:28:59 +00:00
|
|
|
start_time = std::time::Instant::now();
|
2023-01-20 18:44:49 +00:00
|
|
|
if let Some(testbin) = &parsed_nu_cli_args.testbin {
|
|
|
|
// Call out to the correct testbin
|
|
|
|
match testbin.item.as_str() {
|
|
|
|
"echo_env" => test_bins::echo_env(true),
|
|
|
|
"echo_env_stderr" => test_bins::echo_env(false),
|
|
|
|
"cococo" => test_bins::cococo(),
|
|
|
|
"meow" => test_bins::meow(),
|
|
|
|
"meowb" => test_bins::meowb(),
|
|
|
|
"relay" => test_bins::relay(),
|
|
|
|
"iecho" => test_bins::iecho(),
|
|
|
|
"fail" => test_bins::fail(),
|
|
|
|
"nonu" => test_bins::nonu(),
|
|
|
|
"chop" => test_bins::chop(),
|
|
|
|
"repeater" => test_bins::repeater(),
|
special-case ExternalStream in bytes starts-with (#8203)
# Description
`bytes starts-with` converts the input into a `Value` before running
.starts_with to find if the binary matches. This has two side effects:
it makes the code simpler, only dealing in whole values, and simplifying
a lot of input pipeline handling and value transforming it would
otherwise have to do. _Especially_ in the presence of a cell path to
drill into. It also makes buffers the entire input into memory, which
can take up a lot of memory when dealing with large files, especially if
you only want to check the first few bytes (like for a magic number).
This PR adds a special branch on PipelineData::ExternalStream with a
streaming version of starts_with.
# User-Facing Changes
Opening large files and running bytes starts-with on them will not take
a long time.
# Tests + Formatting
Don't forget to add tests that cover your changes.
Make sure you've run and fixed any issues with these commands:
- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass
# Drawbacks
Streaming checking is more complicated, and there may be bugs. I tested
it with multiple chunks with string data and binary data and it seems to
work alright up to 8k and over bytes, though.
The existing `operate` method still exists because the way it handles
cell paths and values is complicated. This causes some "code
duplication", or at least some intent duplication, between the value
code and the streaming code. This might be worthwhile considering the
performance gains (approaching infinity on larger inputs).
Another thing to consider is that my ExternalStream branch considers
string data as valid input. The operate branch only parses Binary
values, so it would fail. `open` is kind of unpredictable on whether it
returns string data or binary data, even when passing `--raw`. I think
this can be a problem but not really one I'm trying to tackle in this
PR, so, it's worth considering.
2023-02-26 14:17:44 +00:00
|
|
|
"repeat_bytes" => test_bins::repeat_bytes(),
|
2023-01-20 18:44:49 +00:00
|
|
|
"nu_repl" => test_bins::nu_repl(),
|
2023-02-24 20:39:52 +00:00
|
|
|
"input_bytes_length" => test_bins::input_bytes_length(),
|
2023-01-20 18:44:49 +00:00
|
|
|
_ => std::process::exit(1),
|
|
|
|
}
|
|
|
|
std::process::exit(0)
|
|
|
|
}
|
2023-02-01 23:03:05 +00:00
|
|
|
perf(
|
|
|
|
"run test_bins",
|
|
|
|
start_time,
|
|
|
|
file!(),
|
|
|
|
line!(),
|
|
|
|
column!(),
|
|
|
|
use_color,
|
|
|
|
);
|
2023-01-24 20:28:59 +00:00
|
|
|
|
|
|
|
start_time = std::time::Instant::now();
|
2023-01-20 18:44:49 +00:00
|
|
|
let input = if let Some(redirect_stdin) = &parsed_nu_cli_args.redirect_stdin {
|
|
|
|
let stdin = std::io::stdin();
|
|
|
|
let buf_reader = BufReader::new(stdin);
|
|
|
|
|
|
|
|
PipelineData::ExternalStream {
|
|
|
|
stdout: Some(RawStream::new(
|
|
|
|
Box::new(BufferedReader::new(buf_reader)),
|
|
|
|
Some(ctrlc),
|
|
|
|
redirect_stdin.span,
|
|
|
|
None,
|
|
|
|
)),
|
|
|
|
stderr: None,
|
|
|
|
exit_code: None,
|
|
|
|
span: redirect_stdin.span,
|
|
|
|
metadata: None,
|
|
|
|
trim_end_newline: false,
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
PipelineData::empty()
|
|
|
|
};
|
2023-02-01 23:03:05 +00:00
|
|
|
perf(
|
|
|
|
"redirect stdin",
|
|
|
|
start_time,
|
|
|
|
file!(),
|
|
|
|
line!(),
|
|
|
|
column!(),
|
|
|
|
use_color,
|
|
|
|
);
|
2022-10-21 15:20:21 +00:00
|
|
|
|
2023-01-24 20:28:59 +00:00
|
|
|
start_time = std::time::Instant::now();
|
2023-01-20 18:44:49 +00:00
|
|
|
// First, set up env vars as strings only
|
|
|
|
gather_parent_env_vars(&mut engine_state, &init_cwd);
|
2023-02-01 23:03:05 +00:00
|
|
|
perf(
|
|
|
|
"gather env vars",
|
|
|
|
start_time,
|
|
|
|
file!(),
|
|
|
|
line!(),
|
|
|
|
column!(),
|
|
|
|
use_color,
|
|
|
|
);
|
2022-02-09 22:08:16 +00:00
|
|
|
|
2023-02-05 21:20:35 +00:00
|
|
|
if let Some(commands) = parsed_nu_cli_args.commands.clone() {
|
|
|
|
run_commands(
|
2023-01-20 18:44:49 +00:00
|
|
|
&mut engine_state,
|
2023-02-05 21:20:35 +00:00
|
|
|
parsed_nu_cli_args,
|
2023-02-01 23:03:05 +00:00
|
|
|
use_color,
|
2023-02-05 21:20:35 +00:00
|
|
|
&commands,
|
2023-01-20 18:44:49 +00:00
|
|
|
input,
|
2023-03-24 15:41:33 +00:00
|
|
|
entire_start_time,
|
2023-02-05 21:20:35 +00:00
|
|
|
)
|
2023-03-09 02:59:33 +00:00
|
|
|
} else if !script_name.is_empty() {
|
2023-02-05 21:20:35 +00:00
|
|
|
run_file(
|
2023-01-20 18:44:49 +00:00
|
|
|
&mut engine_state,
|
2023-02-05 21:20:35 +00:00
|
|
|
parsed_nu_cli_args,
|
2023-02-01 23:03:05 +00:00
|
|
|
use_color,
|
2023-01-20 18:44:49 +00:00
|
|
|
script_name,
|
2023-02-05 21:20:35 +00:00
|
|
|
args_to_script,
|
2023-01-20 18:44:49 +00:00
|
|
|
input,
|
2023-02-05 21:20:35 +00:00
|
|
|
)
|
2023-01-20 18:44:49 +00:00
|
|
|
} else {
|
2023-03-09 02:59:33 +00:00
|
|
|
engine_state.is_interactive = true;
|
FEATURE: add the startup time to `$nu` (#8353)
# Description
in https://github.com/nushell/nushell/issues/8311 and the discord
server, the idea of moving the default banner from the `rust` source to
the `nushell` standar library has emerged :yum:
however, in order to do this, one need to have access to all the
variables used in the default banner => all of them are accessible
because known constants, except for the startup time of the shell, which
is not anywhere in the shell...
#### this PR adds exactly this, i.e. the new `startup_time` to the `$nu`
variable, which is computed to have the exact same value as the value
shown in the banner.
## the changes
in order to achieve this, i had to
- add `startup_time` as an `i64` to the `EngineState` => this is, to the
best of my knowledge, the easiest way to pass such an information around
down to where the banner startup time is computed and where the `$nu`
variable is evaluated
- add `startup-time` to the `$nu` variable and use the `EngineState`
getter for `startup_time` to show it as a `Value::Duration`
- pass `engine_state` as a `&mut`able argument from `main.rs` down to
`repl.rs` to allow the setter to change the value of `startup_time` =>
without this, the value would not change and would show `-1ns` as the
default value...
- the value of the startup time is computed in `evaluate_repl` in
`repl.rs`, only once at the beginning, and the same value is used in the
default banner :ok_hand:
# User-Facing Changes
one can now access to the same time as shown in the default banner with
```bash
$nu.startup-time
```
# Tests + Formatting
- :green_circle: `cargo fmt --all`
- :green_circle: `cargo clippy --workspace -- -D warnings -D
clippy::unwrap_used -A clippy::needless_collect`
- :green_circle: `cargo test --workspace`
# After Submitting
```
$nothing
```
2023-03-09 20:18:58 +00:00
|
|
|
run_repl(&mut engine_state, parsed_nu_cli_args, entire_start_time)
|
2022-01-26 14:42:39 +00:00
|
|
|
}
|
|
|
|
}
|