2023-02-05 21:20:35 +00:00
|
|
|
#[cfg(feature = "plugin")]
|
|
|
|
use crate::config_files::NUSHELL_FOLDER;
|
|
|
|
use crate::{
|
|
|
|
command,
|
|
|
|
config_files::{self, setup_config},
|
|
|
|
};
|
|
|
|
#[cfg(feature = "plugin")]
|
|
|
|
use nu_cli::read_plugin_file;
|
2023-04-07 20:12:27 +00:00
|
|
|
use nu_cli::{evaluate_commands, evaluate_file, evaluate_repl};
|
|
|
|
use nu_protocol::PipelineData;
|
2023-02-05 21:20:35 +00:00
|
|
|
use nu_utils::utils::perf;
|
|
|
|
|
|
|
|
pub(crate) fn run_commands(
|
|
|
|
engine_state: &mut nu_protocol::engine::EngineState,
|
|
|
|
parsed_nu_cli_args: command::NushellCliArgs,
|
|
|
|
use_color: bool,
|
|
|
|
commands: &nu_protocol::Spanned<String>,
|
|
|
|
input: PipelineData,
|
2023-03-24 15:41:33 +00:00
|
|
|
entire_start_time: std::time::Instant,
|
2023-02-05 21:20:35 +00:00
|
|
|
) -> Result<(), miette::ErrReport> {
|
|
|
|
let mut stack = nu_protocol::engine::Stack::new();
|
|
|
|
let start_time = std::time::Instant::now();
|
2023-04-06 18:21:33 +00:00
|
|
|
|
2023-05-25 13:24:56 +00:00
|
|
|
// if the --no-config-file(-n) option is NOT passed, load the plugin file,
|
|
|
|
// load the default env file or custom (depending on parsed_nu_cli_args.env_file),
|
|
|
|
// and maybe a custom config file (depending on parsed_nu_cli_args.config_file)
|
|
|
|
//
|
|
|
|
// if the --no-config-file(-n) flag is passed, do not load plugin, env, or config files
|
|
|
|
if parsed_nu_cli_args.no_config_file.is_none() {
|
|
|
|
#[cfg(feature = "plugin")]
|
|
|
|
read_plugin_file(
|
2023-02-05 21:20:35 +00:00
|
|
|
engine_state,
|
|
|
|
&mut stack,
|
2023-05-25 13:24:56 +00:00
|
|
|
parsed_nu_cli_args.plugin_file,
|
|
|
|
NUSHELL_FOLDER,
|
|
|
|
);
|
|
|
|
perf(
|
|
|
|
"read plugins",
|
|
|
|
start_time,
|
|
|
|
file!(),
|
|
|
|
line!(),
|
|
|
|
column!(),
|
|
|
|
use_color,
|
|
|
|
);
|
|
|
|
|
|
|
|
let start_time = std::time::Instant::now();
|
|
|
|
// only want to load config and env if relative argument is provided.
|
|
|
|
if parsed_nu_cli_args.env_file.is_some() {
|
|
|
|
config_files::read_config_file(
|
|
|
|
engine_state,
|
|
|
|
&mut stack,
|
|
|
|
parsed_nu_cli_args.env_file,
|
|
|
|
true,
|
|
|
|
);
|
|
|
|
} else {
|
|
|
|
config_files::read_default_env_file(engine_state, &mut stack)
|
|
|
|
}
|
|
|
|
perf(
|
|
|
|
"read env.nu",
|
|
|
|
start_time,
|
|
|
|
file!(),
|
|
|
|
line!(),
|
|
|
|
column!(),
|
|
|
|
use_color,
|
2023-02-05 21:20:35 +00:00
|
|
|
);
|
|
|
|
|
2023-05-25 13:24:56 +00:00
|
|
|
let start_time = std::time::Instant::now();
|
|
|
|
if parsed_nu_cli_args.config_file.is_some() {
|
|
|
|
config_files::read_config_file(
|
|
|
|
engine_state,
|
|
|
|
&mut stack,
|
|
|
|
parsed_nu_cli_args.config_file,
|
|
|
|
false,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
perf(
|
|
|
|
"read config.nu",
|
|
|
|
start_time,
|
|
|
|
file!(),
|
|
|
|
line!(),
|
|
|
|
column!(),
|
|
|
|
use_color,
|
|
|
|
);
|
|
|
|
}
|
2023-03-24 15:41:33 +00:00
|
|
|
// Before running commands, set up the startup time
|
|
|
|
engine_state.set_startup_time(entire_start_time.elapsed().as_nanos() as i64);
|
2023-02-05 21:20:35 +00:00
|
|
|
let start_time = std::time::Instant::now();
|
|
|
|
let ret_val = evaluate_commands(
|
|
|
|
commands,
|
|
|
|
engine_state,
|
|
|
|
&mut stack,
|
|
|
|
input,
|
|
|
|
parsed_nu_cli_args.table_mode,
|
|
|
|
);
|
|
|
|
perf(
|
|
|
|
"evaluate_commands",
|
|
|
|
start_time,
|
|
|
|
file!(),
|
|
|
|
line!(),
|
|
|
|
column!(),
|
|
|
|
use_color,
|
|
|
|
);
|
|
|
|
|
|
|
|
match ret_val {
|
|
|
|
Ok(Some(exit_code)) => std::process::exit(exit_code as i32),
|
|
|
|
Ok(None) => Ok(()),
|
|
|
|
Err(e) => Err(e),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub(crate) fn run_file(
|
|
|
|
engine_state: &mut nu_protocol::engine::EngineState,
|
|
|
|
parsed_nu_cli_args: command::NushellCliArgs,
|
|
|
|
use_color: bool,
|
|
|
|
script_name: String,
|
|
|
|
args_to_script: Vec<String>,
|
|
|
|
input: PipelineData,
|
|
|
|
) -> Result<(), miette::ErrReport> {
|
|
|
|
let mut stack = nu_protocol::engine::Stack::new();
|
|
|
|
let start_time = std::time::Instant::now();
|
|
|
|
|
|
|
|
#[cfg(feature = "plugin")]
|
|
|
|
read_plugin_file(
|
|
|
|
engine_state,
|
|
|
|
&mut stack,
|
|
|
|
parsed_nu_cli_args.plugin_file,
|
|
|
|
NUSHELL_FOLDER,
|
|
|
|
);
|
|
|
|
perf(
|
|
|
|
"read plugins",
|
|
|
|
start_time,
|
|
|
|
file!(),
|
|
|
|
line!(),
|
|
|
|
column!(),
|
|
|
|
use_color,
|
|
|
|
);
|
|
|
|
|
|
|
|
let start_time = std::time::Instant::now();
|
|
|
|
// only want to load config and env if relative argument is provided.
|
|
|
|
if parsed_nu_cli_args.env_file.is_some() {
|
|
|
|
config_files::read_config_file(engine_state, &mut stack, parsed_nu_cli_args.env_file, true);
|
|
|
|
} else {
|
|
|
|
config_files::read_default_env_file(engine_state, &mut stack)
|
|
|
|
}
|
|
|
|
perf(
|
|
|
|
"read env.nu",
|
|
|
|
start_time,
|
|
|
|
file!(),
|
|
|
|
line!(),
|
|
|
|
column!(),
|
|
|
|
use_color,
|
|
|
|
);
|
|
|
|
|
|
|
|
let start_time = std::time::Instant::now();
|
|
|
|
if parsed_nu_cli_args.config_file.is_some() {
|
|
|
|
config_files::read_config_file(
|
|
|
|
engine_state,
|
|
|
|
&mut stack,
|
|
|
|
parsed_nu_cli_args.config_file,
|
|
|
|
false,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
perf(
|
|
|
|
"read config.nu",
|
|
|
|
start_time,
|
|
|
|
file!(),
|
|
|
|
line!(),
|
|
|
|
column!(),
|
|
|
|
use_color,
|
|
|
|
);
|
|
|
|
|
|
|
|
let start_time = std::time::Instant::now();
|
|
|
|
let ret_val = evaluate_file(
|
|
|
|
script_name,
|
|
|
|
&args_to_script,
|
|
|
|
engine_state,
|
|
|
|
&mut stack,
|
|
|
|
input,
|
|
|
|
);
|
|
|
|
perf(
|
|
|
|
"evaluate_file",
|
|
|
|
start_time,
|
|
|
|
file!(),
|
|
|
|
line!(),
|
|
|
|
column!(),
|
|
|
|
use_color,
|
|
|
|
);
|
|
|
|
|
|
|
|
let start_time = std::time::Instant::now();
|
|
|
|
let last_exit_code = stack.get_env_var(&*engine_state, "LAST_EXIT_CODE");
|
|
|
|
if let Some(last_exit_code) = last_exit_code {
|
2023-07-21 13:20:33 +00:00
|
|
|
let value = last_exit_code.as_int();
|
2023-02-05 21:20:35 +00:00
|
|
|
if let Ok(value) = value {
|
|
|
|
if value != 0 {
|
|
|
|
std::process::exit(value as i32);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
perf(
|
|
|
|
"get exit code",
|
|
|
|
start_time,
|
|
|
|
file!(),
|
|
|
|
line!(),
|
|
|
|
column!(),
|
|
|
|
use_color,
|
|
|
|
);
|
|
|
|
|
|
|
|
ret_val
|
|
|
|
}
|
|
|
|
|
|
|
|
pub(crate) fn run_repl(
|
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
|
|
|
engine_state: &mut nu_protocol::engine::EngineState,
|
2023-02-05 21:20:35 +00:00
|
|
|
parsed_nu_cli_args: command::NushellCliArgs,
|
|
|
|
entire_start_time: std::time::Instant,
|
|
|
|
) -> Result<(), miette::ErrReport> {
|
|
|
|
let mut stack = nu_protocol::engine::Stack::new();
|
|
|
|
let start_time = std::time::Instant::now();
|
|
|
|
|
2023-03-06 15:36:15 +00:00
|
|
|
if parsed_nu_cli_args.no_config_file.is_none() {
|
|
|
|
setup_config(
|
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
|
|
|
engine_state,
|
2023-03-06 15:36:15 +00:00
|
|
|
&mut stack,
|
|
|
|
#[cfg(feature = "plugin")]
|
|
|
|
parsed_nu_cli_args.plugin_file,
|
|
|
|
parsed_nu_cli_args.config_file,
|
|
|
|
parsed_nu_cli_args.env_file,
|
|
|
|
parsed_nu_cli_args.login_shell.is_some(),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2023-02-05 21:20:35 +00:00
|
|
|
// Reload use_color from config in case it's different from the default value
|
|
|
|
let use_color = engine_state.get_config().use_ansi_coloring;
|
|
|
|
perf(
|
|
|
|
"setup_config",
|
|
|
|
start_time,
|
|
|
|
file!(),
|
|
|
|
line!(),
|
|
|
|
column!(),
|
|
|
|
use_color,
|
|
|
|
);
|
|
|
|
|
|
|
|
let start_time = std::time::Instant::now();
|
|
|
|
let ret_val = evaluate_repl(
|
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
|
|
|
engine_state,
|
2023-02-05 21:20:35 +00:00
|
|
|
&mut stack,
|
|
|
|
config_files::NUSHELL_FOLDER,
|
|
|
|
parsed_nu_cli_args.execute,
|
2023-05-10 12:05:01 +00:00
|
|
|
parsed_nu_cli_args.no_std_lib,
|
2023-02-05 21:20:35 +00:00
|
|
|
entire_start_time,
|
|
|
|
);
|
|
|
|
perf(
|
|
|
|
"evaluate_repl",
|
|
|
|
start_time,
|
|
|
|
file!(),
|
|
|
|
line!(),
|
|
|
|
column!(),
|
|
|
|
use_color,
|
|
|
|
);
|
|
|
|
|
|
|
|
ret_val
|
|
|
|
}
|