mirror of
https://github.com/nushell/nushell
synced 2025-01-09 11:49:00 +00:00
ee18f16378
* Add args in .nurc file to environment * Working dummy version * Add add_nurc to sync_env command * Parse .nurc file * Delete env vars after leaving directory * Removing vals not working, strangely * Refactoring, add comment * Debugging * Debug by logging to file * Add and remove env var behavior appears correct However, it does not use existing code that well. * Move work to cli.rs * Parse config directories * I am in a state of distress * Rename .nurc to .nu * Some notes for me * Refactoring * Removing vars works, but not done in a very nice fashion * Refactor env_vars_to_delete * Refactor env_vars_to_add() * Move directory environment code to separate file * Refactor from_config * Restore env values * Working? * Working? * Update comments and change var name * Formatting * Remove vars after leaving dir * Remove notes I made * Rename config function * Clippy * Cleanup and handle errors * cargo fmt * Better error messages, remove last (?) unwrap * FORMAT PLZ * Rename whitelisted_directories to allowed_directories * Add comment to clarify how overwritten values are restored. * Change list of allowed dirs to indexmap * Rewrite starting * rewrite everything * Overwritten env values tracks an indexmap instead of vector * Refactor restore function * Untrack removed vars properly * Performance concerns * Performance concerns * Error handling * Clippy * Add type aliases for String and OsString * Deletion almost works * Working? * Error handling and refactoring * nicer errors * Add TODO file * Move outside of loop * Error handling * Reworking adding of vars * Reworking adding of vars * Ready for testing * Refactoring * Restore overwritten vals code * todo.org * Remove overwritten values tracking, as it is not needed * Cleanup, stop tracking overwritten values as nu takes care of it * Init autoenv command * Initialize autoenv and autoenv trust * autoenv trust toml * toml * Use serde for autoenv * Optional directory arg * Add autoenv untrust command * ... actually add autoenv untrust this time * OsString and paths * Revert "OsString and paths" This reverts commite6eedf8824
. * Fix path * Fix path * Autoenv trust and untrust * Start using autoenv * Check hashes * Use trust functionality when setting vars * Remove unused code * Clippy * Nicer errors for autoenv commands * Non-working errors * Update error description * Satisfy fmt * Errors * Errors print, but not nicely * Nicer errors * fmt * Delete accidentally added todo.org file * Rename direnv to autoenv * Use ShellError instead of Error * Change tests to pass, danger zone? * Clippy and errors * Clippy... again * Replace match with or_else * Use sha2 crate for hashing * parsing and error msg * Refactoring * Only apply vars once * if parent dir * Delete vars * Rework exit code * Adding works * restore * Fix possibility of infinite loop * Refactoring * Non-working * Revert "Non-working" This reverts commite231b85570
. * Revert "Revert "Non-working"" This reverts commit804092e46a
. * Autoenv trust works without restart * Cargo fix * Script vars * Serde * Serde errors * Entry and exitscripts * Clippy * Support windows and handle errors * Formatting * Fix infinite loop on windows * Debugging windows loop * More windows infinite loop debugging * Windows loop debugging #3 * windows loop #4 * Don't return err * Cleanup unused code * Infinite loop debug * Loop debugging * Check if infinite loop is vars_to_add * env_vars_to_add does not terminate, skip loop as test * Hypothesis: std::env::current_dir() is messing with something * Hypothesis: std::env::current_dir() is messing with something * plz * make clippy happy * debugging in env_vars_to_add * Debbuging env_vars_to_add #2 * clippy * clippy.. * Fool clippy * Fix another infinite loop * Binary search for error location x) * Binary search #3 * fmt * Binary search #4 * more searching... * closing in... maybe * PLZ * Cleanup * Restore commented out functionality * Handle case when user gives the directory "." * fmt * Use fs::canonicalize for paths * Create optional script section * fmt * Add exitscripts even if no entryscripts are defined * All sections in .nu-env are now optional * Re-read config file each directory change * Hot reload after autoenv untrust, don't run exitscripts if untrusted * Debugging * Fix issue with recursive adding of vars * Thank you for finding my issues Mr. Azure * use std::env
199 lines
6.3 KiB
Rust
199 lines
6.3 KiB
Rust
use crate::commands::cd::CdArgs;
|
|
use crate::commands::classified::external;
|
|
use crate::commands::WholeStreamCommand;
|
|
use crate::prelude::*;
|
|
|
|
use derive_new::new;
|
|
use parking_lot::Mutex;
|
|
use std::path::PathBuf;
|
|
|
|
use nu_errors::ShellError;
|
|
use nu_protocol::hir::{Expression, ExternalArgs, ExternalCommand, Literal, SpannedExpression};
|
|
use nu_protocol::{Signature, SyntaxShape};
|
|
use nu_source::Tagged;
|
|
|
|
#[derive(Deserialize)]
|
|
pub struct RunExternalArgs {}
|
|
|
|
#[derive(new)]
|
|
pub struct RunExternalCommand {
|
|
/// Whether or not nushell is being used in an interactive context
|
|
pub(crate) interactive: bool,
|
|
}
|
|
|
|
fn spanned_expression_to_string(expr: SpannedExpression) -> Result<String, ShellError> {
|
|
if let SpannedExpression {
|
|
expr: Expression::Literal(Literal::String(s)),
|
|
..
|
|
} = expr
|
|
{
|
|
Ok(s)
|
|
} else {
|
|
Err(ShellError::labeled_error(
|
|
"Expected string for command name",
|
|
"expected string",
|
|
expr.span,
|
|
))
|
|
}
|
|
}
|
|
|
|
#[async_trait]
|
|
impl WholeStreamCommand for RunExternalCommand {
|
|
fn name(&self) -> &str {
|
|
"run_external"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build(self.name()).rest(SyntaxShape::Any, "external command arguments")
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
""
|
|
}
|
|
|
|
async fn run(
|
|
&self,
|
|
args: CommandArgs,
|
|
registry: &CommandRegistry,
|
|
) -> Result<OutputStream, ShellError> {
|
|
let positionals = args.call_info.args.positional.clone().ok_or_else(|| {
|
|
ShellError::untagged_runtime_error("positional arguments unexpectedly empty")
|
|
})?;
|
|
|
|
let mut positionals = positionals.into_iter();
|
|
|
|
let name = positionals
|
|
.next()
|
|
.ok_or_else(|| {
|
|
ShellError::untagged_runtime_error("run_external called with no arguments")
|
|
})
|
|
.and_then(spanned_expression_to_string)?;
|
|
|
|
let mut external_context = {
|
|
#[cfg(windows)]
|
|
{
|
|
Context {
|
|
registry: registry.clone(),
|
|
host: args.host.clone(),
|
|
user_recently_used_autoenv_untrust: false,
|
|
shell_manager: args.shell_manager.clone(),
|
|
ctrl_c: args.ctrl_c.clone(),
|
|
current_errors: Arc::new(Mutex::new(vec![])),
|
|
windows_drives_previous_cwd: Arc::new(Mutex::new(
|
|
std::collections::HashMap::new(),
|
|
)),
|
|
raw_input: String::default(),
|
|
}
|
|
}
|
|
#[cfg(not(windows))]
|
|
{
|
|
Context {
|
|
registry: registry.clone(),
|
|
user_recently_used_autoenv_untrust: false,
|
|
host: args.host.clone(),
|
|
shell_manager: args.shell_manager.clone(),
|
|
ctrl_c: args.ctrl_c.clone(),
|
|
current_errors: Arc::new(Mutex::new(vec![])),
|
|
raw_input: String::default(),
|
|
}
|
|
}
|
|
};
|
|
|
|
let is_interactive = self.interactive;
|
|
|
|
let command = ExternalCommand {
|
|
name,
|
|
name_tag: args.call_info.name_tag.clone(),
|
|
args: ExternalArgs {
|
|
list: positionals.collect(),
|
|
span: args.call_info.args.span,
|
|
},
|
|
};
|
|
|
|
// If we're in interactive mode, we will "auto cd". That is, instead of interpreting
|
|
// this as an external command, we will see it as a path and `cd` into it.
|
|
if is_interactive {
|
|
if let Some(path) = maybe_autocd_dir(&command, &mut external_context).await {
|
|
let cd_args = CdArgs {
|
|
path: Some(Tagged {
|
|
item: PathBuf::from(path),
|
|
tag: args.call_info.name_tag.clone(),
|
|
}),
|
|
};
|
|
|
|
let result = external_context
|
|
.shell_manager
|
|
.cd(cd_args, args.call_info.name_tag.clone());
|
|
match result {
|
|
Ok(stream) => return Ok(stream.to_output_stream()),
|
|
Err(e) => {
|
|
return Err(e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
let scope = args.call_info.scope.clone();
|
|
let is_last = args.call_info.args.is_last;
|
|
let input = args.input;
|
|
let result =
|
|
external::run_external_command(command, &mut external_context, input, &scope, is_last)
|
|
.await;
|
|
|
|
match result {
|
|
Ok(stream) => Ok(stream.to_output_stream()),
|
|
Err(e) => Err(e),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[allow(unused_variables)]
|
|
async fn maybe_autocd_dir<'a>(cmd: &ExternalCommand, ctx: &mut Context) -> Option<String> {
|
|
// We will "auto cd" if
|
|
// - the command name ends in a path separator, or
|
|
// - it's not a command on the path and no arguments were given.
|
|
let name = &cmd.name;
|
|
let path_name = if name.ends_with(std::path::MAIN_SEPARATOR)
|
|
|| (cmd.args.is_empty()
|
|
&& PathBuf::from(name).is_dir()
|
|
&& dunce::canonicalize(name).is_ok()
|
|
&& which::which(&name).is_err())
|
|
{
|
|
Some(name)
|
|
} else {
|
|
None
|
|
};
|
|
|
|
path_name.map(|name| {
|
|
#[cfg(windows)]
|
|
{
|
|
if name.ends_with(':') {
|
|
// This looks like a drive shortcut. We need to a) switch drives and b) go back to the previous directory we were viewing on that drive
|
|
// But first, we need to save where we are now
|
|
let current_path = ctx.shell_manager.path();
|
|
|
|
let split_path: Vec<_> = current_path.split(':').collect();
|
|
if split_path.len() > 1 {
|
|
ctx.windows_drives_previous_cwd
|
|
.lock()
|
|
.insert(split_path[0].to_string(), current_path);
|
|
}
|
|
|
|
let name = name.to_uppercase();
|
|
let new_drive: Vec<_> = name.split(':').collect();
|
|
|
|
if let Some(val) = ctx.windows_drives_previous_cwd.lock().get(new_drive[0]) {
|
|
val.to_string()
|
|
} else {
|
|
name
|
|
}
|
|
} else {
|
|
name.to_string()
|
|
}
|
|
}
|
|
#[cfg(not(windows))]
|
|
{
|
|
name.to_string()
|
|
}
|
|
})
|
|
}
|