mirror of
https://github.com/nushell/nushell.git
synced 2025-05-30 14:50:02 +02:00
Make glob
stream (#14495)
<!-- if this PR closes one or more issues, you can automatically link the PR with them by using one of the [*linking keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword), e.g. - this PR should close #xxxx - fixes #xxxx you can also mention related issues, PRs or discussions! --> # Description <!-- Thank you for improving Nushell. Please, check our [contributing guide](../CONTRIBUTING.md) and talk to the core team before making major changes. Description of your pull request goes here. **Provide examples and/or screenshots** if your changes affect the user experience. --> Makes the `glob` command stream # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> The glob command now streams # 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` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass (on Windows make sure to [enable developer mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging)) - `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> - 🟢 `toolkit fmt` - 🟢 `toolkit clippy` - 🟢 `toolkit test` - 🟢 `toolkit test stdlib` # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. --> N/A
This commit is contained in:
parent
a65a7df209
commit
424efdaafe
@ -1,5 +1,5 @@
|
|||||||
use nu_engine::command_prelude::*;
|
use nu_engine::command_prelude::*;
|
||||||
use nu_protocol::Signals;
|
use nu_protocol::{ListStream, Signals};
|
||||||
use wax::{Glob as WaxGlob, WalkBehavior, WalkEntry};
|
use wax::{Glob as WaxGlob, WalkBehavior, WalkEntry};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
@ -223,6 +223,7 @@ impl Command for Glob {
|
|||||||
..Default::default()
|
..Default::default()
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
.into_owned()
|
||||||
.not(np)
|
.not(np)
|
||||||
.map_err(|err| ShellError::GenericError {
|
.map_err(|err| ShellError::GenericError {
|
||||||
error: "error with glob's not pattern".into(),
|
error: "error with glob's not pattern".into(),
|
||||||
@ -249,6 +250,7 @@ impl Command for Glob {
|
|||||||
..Default::default()
|
..Default::default()
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
.into_owned()
|
||||||
.flatten();
|
.flatten();
|
||||||
glob_to_value(
|
glob_to_value(
|
||||||
engine_state.signals(),
|
engine_state.signals(),
|
||||||
@ -258,11 +260,9 @@ impl Command for Glob {
|
|||||||
no_symlinks,
|
no_symlinks,
|
||||||
span,
|
span,
|
||||||
)
|
)
|
||||||
}?;
|
};
|
||||||
|
|
||||||
Ok(result
|
Ok(result.into_pipeline_data(span, engine_state.signals().clone()))
|
||||||
.into_iter()
|
|
||||||
.into_pipeline_data(span, engine_state.signals().clone()))
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -281,29 +281,33 @@ fn convert_patterns(columns: &[Value]) -> Result<Vec<String>, ShellError> {
|
|||||||
Ok(res)
|
Ok(res)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn glob_to_value<'a>(
|
fn glob_to_value(
|
||||||
signals: &Signals,
|
signals: &Signals,
|
||||||
glob_results: impl Iterator<Item = WalkEntry<'a>>,
|
glob_results: impl Iterator<Item = WalkEntry<'static>> + Send + 'static,
|
||||||
no_dirs: bool,
|
no_dirs: bool,
|
||||||
no_files: bool,
|
no_files: bool,
|
||||||
no_symlinks: bool,
|
no_symlinks: bool,
|
||||||
span: Span,
|
span: Span,
|
||||||
) -> Result<Vec<Value>, ShellError> {
|
) -> ListStream {
|
||||||
let mut result: Vec<Value> = Vec::new();
|
let map_signals = signals.clone();
|
||||||
for entry in glob_results {
|
let result = glob_results.filter_map(move |entry| {
|
||||||
signals.check(span)?;
|
if let Err(err) = map_signals.check(span) {
|
||||||
|
return Some(Value::error(err, span));
|
||||||
|
};
|
||||||
let file_type = entry.file_type();
|
let file_type = entry.file_type();
|
||||||
|
|
||||||
if !(no_dirs && file_type.is_dir()
|
if !(no_dirs && file_type.is_dir()
|
||||||
|| no_files && file_type.is_file()
|
|| no_files && file_type.is_file()
|
||||||
|| no_symlinks && file_type.is_symlink())
|
|| no_symlinks && file_type.is_symlink())
|
||||||
{
|
{
|
||||||
result.push(Value::string(
|
Some(Value::string(
|
||||||
entry.into_path().to_string_lossy().to_string(),
|
entry.into_path().to_string_lossy().to_string(),
|
||||||
span,
|
span,
|
||||||
));
|
))
|
||||||
}
|
} else {
|
||||||
|
None
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
|
||||||
Ok(result)
|
ListStream::new(result, span, signals.clone())
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user