* Resolve rebase artifacts * Remove leftover dependencies on removed feature * Remove unnecessary 'pub' * Start taking notes and fooling around * Split canonicalize to two versions; Add TODOs One that takes `relative_to` and one that doesn't. More TODO notes. * Merge absolutize to and rename resolve_dots * Add custom absolutize fn and use it in path expand * Convert a couple of dunce::canonicalize to ours * Update nu-path description * Replace all canonicalize with nu-path version * Remove leftover dunce dependencies * Fix broken autocd with trailing slash Trailing slash is preserved *only* in paths that do not contain "." or "..". This should be fixed in the future to cover all paths but for now it at least covers basic cases. * Use dunce::canonicalize for canonicalizing * Alow cd recovery from non-existent cwd * Disable removed canonicalize functionality tests Remove unused import * Break down nu-path into separate modules * Remove unused public imports * Remove abundant cow mapping * Fix clippy warning * Reformulate old canonicalize tests to expand_path They wouldn't work with the new canonicalize. * Canonicalize also ~ and ndots; Unify path joining Also, add doc comments in nu_path::expansions. * Add comment * Avoid expanding ndots if path is not valid UTF-8 With this change, no lossy path->string conversion should happen in the nu-path crate. * Fmt * Slight expand_tilde refactor; Add doc comments * Start nu-path integration tests * Add tests TODO * Fix docstring typo * Fix some doc strings * Add README for nu-path crate * Add a couple of canonicalize tests * Add nu-path integration tests * Add trim trailing slashes tests * Update nu-path dependency * Remove unused import * Regenerate lockfile
313 lines
11 KiB
Rust
313 lines
11 KiB
Rust
use crate::{evaluate::internal::InternalIterator, maybe_print_errors, run_block, shell::CdArgs};
|
|
use crate::{BufCodecReader, MaybeTextCodec, StringOrBinary};
|
|
use nu_errors::ShellError;
|
|
use nu_path::{canonicalize_with, trim_trailing_slash};
|
|
use nu_protocol::hir::{
|
|
Call, ClassifiedCommand, Expression, ExternalRedirection, InternalCommand, Literal,
|
|
NamedArguments, SpannedExpression,
|
|
};
|
|
use nu_protocol::{Primitive, UntaggedValue, Value};
|
|
use nu_stream::{InputStream, IntoInputStream};
|
|
|
|
use crate::EvaluationContext;
|
|
use log::{debug, trace};
|
|
use nu_source::{AnchorLocation, Span, Tag, Tagged, Text};
|
|
use std::path::{Path, PathBuf};
|
|
use std::{error::Error, sync::atomic::Ordering};
|
|
use std::{io::BufReader, iter::Iterator};
|
|
|
|
#[derive(Debug)]
|
|
pub enum LineResult {
|
|
Success(String),
|
|
Error(String, ShellError),
|
|
Break,
|
|
CtrlC,
|
|
CtrlD,
|
|
ClearHistory,
|
|
}
|
|
|
|
fn chomp_newline(s: &str) -> &str {
|
|
if let Some(s) = s.strip_suffix('\n') {
|
|
s
|
|
} else {
|
|
s
|
|
}
|
|
}
|
|
|
|
pub fn run_script_in_dir(
|
|
script: String,
|
|
dir: &Path,
|
|
ctx: &EvaluationContext,
|
|
) -> Result<(), Box<dyn Error>> {
|
|
//Save path before to switch back to it after executing script
|
|
let path_before = ctx.shell_manager().path();
|
|
|
|
ctx.shell_manager()
|
|
.set_path(dir.to_string_lossy().to_string());
|
|
run_script_standalone(script, false, ctx, false)?;
|
|
ctx.shell_manager().set_path(path_before);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Process the line by parsing the text to turn it into commands, classify those commands so that we understand what is being called in the pipeline, and then run this pipeline
|
|
pub fn process_script(
|
|
script_text: &str,
|
|
ctx: &EvaluationContext,
|
|
redirect_stdin: bool,
|
|
span_offset: usize,
|
|
cli_mode: bool,
|
|
) -> LineResult {
|
|
if script_text.trim() == "" {
|
|
LineResult::Success(script_text.to_string())
|
|
} else {
|
|
let line = chomp_newline(script_text);
|
|
|
|
let (block, err) = nu_parser::parse(line, span_offset, &ctx.scope);
|
|
|
|
debug!("{:#?}", block);
|
|
|
|
if let Some(failure) = err {
|
|
return LineResult::Error(line.to_string(), failure.into());
|
|
}
|
|
|
|
// There's a special case to check before we process the pipeline:
|
|
// If we're giving a path by itself
|
|
// ...and it's not a command in the path
|
|
// ...and it doesn't have any arguments
|
|
// ...and we're in the CLI
|
|
// ...then change to this directory
|
|
if cli_mode
|
|
&& block.block.len() == 1
|
|
&& block.block[0].pipelines.len() == 1
|
|
&& block.block[0].pipelines[0].list.len() == 1
|
|
{
|
|
if let ClassifiedCommand::Internal(InternalCommand {
|
|
ref name,
|
|
ref args,
|
|
name_span,
|
|
}) = block.block[0].pipelines[0].list[0]
|
|
{
|
|
let internal_name = name;
|
|
let name = args
|
|
.positional
|
|
.as_ref()
|
|
.and_then(|positionals| {
|
|
positionals.get(0).map(|e| {
|
|
if let Expression::Literal(Literal::String(ref s)) = e.expr {
|
|
&s
|
|
} else {
|
|
""
|
|
}
|
|
})
|
|
})
|
|
.unwrap_or("");
|
|
|
|
ctx.sync_path_to_env();
|
|
if internal_name == "run_external"
|
|
&& args
|
|
.positional
|
|
.as_ref()
|
|
.map(|v| v.len() == 1)
|
|
.unwrap_or(true)
|
|
&& args
|
|
.named
|
|
.as_ref()
|
|
.map(NamedArguments::is_empty)
|
|
.unwrap_or(true)
|
|
&& canonicalize_with(name, ctx.shell_manager().path()).is_ok()
|
|
&& Path::new(&name).is_dir()
|
|
&& !ctx.host().lock().is_external_cmd(name)
|
|
{
|
|
let tag = Tag {
|
|
anchor: Some(AnchorLocation::Source(line.into())),
|
|
span: name_span,
|
|
};
|
|
let path = {
|
|
// Here we work differently if we're in Windows because of the expected Windows behavior
|
|
#[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 {
|
|
format!("{}\\", name.to_string())
|
|
}
|
|
} else {
|
|
name.to_string()
|
|
}
|
|
}
|
|
#[cfg(not(windows))]
|
|
{
|
|
name.to_string()
|
|
}
|
|
};
|
|
|
|
let path = trim_trailing_slash(&path);
|
|
|
|
let cd_args = CdArgs {
|
|
path: Some(Tagged {
|
|
item: PathBuf::from(path),
|
|
tag: tag.clone(),
|
|
}),
|
|
};
|
|
|
|
return match ctx.shell_manager().cd(cd_args, tag) {
|
|
Err(e) => LineResult::Error(line.to_string(), e),
|
|
Ok(stream) => {
|
|
let iter = InternalIterator {
|
|
context: ctx.clone(),
|
|
leftovers: InputStream::empty(),
|
|
input: stream,
|
|
};
|
|
for _ in iter {
|
|
//nullopt, commands are run by iterating over iter
|
|
}
|
|
LineResult::Success(line.to_string())
|
|
}
|
|
};
|
|
}
|
|
}
|
|
}
|
|
|
|
let input_stream = if redirect_stdin {
|
|
let file = std::io::stdin();
|
|
let buf_reader = BufReader::new(file);
|
|
let buf_codec = BufCodecReader::new(buf_reader, MaybeTextCodec::default());
|
|
let stream = buf_codec.map(|line| {
|
|
if let Ok(line) = line {
|
|
let primitive = match line {
|
|
StringOrBinary::String(s) => Primitive::String(s),
|
|
StringOrBinary::Binary(b) => Primitive::Binary(b.into_iter().collect()),
|
|
};
|
|
|
|
Ok(Value {
|
|
value: UntaggedValue::Primitive(primitive),
|
|
tag: Tag::unknown(),
|
|
})
|
|
} else {
|
|
panic!("Internal error: could not read lines of text from stdin")
|
|
}
|
|
});
|
|
stream.into_input_stream()
|
|
} else {
|
|
InputStream::empty()
|
|
};
|
|
|
|
trace!("{:#?}", block);
|
|
|
|
let result = run_block(&block, ctx, input_stream, ExternalRedirection::None);
|
|
|
|
match result {
|
|
Ok(input) => {
|
|
// Running a pipeline gives us back a stream that we can then
|
|
// work through. At the top level, we just want to pull on the
|
|
// values to compute them.
|
|
|
|
let autoview_cmd = ctx
|
|
.get_command("autoview")
|
|
.expect("Could not find autoview command");
|
|
|
|
if let Ok(mut output_stream) = ctx.run_command(
|
|
autoview_cmd,
|
|
Tag::unknown(),
|
|
Call::new(
|
|
Box::new(SpannedExpression::new(
|
|
Expression::string("autoview".to_string()),
|
|
Span::unknown(),
|
|
)),
|
|
Span::unknown(),
|
|
),
|
|
input,
|
|
) {
|
|
loop {
|
|
match output_stream.next() {
|
|
Some(Value {
|
|
value: UntaggedValue::Error(e),
|
|
..
|
|
}) => return LineResult::Error(line.to_string(), e),
|
|
Some(_item) => {
|
|
if ctx.ctrl_c().load(Ordering::SeqCst) {
|
|
break;
|
|
}
|
|
}
|
|
None => break,
|
|
}
|
|
}
|
|
}
|
|
|
|
LineResult::Success(line.to_string())
|
|
}
|
|
Err(err) => LineResult::Error(line.to_string(), err),
|
|
}
|
|
}
|
|
}
|
|
|
|
pub fn run_script_standalone(
|
|
script_text: String,
|
|
redirect_stdin: bool,
|
|
context: &EvaluationContext,
|
|
exit_on_error: bool,
|
|
) -> Result<(), ShellError> {
|
|
context
|
|
.shell_manager()
|
|
.enter_script_mode()
|
|
.map_err(ShellError::from)?;
|
|
let line = process_script(&script_text, context, redirect_stdin, 0, false);
|
|
|
|
match line {
|
|
LineResult::Success(line) => {
|
|
let error_code = {
|
|
let errors = context.current_errors().clone();
|
|
let errors = errors.lock();
|
|
|
|
if errors.len() > 0 {
|
|
1
|
|
} else {
|
|
0
|
|
}
|
|
};
|
|
|
|
maybe_print_errors(context, Text::from(line));
|
|
if error_code != 0 && exit_on_error {
|
|
std::process::exit(error_code);
|
|
}
|
|
}
|
|
|
|
LineResult::Error(line, err) => {
|
|
context
|
|
.host()
|
|
.lock()
|
|
.print_err(err, &Text::from(line.clone()));
|
|
|
|
maybe_print_errors(context, Text::from(line));
|
|
if exit_on_error {
|
|
std::process::exit(1);
|
|
}
|
|
}
|
|
|
|
_ => {}
|
|
}
|
|
|
|
//exit script mode shell
|
|
context.shell_manager().remove_at_current();
|
|
|
|
Ok(())
|
|
}
|