2022-03-13 19:30:27 +01:00
|
|
|
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
|
|
|
// file at the top-level directory of this distribution and at
|
|
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
|
|
//
|
|
|
|
// Copyright 2022 The Nushell Project Developers.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
|
|
// option. This file may not be copied, modified, or distributed
|
|
|
|
// except according to those terms.
|
|
|
|
|
|
|
|
//! Support for matching file paths against Unix shell style patterns.
|
|
|
|
//!
|
|
|
|
//! The `glob` and `glob_with` functions allow querying the filesystem for all
|
|
|
|
//! files that match a particular pattern (similar to the libc `glob` function).
|
|
|
|
//! The methods on the `Pattern` type provide functionality for checking if
|
|
|
|
//! individual paths match a particular pattern (similar to the libc `fnmatch`
|
|
|
|
//! function).
|
|
|
|
//!
|
|
|
|
//! For consistency across platforms, and for Windows support, this module
|
|
|
|
//! is implemented entirely in Rust rather than deferring to the libc
|
|
|
|
//! `glob`/`fnmatch` functions.
|
|
|
|
//!
|
|
|
|
//! # Examples
|
|
|
|
//!
|
|
|
|
//! To print all jpg files in `/media/` and all of its subdirectories.
|
|
|
|
//!
|
|
|
|
//! ```rust,no_run
|
|
|
|
//! use nu_glob::glob;
|
|
|
|
//!
|
|
|
|
//! for entry in glob("/media/**/*.jpg").expect("Failed to read glob pattern") {
|
|
|
|
//! match entry {
|
|
|
|
//! Ok(path) => println!("{:?}", path.display()),
|
|
|
|
//! Err(e) => println!("{:?}", e),
|
|
|
|
//! }
|
|
|
|
//! }
|
|
|
|
//! ```
|
|
|
|
//!
|
|
|
|
//! To print all files containing the letter "a", case insensitive, in a `local`
|
|
|
|
//! directory relative to the current working directory. This ignores errors
|
|
|
|
//! instead of printing them.
|
|
|
|
//!
|
|
|
|
//! ```rust,no_run
|
|
|
|
//! use nu_glob::glob_with;
|
|
|
|
//! use nu_glob::MatchOptions;
|
|
|
|
//!
|
|
|
|
//! let options = MatchOptions {
|
|
|
|
//! case_sensitive: false,
|
|
|
|
//! require_literal_separator: false,
|
|
|
|
//! require_literal_leading_dot: false,
|
2022-05-31 02:13:27 +02:00
|
|
|
//! recursive_match_hidden_dir: true,
|
2022-03-13 19:30:27 +01:00
|
|
|
//! };
|
|
|
|
//! for entry in glob_with("local/*a*", options).unwrap() {
|
|
|
|
//! if let Ok(path) = entry {
|
|
|
|
//! println!("{:?}", path.display())
|
|
|
|
//! }
|
|
|
|
//! }
|
|
|
|
//! ```
|
|
|
|
|
|
|
|
#![doc(
|
|
|
|
html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
|
|
|
|
html_favicon_url = "https://www.rust-lang.org/favicon.ico",
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
html_root_url = "https://docs.rs/glob/0.3.1"
|
2022-03-13 19:30:27 +01:00
|
|
|
)]
|
|
|
|
#![deny(missing_docs)]
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
#[macro_use]
|
|
|
|
extern crate doc_comment;
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
doctest!("../README.md");
|
|
|
|
|
|
|
|
use std::cmp;
|
2024-03-11 19:46:04 +01:00
|
|
|
use std::cmp::Ordering;
|
2022-03-13 19:30:27 +01:00
|
|
|
use std::error::Error;
|
|
|
|
use std::fmt;
|
|
|
|
use std::fs;
|
|
|
|
use std::io;
|
|
|
|
use std::path::{self, Component, Path, PathBuf};
|
|
|
|
use std::str::FromStr;
|
|
|
|
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
use CharSpecifier::{CharRange, SingleChar};
|
2022-03-13 19:30:27 +01:00
|
|
|
use MatchResult::{EntirePatternDoesntMatch, Match, SubPatternDoesntMatch};
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
use PatternToken::AnyExcept;
|
|
|
|
use PatternToken::{AnyChar, AnyRecursiveSequence, AnySequence, AnyWithin, Char};
|
2022-03-13 19:30:27 +01:00
|
|
|
|
|
|
|
/// An iterator that yields `Path`s from the filesystem that match a particular
|
|
|
|
/// pattern.
|
|
|
|
///
|
|
|
|
/// Note that it yields `GlobResult` in order to report any `IoErrors` that may
|
|
|
|
/// arise during iteration. If a directory matches but is unreadable,
|
|
|
|
/// thereby preventing its contents from being checked for matches, a
|
|
|
|
/// `GlobError` is returned to express this.
|
|
|
|
///
|
|
|
|
/// See the `glob` function for more details.
|
|
|
|
#[derive(Debug)]
|
|
|
|
pub struct Paths {
|
|
|
|
dir_patterns: Vec<Pattern>,
|
|
|
|
require_dir: bool,
|
|
|
|
options: MatchOptions,
|
|
|
|
todo: Vec<Result<(PathBuf, usize), GlobError>>,
|
|
|
|
scope: Option<PathBuf>,
|
|
|
|
}
|
|
|
|
|
Allow filesystem commands to access files with glob metachars in name (#10694)
(squashed version of #10557, clean commit history and review thread)
Fixes #10571, also potentially: #10364, #10211, #9558, #9310,
# Description
Changes processing of arguments to filesystem commands that are source
paths or globs.
Applies to `cp, cp-old, mv, rm, du` but not `ls` (because it uses a
different globbing interface) or `glob` (because it uses a different
globbing library).
The core of the change is to lookup the argument first as a file and
only glob if it is not. That way,
a path containing glob metacharacters can be referenced without glob
quoting, though it will have to be single quoted to avoid nushell
parsing.
Before: A file path that looks like a glob is not matched by the glob
specified as a (source) argument and takes some thinking about to
access. You might say the glob pattern shadows a file with the same
spelling.
```
> ls a*
╭───┬────────┬──────┬──────┬────────────────╮
│ # │ name │ type │ size │ modified │
├───┼────────┼──────┼──────┼────────────────┤
│ 0 │ a[bc]d │ file │ 0 B │ 34 seconds ago │
│ 1 │ abd │ file │ 0 B │ now │
│ 2 │ acd │ file │ 0 B │ now │
╰───┴────────┴──────┴──────┴────────────────╯
> cp --verbose 'a[bc]d' dest
copied /home/bobhy/src/rust/work/r4/abd to /home/bobhy/src/rust/work/r4/dest/abd
copied /home/bobhy/src/rust/work/r4/acd to /home/bobhy/src/rust/work/r4/dest/acd
> ## Note -- a[bc]d *not* copied, and seemingly hard to access.
> cp --verbose 'a\[bc\]d' dest
Error: × No matches found
╭─[entry #33:1:1]
1 │ cp --verbose 'a\[bc\]d' dest
· ─────┬────
· ╰── no matches found
╰────
> #.. but is accessible with enough glob quoting.
> cp --verbose 'a[[]bc[]]d' dest
copied /home/bobhy/src/rust/work/r4/a[bc]d to /home/bobhy/src/rust/work/r4/dest/a[bc]d
```
Before_2: if file has glob metachars but isn't a valid pattern, user
gets a confusing error:
```
> touch 'a[b'
> cp 'a[b' dest
Error: × Pattern syntax error near position 30: invalid range pattern
╭─[entry #13:1:1]
1 │ cp 'a[b' dest
· ──┬──
· ╰── invalid pattern
╰────
```
After: Args to cp, mv, etc. are tried first as literal files, and only
as globs if not found to be files.
```
> cp --verbose 'a[bc]d' dest
copied /home/bobhy/src/rust/work/r4/a[bc]d to /home/bobhy/src/rust/work/r4/dest/a[bc]d
> cp --verbose '[a][bc]d' dest
copied /home/bobhy/src/rust/work/r4/abd to /home/bobhy/src/rust/work/r4/dest/abd
copied /home/bobhy/src/rust/work/r4/acd to /home/bobhy/src/rust/work/r4/dest/acd
```
After_2: file with glob metachars but invalid pattern just works.
(though Windows does not allow file name to contain `*`.).
```
> cp --verbose 'a[b' dest
copied /home/bobhy/src/rust/work/r4/a[b to /home/bobhy/src/rust/work/r4/dest/a[b
```
So, with this fix, a file shadows a glob pattern with the same spelling.
If you have such a file and really want to use the glob pattern, you
will have to glob quote some of the characters in the pattern. I think
that's less confusing to the user: if ls shows a file with a weird name,
s/he'll still be able to copy, rename or delete it.
# User-Facing Changes
Could break some existing scripts. If user happened to have a file with
a globbish name but was using a glob pattern with the same spelling, the
new version will process the file and not expand the glob.
# 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 std testing; testing run-tests --path
crates/nu-std"` 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
> ```
-->
# 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.
-->
---------
Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
2023-10-18 20:31:15 +02:00
|
|
|
impl Paths {
|
|
|
|
/// An iterator representing a single path.
|
|
|
|
pub fn single(path: &Path, relative_to: &Path) -> Self {
|
|
|
|
Paths {
|
|
|
|
dir_patterns: vec![Pattern::new("*").expect("hard coded pattern")],
|
|
|
|
require_dir: false,
|
|
|
|
options: MatchOptions::default(),
|
|
|
|
todo: vec![Ok((path.to_path_buf(), 0))],
|
|
|
|
scope: Some(relative_to.into()),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-03-13 19:30:27 +01:00
|
|
|
/// Return an iterator that produces all the `Path`s that match the given
|
|
|
|
/// pattern using default match options, which may be absolute or relative to
|
|
|
|
/// the current working directory.
|
|
|
|
///
|
|
|
|
/// This may return an error if the pattern is invalid.
|
|
|
|
///
|
|
|
|
/// This method uses the default match options and is equivalent to calling
|
Allow filesystem commands to access files with glob metachars in name (#10694)
(squashed version of #10557, clean commit history and review thread)
Fixes #10571, also potentially: #10364, #10211, #9558, #9310,
# Description
Changes processing of arguments to filesystem commands that are source
paths or globs.
Applies to `cp, cp-old, mv, rm, du` but not `ls` (because it uses a
different globbing interface) or `glob` (because it uses a different
globbing library).
The core of the change is to lookup the argument first as a file and
only glob if it is not. That way,
a path containing glob metacharacters can be referenced without glob
quoting, though it will have to be single quoted to avoid nushell
parsing.
Before: A file path that looks like a glob is not matched by the glob
specified as a (source) argument and takes some thinking about to
access. You might say the glob pattern shadows a file with the same
spelling.
```
> ls a*
╭───┬────────┬──────┬──────┬────────────────╮
│ # │ name │ type │ size │ modified │
├───┼────────┼──────┼──────┼────────────────┤
│ 0 │ a[bc]d │ file │ 0 B │ 34 seconds ago │
│ 1 │ abd │ file │ 0 B │ now │
│ 2 │ acd │ file │ 0 B │ now │
╰───┴────────┴──────┴──────┴────────────────╯
> cp --verbose 'a[bc]d' dest
copied /home/bobhy/src/rust/work/r4/abd to /home/bobhy/src/rust/work/r4/dest/abd
copied /home/bobhy/src/rust/work/r4/acd to /home/bobhy/src/rust/work/r4/dest/acd
> ## Note -- a[bc]d *not* copied, and seemingly hard to access.
> cp --verbose 'a\[bc\]d' dest
Error: × No matches found
╭─[entry #33:1:1]
1 │ cp --verbose 'a\[bc\]d' dest
· ─────┬────
· ╰── no matches found
╰────
> #.. but is accessible with enough glob quoting.
> cp --verbose 'a[[]bc[]]d' dest
copied /home/bobhy/src/rust/work/r4/a[bc]d to /home/bobhy/src/rust/work/r4/dest/a[bc]d
```
Before_2: if file has glob metachars but isn't a valid pattern, user
gets a confusing error:
```
> touch 'a[b'
> cp 'a[b' dest
Error: × Pattern syntax error near position 30: invalid range pattern
╭─[entry #13:1:1]
1 │ cp 'a[b' dest
· ──┬──
· ╰── invalid pattern
╰────
```
After: Args to cp, mv, etc. are tried first as literal files, and only
as globs if not found to be files.
```
> cp --verbose 'a[bc]d' dest
copied /home/bobhy/src/rust/work/r4/a[bc]d to /home/bobhy/src/rust/work/r4/dest/a[bc]d
> cp --verbose '[a][bc]d' dest
copied /home/bobhy/src/rust/work/r4/abd to /home/bobhy/src/rust/work/r4/dest/abd
copied /home/bobhy/src/rust/work/r4/acd to /home/bobhy/src/rust/work/r4/dest/acd
```
After_2: file with glob metachars but invalid pattern just works.
(though Windows does not allow file name to contain `*`.).
```
> cp --verbose 'a[b' dest
copied /home/bobhy/src/rust/work/r4/a[b to /home/bobhy/src/rust/work/r4/dest/a[b
```
So, with this fix, a file shadows a glob pattern with the same spelling.
If you have such a file and really want to use the glob pattern, you
will have to glob quote some of the characters in the pattern. I think
that's less confusing to the user: if ls shows a file with a weird name,
s/he'll still be able to copy, rename or delete it.
# User-Facing Changes
Could break some existing scripts. If user happened to have a file with
a globbish name but was using a glob pattern with the same spelling, the
new version will process the file and not expand the glob.
# 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 std testing; testing run-tests --path
crates/nu-std"` 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
> ```
-->
# 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.
-->
---------
Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
2023-10-18 20:31:15 +02:00
|
|
|
/// `glob_with(pattern, MatchOptions::default())`. Use `glob_with` directly if you
|
2022-03-13 19:30:27 +01:00
|
|
|
/// want to use non-default match options.
|
|
|
|
///
|
|
|
|
/// When iterating, each result is a `GlobResult` which expresses the
|
|
|
|
/// possibility that there was an `IoError` when attempting to read the contents
|
|
|
|
/// of the matched path. In other words, each item returned by the iterator
|
|
|
|
/// will either be an `Ok(Path)` if the path matched, or an `Err(GlobError)` if
|
|
|
|
/// the path (partially) matched _but_ its contents could not be read in order
|
|
|
|
/// to determine if its contents matched.
|
|
|
|
///
|
|
|
|
/// See the `Paths` documentation for more information.
|
|
|
|
///
|
|
|
|
/// # Examples
|
|
|
|
///
|
|
|
|
/// Consider a directory `/media/pictures` containing only the files
|
|
|
|
/// `kittens.jpg`, `puppies.jpg` and `hamsters.gif`:
|
|
|
|
///
|
|
|
|
/// ```rust,no_run
|
|
|
|
/// use nu_glob::glob;
|
|
|
|
///
|
|
|
|
/// for entry in glob("/media/pictures/*.jpg").unwrap() {
|
|
|
|
/// match entry {
|
|
|
|
/// Ok(path) => println!("{:?}", path.display()),
|
|
|
|
///
|
|
|
|
/// // if the path matched but was unreadable,
|
|
|
|
/// // thereby preventing its contents from matching
|
|
|
|
/// Err(e) => println!("{:?}", e),
|
|
|
|
/// }
|
|
|
|
/// }
|
|
|
|
/// ```
|
|
|
|
///
|
|
|
|
/// The above code will print:
|
|
|
|
///
|
|
|
|
/// ```ignore
|
|
|
|
/// /media/pictures/kittens.jpg
|
|
|
|
/// /media/pictures/puppies.jpg
|
|
|
|
/// ```
|
|
|
|
///
|
|
|
|
/// If you want to ignore unreadable paths, you can use something like
|
|
|
|
/// `filter_map`:
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// use nu_glob::glob;
|
|
|
|
/// use std::result::Result;
|
|
|
|
///
|
|
|
|
/// for path in glob("/media/pictures/*.jpg").unwrap().filter_map(Result::ok) {
|
|
|
|
/// println!("{}", path.display());
|
|
|
|
/// }
|
|
|
|
/// ```
|
|
|
|
/// Paths are yielded in alphabetical order.
|
|
|
|
pub fn glob(pattern: &str) -> Result<Paths, PatternError> {
|
2023-10-09 16:31:15 +02:00
|
|
|
glob_with(pattern, MatchOptions::default())
|
2022-03-13 19:30:27 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Return an iterator that produces all the `Path`s that match the given
|
|
|
|
/// pattern using the specified match options, which may be absolute or relative
|
|
|
|
/// to the current working directory.
|
|
|
|
///
|
|
|
|
/// This may return an error if the pattern is invalid.
|
|
|
|
///
|
|
|
|
/// This function accepts Unix shell style patterns as described by
|
|
|
|
/// `Pattern::new(..)`. The options given are passed through unchanged to
|
|
|
|
/// `Pattern::matches_with(..)` with the exception that
|
|
|
|
/// `require_literal_separator` is always set to `true` regardless of the value
|
|
|
|
/// passed to this function.
|
|
|
|
///
|
|
|
|
/// Paths are yielded in alphabetical order.
|
|
|
|
pub fn glob_with(pattern: &str, options: MatchOptions) -> Result<Paths, PatternError> {
|
|
|
|
#[cfg(windows)]
|
|
|
|
fn check_windows_verbatim(p: &Path) -> bool {
|
|
|
|
match p.components().next() {
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
Some(Component::Prefix(ref p)) => {
|
|
|
|
// Allow VerbatimDisk paths. std canonicalize() generates them, and they work fine
|
|
|
|
p.kind().is_verbatim() && !matches!(p.kind(), std::path::Prefix::VerbatimDisk(_))
|
|
|
|
}
|
2022-03-13 19:30:27 +01:00
|
|
|
_ => false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#[cfg(not(windows))]
|
|
|
|
fn check_windows_verbatim(_: &Path) -> bool {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(windows)]
|
|
|
|
fn to_scope(p: &Path) -> PathBuf {
|
|
|
|
// FIXME handle volume relative paths here
|
|
|
|
p.to_path_buf()
|
|
|
|
}
|
|
|
|
#[cfg(not(windows))]
|
|
|
|
fn to_scope(p: &Path) -> PathBuf {
|
|
|
|
p.to_path_buf()
|
|
|
|
}
|
|
|
|
|
|
|
|
// make sure that the pattern is valid first, else early return with error
|
2022-09-26 19:29:25 +02:00
|
|
|
Pattern::new(pattern)?;
|
2022-03-13 19:30:27 +01:00
|
|
|
|
|
|
|
let mut components = Path::new(pattern).components().peekable();
|
|
|
|
while let Some(&Component::Prefix(..)) | Some(&Component::RootDir) = components.peek() {
|
|
|
|
components.next();
|
|
|
|
}
|
|
|
|
|
|
|
|
let rest = components.map(|s| s.as_os_str()).collect::<PathBuf>();
|
|
|
|
let normalized_pattern = Path::new(pattern).iter().collect::<PathBuf>();
|
|
|
|
let root_len = normalized_pattern
|
|
|
|
.to_str()
|
|
|
|
.expect("internal error: expected string")
|
|
|
|
.len()
|
|
|
|
- rest
|
|
|
|
.to_str()
|
|
|
|
.expect("internal error: expected string")
|
|
|
|
.len();
|
|
|
|
let root = if root_len > 0 {
|
|
|
|
Some(Path::new(&pattern[..root_len]))
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
};
|
|
|
|
|
|
|
|
if root_len > 0
|
|
|
|
&& check_windows_verbatim(root.expect("internal error: already checked for len > 0"))
|
|
|
|
{
|
|
|
|
// FIXME: How do we want to handle verbatim paths? I'm inclined to
|
|
|
|
// return nothing, since we can't very well find all UNC shares with a
|
|
|
|
// 1-letter server name.
|
|
|
|
return Ok(Paths {
|
|
|
|
dir_patterns: Vec::new(),
|
|
|
|
require_dir: false,
|
|
|
|
options,
|
|
|
|
todo: Vec::new(),
|
|
|
|
scope: None,
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
let scope = root.map_or_else(|| PathBuf::from("."), to_scope);
|
|
|
|
|
|
|
|
let mut dir_patterns = Vec::new();
|
|
|
|
let components =
|
|
|
|
pattern[cmp::min(root_len, pattern.len())..].split_terminator(path::is_separator);
|
|
|
|
|
|
|
|
for component in components {
|
|
|
|
dir_patterns.push(Pattern::new(component)?);
|
|
|
|
}
|
|
|
|
|
|
|
|
if root_len == pattern.len() {
|
|
|
|
dir_patterns.push(Pattern {
|
|
|
|
original: "".to_string(),
|
|
|
|
tokens: Vec::new(),
|
|
|
|
is_recursive: false,
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
let last_is_separator = pattern.chars().next_back().map(path::is_separator);
|
|
|
|
let require_dir = last_is_separator == Some(true);
|
|
|
|
let todo = Vec::new();
|
|
|
|
|
|
|
|
Ok(Paths {
|
|
|
|
dir_patterns,
|
|
|
|
require_dir,
|
|
|
|
options,
|
|
|
|
todo,
|
|
|
|
scope: Some(scope),
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
Allow filesystem commands to access files with glob metachars in name (#10694)
(squashed version of #10557, clean commit history and review thread)
Fixes #10571, also potentially: #10364, #10211, #9558, #9310,
# Description
Changes processing of arguments to filesystem commands that are source
paths or globs.
Applies to `cp, cp-old, mv, rm, du` but not `ls` (because it uses a
different globbing interface) or `glob` (because it uses a different
globbing library).
The core of the change is to lookup the argument first as a file and
only glob if it is not. That way,
a path containing glob metacharacters can be referenced without glob
quoting, though it will have to be single quoted to avoid nushell
parsing.
Before: A file path that looks like a glob is not matched by the glob
specified as a (source) argument and takes some thinking about to
access. You might say the glob pattern shadows a file with the same
spelling.
```
> ls a*
╭───┬────────┬──────┬──────┬────────────────╮
│ # │ name │ type │ size │ modified │
├───┼────────┼──────┼──────┼────────────────┤
│ 0 │ a[bc]d │ file │ 0 B │ 34 seconds ago │
│ 1 │ abd │ file │ 0 B │ now │
│ 2 │ acd │ file │ 0 B │ now │
╰───┴────────┴──────┴──────┴────────────────╯
> cp --verbose 'a[bc]d' dest
copied /home/bobhy/src/rust/work/r4/abd to /home/bobhy/src/rust/work/r4/dest/abd
copied /home/bobhy/src/rust/work/r4/acd to /home/bobhy/src/rust/work/r4/dest/acd
> ## Note -- a[bc]d *not* copied, and seemingly hard to access.
> cp --verbose 'a\[bc\]d' dest
Error: × No matches found
╭─[entry #33:1:1]
1 │ cp --verbose 'a\[bc\]d' dest
· ─────┬────
· ╰── no matches found
╰────
> #.. but is accessible with enough glob quoting.
> cp --verbose 'a[[]bc[]]d' dest
copied /home/bobhy/src/rust/work/r4/a[bc]d to /home/bobhy/src/rust/work/r4/dest/a[bc]d
```
Before_2: if file has glob metachars but isn't a valid pattern, user
gets a confusing error:
```
> touch 'a[b'
> cp 'a[b' dest
Error: × Pattern syntax error near position 30: invalid range pattern
╭─[entry #13:1:1]
1 │ cp 'a[b' dest
· ──┬──
· ╰── invalid pattern
╰────
```
After: Args to cp, mv, etc. are tried first as literal files, and only
as globs if not found to be files.
```
> cp --verbose 'a[bc]d' dest
copied /home/bobhy/src/rust/work/r4/a[bc]d to /home/bobhy/src/rust/work/r4/dest/a[bc]d
> cp --verbose '[a][bc]d' dest
copied /home/bobhy/src/rust/work/r4/abd to /home/bobhy/src/rust/work/r4/dest/abd
copied /home/bobhy/src/rust/work/r4/acd to /home/bobhy/src/rust/work/r4/dest/acd
```
After_2: file with glob metachars but invalid pattern just works.
(though Windows does not allow file name to contain `*`.).
```
> cp --verbose 'a[b' dest
copied /home/bobhy/src/rust/work/r4/a[b to /home/bobhy/src/rust/work/r4/dest/a[b
```
So, with this fix, a file shadows a glob pattern with the same spelling.
If you have such a file and really want to use the glob pattern, you
will have to glob quote some of the characters in the pattern. I think
that's less confusing to the user: if ls shows a file with a weird name,
s/he'll still be able to copy, rename or delete it.
# User-Facing Changes
Could break some existing scripts. If user happened to have a file with
a globbish name but was using a glob pattern with the same spelling, the
new version will process the file and not expand the glob.
# 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 std testing; testing run-tests --path
crates/nu-std"` 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
> ```
-->
# 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.
-->
---------
Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
2023-10-18 20:31:15 +02:00
|
|
|
/// Return an iterator that produces all the `Path`s that match the given
|
|
|
|
/// pattern relative to a specified parent directory and using specified match options.
|
|
|
|
/// Paths may be absolute or relative to the current working directory.
|
|
|
|
///
|
|
|
|
/// This is provided primarily for testability, so multithreaded test runners can
|
|
|
|
/// test pattern matches in different test directories at the same time without
|
|
|
|
/// having to append the parent to the pattern under test.
|
|
|
|
|
|
|
|
pub fn glob_with_parent(
|
|
|
|
pattern: &str,
|
|
|
|
options: MatchOptions,
|
|
|
|
parent: &Path,
|
|
|
|
) -> Result<Paths, PatternError> {
|
|
|
|
match glob_with(pattern, options) {
|
|
|
|
Ok(mut p) => {
|
|
|
|
p.scope = match p.scope {
|
|
|
|
None => Some(parent.to_path_buf()),
|
|
|
|
Some(s) if &s.to_string_lossy() == "." => Some(parent.to_path_buf()),
|
|
|
|
Some(s) => Some(s),
|
|
|
|
};
|
|
|
|
Ok(p)
|
|
|
|
}
|
|
|
|
Err(e) => Err(e),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-03-13 19:30:27 +01:00
|
|
|
/// A glob iteration error.
|
|
|
|
///
|
|
|
|
/// This is typically returned when a particular path cannot be read
|
|
|
|
/// to determine if its contents match the glob pattern. This is possible
|
|
|
|
/// if the program lacks the appropriate permissions, for example.
|
|
|
|
#[derive(Debug)]
|
|
|
|
pub struct GlobError {
|
|
|
|
path: PathBuf,
|
|
|
|
error: io::Error,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl GlobError {
|
|
|
|
/// The Path that the error corresponds to.
|
|
|
|
pub fn path(&self) -> &Path {
|
|
|
|
&self.path
|
|
|
|
}
|
|
|
|
|
|
|
|
/// The error in question.
|
|
|
|
pub fn error(&self) -> &io::Error {
|
|
|
|
&self.error
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Consumes self, returning the _raw_ underlying `io::Error`
|
|
|
|
pub fn into_error(self) -> io::Error {
|
|
|
|
self.error
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Error for GlobError {
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
#[allow(deprecated)]
|
|
|
|
fn description(&self) -> &str {
|
|
|
|
self.error.description()
|
|
|
|
}
|
|
|
|
|
2022-03-13 19:30:27 +01:00
|
|
|
fn cause(&self) -> Option<&dyn Error> {
|
|
|
|
Some(&self.error)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl fmt::Display for GlobError {
|
|
|
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
|
|
|
write!(
|
|
|
|
f,
|
|
|
|
"attempting to read `{}` resulted in an error: {}",
|
|
|
|
self.path.display(),
|
|
|
|
self.error
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn is_dir(p: &Path) -> bool {
|
|
|
|
fs::metadata(p).map(|m| m.is_dir()).unwrap_or(false)
|
|
|
|
}
|
|
|
|
|
|
|
|
/// An alias for a glob iteration result.
|
|
|
|
///
|
|
|
|
/// This represents either a matched path or a glob iteration error,
|
|
|
|
/// such as failing to read a particular directory's contents.
|
|
|
|
pub type GlobResult = Result<PathBuf, GlobError>;
|
|
|
|
|
|
|
|
impl Iterator for Paths {
|
|
|
|
type Item = GlobResult;
|
|
|
|
|
|
|
|
fn next(&mut self) -> Option<GlobResult> {
|
|
|
|
// the todo buffer hasn't been initialized yet, so it's done at this
|
|
|
|
// point rather than in glob() so that the errors are unified that is,
|
|
|
|
// failing to fill the buffer is an iteration error construction of the
|
|
|
|
// iterator (i.e. glob()) only fails if it fails to compile the Pattern
|
|
|
|
if let Some(scope) = self.scope.take() {
|
|
|
|
if !self.dir_patterns.is_empty() {
|
|
|
|
// Shouldn't happen, but we're using -1 as a special index.
|
2022-11-04 21:11:17 +01:00
|
|
|
assert!(self.dir_patterns.len() < !0);
|
2022-03-13 19:30:27 +01:00
|
|
|
|
Allow filesystem commands to access files with glob metachars in name (#10694)
(squashed version of #10557, clean commit history and review thread)
Fixes #10571, also potentially: #10364, #10211, #9558, #9310,
# Description
Changes processing of arguments to filesystem commands that are source
paths or globs.
Applies to `cp, cp-old, mv, rm, du` but not `ls` (because it uses a
different globbing interface) or `glob` (because it uses a different
globbing library).
The core of the change is to lookup the argument first as a file and
only glob if it is not. That way,
a path containing glob metacharacters can be referenced without glob
quoting, though it will have to be single quoted to avoid nushell
parsing.
Before: A file path that looks like a glob is not matched by the glob
specified as a (source) argument and takes some thinking about to
access. You might say the glob pattern shadows a file with the same
spelling.
```
> ls a*
╭───┬────────┬──────┬──────┬────────────────╮
│ # │ name │ type │ size │ modified │
├───┼────────┼──────┼──────┼────────────────┤
│ 0 │ a[bc]d │ file │ 0 B │ 34 seconds ago │
│ 1 │ abd │ file │ 0 B │ now │
│ 2 │ acd │ file │ 0 B │ now │
╰───┴────────┴──────┴──────┴────────────────╯
> cp --verbose 'a[bc]d' dest
copied /home/bobhy/src/rust/work/r4/abd to /home/bobhy/src/rust/work/r4/dest/abd
copied /home/bobhy/src/rust/work/r4/acd to /home/bobhy/src/rust/work/r4/dest/acd
> ## Note -- a[bc]d *not* copied, and seemingly hard to access.
> cp --verbose 'a\[bc\]d' dest
Error: × No matches found
╭─[entry #33:1:1]
1 │ cp --verbose 'a\[bc\]d' dest
· ─────┬────
· ╰── no matches found
╰────
> #.. but is accessible with enough glob quoting.
> cp --verbose 'a[[]bc[]]d' dest
copied /home/bobhy/src/rust/work/r4/a[bc]d to /home/bobhy/src/rust/work/r4/dest/a[bc]d
```
Before_2: if file has glob metachars but isn't a valid pattern, user
gets a confusing error:
```
> touch 'a[b'
> cp 'a[b' dest
Error: × Pattern syntax error near position 30: invalid range pattern
╭─[entry #13:1:1]
1 │ cp 'a[b' dest
· ──┬──
· ╰── invalid pattern
╰────
```
After: Args to cp, mv, etc. are tried first as literal files, and only
as globs if not found to be files.
```
> cp --verbose 'a[bc]d' dest
copied /home/bobhy/src/rust/work/r4/a[bc]d to /home/bobhy/src/rust/work/r4/dest/a[bc]d
> cp --verbose '[a][bc]d' dest
copied /home/bobhy/src/rust/work/r4/abd to /home/bobhy/src/rust/work/r4/dest/abd
copied /home/bobhy/src/rust/work/r4/acd to /home/bobhy/src/rust/work/r4/dest/acd
```
After_2: file with glob metachars but invalid pattern just works.
(though Windows does not allow file name to contain `*`.).
```
> cp --verbose 'a[b' dest
copied /home/bobhy/src/rust/work/r4/a[b to /home/bobhy/src/rust/work/r4/dest/a[b
```
So, with this fix, a file shadows a glob pattern with the same spelling.
If you have such a file and really want to use the glob pattern, you
will have to glob quote some of the characters in the pattern. I think
that's less confusing to the user: if ls shows a file with a weird name,
s/he'll still be able to copy, rename or delete it.
# User-Facing Changes
Could break some existing scripts. If user happened to have a file with
a globbish name but was using a glob pattern with the same spelling, the
new version will process the file and not expand the glob.
# 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 std testing; testing run-tests --path
crates/nu-std"` 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
> ```
-->
# 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.
-->
---------
Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
2023-10-18 20:31:15 +02:00
|
|
|
// if there's one prefilled result, take it, otherwise fill the todo buffer
|
|
|
|
if self.todo.len() != 1 {
|
|
|
|
fill_todo(&mut self.todo, &self.dir_patterns, 0, &scope, self.options);
|
|
|
|
}
|
2022-03-13 19:30:27 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
loop {
|
|
|
|
if self.dir_patterns.is_empty() || self.todo.is_empty() {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
|
|
|
let (path, mut idx) = match self
|
|
|
|
.todo
|
|
|
|
.pop()
|
|
|
|
.expect("internal error: already checked for non-empty")
|
|
|
|
{
|
|
|
|
Ok(pair) => pair,
|
|
|
|
Err(e) => return Some(Err(e)),
|
|
|
|
};
|
|
|
|
|
|
|
|
// idx -1: was already checked by fill_todo, maybe path was '.' or
|
|
|
|
// '..' that we can't match here because of normalization.
|
2022-11-04 21:11:17 +01:00
|
|
|
if idx == !0 {
|
2022-03-13 19:30:27 +01:00
|
|
|
if self.require_dir && !is_dir(&path) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
return Some(Ok(path));
|
|
|
|
}
|
|
|
|
|
|
|
|
if self.dir_patterns[idx].is_recursive {
|
|
|
|
let mut next = idx;
|
|
|
|
|
|
|
|
// collapse consecutive recursive patterns
|
|
|
|
while (next + 1) < self.dir_patterns.len()
|
|
|
|
&& self.dir_patterns[next + 1].is_recursive
|
|
|
|
{
|
|
|
|
next += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if is_dir(&path) {
|
2022-05-31 02:13:27 +02:00
|
|
|
// the path is a directory, check if matched according
|
|
|
|
// to `hidden_dir_recursive` option.
|
|
|
|
if !self.options.recursive_match_hidden_dir
|
|
|
|
&& path
|
|
|
|
.file_name()
|
|
|
|
.map(|name| name.to_string_lossy().starts_with('.'))
|
|
|
|
.unwrap_or(false)
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
2022-03-13 19:30:27 +01:00
|
|
|
|
|
|
|
// push this directory's contents
|
|
|
|
fill_todo(
|
|
|
|
&mut self.todo,
|
|
|
|
&self.dir_patterns,
|
|
|
|
next,
|
|
|
|
&path,
|
|
|
|
self.options,
|
|
|
|
);
|
|
|
|
|
|
|
|
if next == self.dir_patterns.len() - 1 {
|
|
|
|
// pattern ends in recursive pattern, so return this
|
|
|
|
// directory as a result
|
|
|
|
return Some(Ok(path));
|
|
|
|
} else {
|
|
|
|
// advanced to the next pattern for this path
|
|
|
|
idx = next + 1;
|
|
|
|
}
|
|
|
|
} else if next == self.dir_patterns.len() - 1 {
|
|
|
|
// not a directory and it's the last pattern, meaning no
|
|
|
|
// match
|
|
|
|
continue;
|
|
|
|
} else {
|
|
|
|
// advanced to the next pattern for this path
|
|
|
|
idx = next + 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// not recursive, so match normally
|
|
|
|
if self.dir_patterns[idx].matches_with(
|
|
|
|
{
|
|
|
|
match path.file_name().and_then(|s| s.to_str()) {
|
|
|
|
// FIXME (#9639): How do we handle non-utf8 filenames?
|
|
|
|
// Ignore them for now; ideally we'd still match them
|
|
|
|
// against a *
|
2022-06-07 15:22:52 +02:00
|
|
|
None => {
|
|
|
|
println!("warning: get non-utf8 filename {path:?}, ignored.");
|
|
|
|
continue;
|
|
|
|
}
|
2022-03-13 19:30:27 +01:00
|
|
|
Some(x) => x,
|
|
|
|
}
|
|
|
|
},
|
|
|
|
self.options,
|
|
|
|
) {
|
|
|
|
if idx == self.dir_patterns.len() - 1 {
|
|
|
|
// it is not possible for a pattern to match a directory
|
|
|
|
// *AND* its children so we don't need to check the
|
|
|
|
// children
|
|
|
|
|
|
|
|
if !self.require_dir || is_dir(&path) {
|
|
|
|
return Some(Ok(path));
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
fill_todo(
|
|
|
|
&mut self.todo,
|
|
|
|
&self.dir_patterns,
|
|
|
|
idx + 1,
|
|
|
|
&path,
|
|
|
|
self.options,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// A pattern parsing error.
|
|
|
|
#[derive(Debug)]
|
|
|
|
pub struct PatternError {
|
|
|
|
/// The approximate character index of where the error occurred.
|
|
|
|
pub pos: usize,
|
|
|
|
|
|
|
|
/// A message describing the error.
|
|
|
|
pub msg: &'static str,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Error for PatternError {
|
|
|
|
fn description(&self) -> &str {
|
|
|
|
self.msg
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl fmt::Display for PatternError {
|
|
|
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
|
|
|
write!(
|
|
|
|
f,
|
|
|
|
"Pattern syntax error near position {}: {}",
|
|
|
|
self.pos, self.msg
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// A compiled Unix shell style pattern.
|
|
|
|
///
|
|
|
|
/// - `?` matches any single character.
|
|
|
|
///
|
|
|
|
/// - `*` matches any (possibly empty) sequence of characters.
|
|
|
|
///
|
|
|
|
/// - `**` matches the current directory and arbitrary subdirectories. This
|
|
|
|
/// sequence **must** form a single path component, so both `**a` and `b**`
|
|
|
|
/// are invalid and will result in an error. A sequence of more than two
|
|
|
|
/// consecutive `*` characters is also invalid.
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
///
|
|
|
|
/// - `[...]` matches any character inside the brackets. Character sequences
|
|
|
|
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
|
|
|
|
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
|
|
|
|
/// bracket is invalid.
|
|
|
|
///
|
|
|
|
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
|
|
|
|
/// **not** in the brackets.
|
|
|
|
///
|
|
|
|
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
|
|
|
|
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
|
|
|
|
/// is interpreted as being part of, rather then ending, the character set, so
|
|
|
|
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
|
|
|
|
/// character can be specified inside a character sequence pattern by placing
|
|
|
|
/// it at the start or the end, e.g. `[abc-]`.
|
2022-03-13 19:30:27 +01:00
|
|
|
#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Default, Debug)]
|
|
|
|
pub struct Pattern {
|
|
|
|
original: String,
|
|
|
|
tokens: Vec<PatternToken>,
|
|
|
|
is_recursive: bool,
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Show the original glob pattern.
|
|
|
|
impl fmt::Display for Pattern {
|
|
|
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
|
|
|
self.original.fmt(f)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl FromStr for Pattern {
|
|
|
|
type Err = PatternError;
|
|
|
|
|
|
|
|
fn from_str(s: &str) -> Result<Self, PatternError> {
|
|
|
|
Self::new(s)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
|
|
|
|
enum PatternToken {
|
|
|
|
Char(char),
|
|
|
|
AnyChar,
|
|
|
|
AnySequence,
|
|
|
|
AnyRecursiveSequence,
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
AnyWithin(Vec<CharSpecifier>),
|
|
|
|
AnyExcept(Vec<CharSpecifier>),
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
|
|
|
|
enum CharSpecifier {
|
|
|
|
SingleChar(char),
|
|
|
|
CharRange(char, char),
|
2022-03-13 19:30:27 +01:00
|
|
|
}
|
|
|
|
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
#[derive(Copy, Clone, PartialEq)]
|
2022-03-13 19:30:27 +01:00
|
|
|
enum MatchResult {
|
|
|
|
Match,
|
|
|
|
SubPatternDoesntMatch,
|
|
|
|
EntirePatternDoesntMatch,
|
|
|
|
}
|
|
|
|
|
|
|
|
const ERROR_WILDCARDS: &str = "wildcards are either regular `*` or recursive `**`";
|
|
|
|
const ERROR_RECURSIVE_WILDCARDS: &str = "recursive wildcards must form a single path \
|
|
|
|
component";
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
const ERROR_INVALID_RANGE: &str = "invalid range pattern";
|
2022-03-13 19:30:27 +01:00
|
|
|
|
|
|
|
impl Pattern {
|
|
|
|
/// This function compiles Unix shell style patterns.
|
|
|
|
///
|
|
|
|
/// An invalid glob pattern will yield a `PatternError`.
|
|
|
|
pub fn new(pattern: &str) -> Result<Self, PatternError> {
|
|
|
|
let chars = pattern.chars().collect::<Vec<_>>();
|
|
|
|
let mut tokens = Vec::new();
|
|
|
|
let mut is_recursive = false;
|
|
|
|
let mut i = 0;
|
|
|
|
|
|
|
|
while i < chars.len() {
|
|
|
|
match chars[i] {
|
|
|
|
'?' => {
|
|
|
|
tokens.push(AnyChar);
|
|
|
|
i += 1;
|
|
|
|
}
|
|
|
|
'*' => {
|
|
|
|
let old = i;
|
|
|
|
|
|
|
|
while i < chars.len() && chars[i] == '*' {
|
|
|
|
i += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
let count = i - old;
|
|
|
|
|
2024-03-11 19:46:04 +01:00
|
|
|
match count.cmp(&2) {
|
|
|
|
Ordering::Greater => {
|
|
|
|
return Err(PatternError {
|
|
|
|
pos: old + 2,
|
|
|
|
msg: ERROR_WILDCARDS,
|
|
|
|
});
|
|
|
|
}
|
|
|
|
Ordering::Equal => {
|
|
|
|
// ** can only be an entire path component
|
|
|
|
// i.e. a/**/b is valid, but a**/b or a/**b is not
|
|
|
|
// invalid matches are treated literally
|
|
|
|
let is_valid = if i == 2 || path::is_separator(chars[i - count - 1]) {
|
|
|
|
// it ends in a '/'
|
|
|
|
if i < chars.len() && path::is_separator(chars[i]) {
|
|
|
|
i += 1;
|
|
|
|
true
|
|
|
|
// or the pattern ends here
|
|
|
|
// this enables the existing globbing mechanism
|
|
|
|
} else if i == chars.len() {
|
|
|
|
true
|
|
|
|
// `**` ends in non-separator
|
|
|
|
} else {
|
|
|
|
return Err(PatternError {
|
|
|
|
pos: i,
|
|
|
|
msg: ERROR_RECURSIVE_WILDCARDS,
|
|
|
|
});
|
|
|
|
}
|
|
|
|
// `**` begins with non-separator
|
2022-03-13 19:30:27 +01:00
|
|
|
} else {
|
|
|
|
return Err(PatternError {
|
2024-03-11 19:46:04 +01:00
|
|
|
pos: old - 1,
|
2022-03-13 19:30:27 +01:00
|
|
|
msg: ERROR_RECURSIVE_WILDCARDS,
|
|
|
|
});
|
2024-03-11 19:46:04 +01:00
|
|
|
};
|
2022-03-13 19:30:27 +01:00
|
|
|
|
2024-03-11 19:46:04 +01:00
|
|
|
if is_valid {
|
|
|
|
// collapse consecutive AnyRecursiveSequence to a
|
|
|
|
// single one
|
2022-03-13 19:30:27 +01:00
|
|
|
|
2024-03-11 19:46:04 +01:00
|
|
|
let tokens_len = tokens.len();
|
2022-03-13 19:30:27 +01:00
|
|
|
|
2024-03-11 19:46:04 +01:00
|
|
|
if !(tokens_len > 1
|
|
|
|
&& tokens[tokens_len - 1] == AnyRecursiveSequence)
|
|
|
|
{
|
|
|
|
is_recursive = true;
|
|
|
|
tokens.push(AnyRecursiveSequence);
|
|
|
|
}
|
2022-03-13 19:30:27 +01:00
|
|
|
}
|
|
|
|
}
|
2024-03-11 19:46:04 +01:00
|
|
|
Ordering::Less => {
|
|
|
|
tokens.push(AnySequence);
|
|
|
|
}
|
2022-03-13 19:30:27 +01:00
|
|
|
}
|
|
|
|
}
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
'[' => {
|
|
|
|
if i + 4 <= chars.len() && chars[i + 1] == '!' {
|
|
|
|
match chars[i + 3..].iter().position(|x| *x == ']') {
|
|
|
|
None => (),
|
|
|
|
Some(j) => {
|
|
|
|
let chars = &chars[i + 2..i + 3 + j];
|
|
|
|
let cs = parse_char_specifiers(chars);
|
|
|
|
tokens.push(AnyExcept(cs));
|
|
|
|
i += j + 4;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if i + 3 <= chars.len() && chars[i + 1] != '!' {
|
|
|
|
match chars[i + 2..].iter().position(|x| *x == ']') {
|
|
|
|
None => (),
|
|
|
|
Some(j) => {
|
|
|
|
let cs = parse_char_specifiers(&chars[i + 1..i + 2 + j]);
|
|
|
|
tokens.push(AnyWithin(cs));
|
|
|
|
i += j + 3;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// if we get here then this is not a valid range pattern
|
|
|
|
return Err(PatternError {
|
|
|
|
pos: i,
|
|
|
|
msg: ERROR_INVALID_RANGE,
|
|
|
|
});
|
|
|
|
}
|
2022-03-13 19:30:27 +01:00
|
|
|
c => {
|
|
|
|
tokens.push(Char(c));
|
|
|
|
i += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(Self {
|
|
|
|
tokens,
|
|
|
|
original: pattern.to_string(),
|
|
|
|
is_recursive,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
/// Escape metacharacters within the given string by surrounding them in
|
|
|
|
/// brackets. The resulting string will, when compiled into a `Pattern`,
|
|
|
|
/// match the input string and nothing else.
|
|
|
|
pub fn escape(s: &str) -> String {
|
|
|
|
let mut escaped = String::new();
|
|
|
|
for c in s.chars() {
|
|
|
|
match c {
|
|
|
|
// note that ! does not need escaping because it is only special
|
|
|
|
// inside brackets
|
|
|
|
'?' | '*' | '[' | ']' => {
|
|
|
|
escaped.push('[');
|
|
|
|
escaped.push(c);
|
|
|
|
escaped.push(']');
|
|
|
|
}
|
|
|
|
c => {
|
|
|
|
escaped.push(c);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
escaped
|
|
|
|
}
|
|
|
|
|
2022-03-13 19:30:27 +01:00
|
|
|
/// Return if the given `str` matches this `Pattern` using the default
|
Allow filesystem commands to access files with glob metachars in name (#10694)
(squashed version of #10557, clean commit history and review thread)
Fixes #10571, also potentially: #10364, #10211, #9558, #9310,
# Description
Changes processing of arguments to filesystem commands that are source
paths or globs.
Applies to `cp, cp-old, mv, rm, du` but not `ls` (because it uses a
different globbing interface) or `glob` (because it uses a different
globbing library).
The core of the change is to lookup the argument first as a file and
only glob if it is not. That way,
a path containing glob metacharacters can be referenced without glob
quoting, though it will have to be single quoted to avoid nushell
parsing.
Before: A file path that looks like a glob is not matched by the glob
specified as a (source) argument and takes some thinking about to
access. You might say the glob pattern shadows a file with the same
spelling.
```
> ls a*
╭───┬────────┬──────┬──────┬────────────────╮
│ # │ name │ type │ size │ modified │
├───┼────────┼──────┼──────┼────────────────┤
│ 0 │ a[bc]d │ file │ 0 B │ 34 seconds ago │
│ 1 │ abd │ file │ 0 B │ now │
│ 2 │ acd │ file │ 0 B │ now │
╰───┴────────┴──────┴──────┴────────────────╯
> cp --verbose 'a[bc]d' dest
copied /home/bobhy/src/rust/work/r4/abd to /home/bobhy/src/rust/work/r4/dest/abd
copied /home/bobhy/src/rust/work/r4/acd to /home/bobhy/src/rust/work/r4/dest/acd
> ## Note -- a[bc]d *not* copied, and seemingly hard to access.
> cp --verbose 'a\[bc\]d' dest
Error: × No matches found
╭─[entry #33:1:1]
1 │ cp --verbose 'a\[bc\]d' dest
· ─────┬────
· ╰── no matches found
╰────
> #.. but is accessible with enough glob quoting.
> cp --verbose 'a[[]bc[]]d' dest
copied /home/bobhy/src/rust/work/r4/a[bc]d to /home/bobhy/src/rust/work/r4/dest/a[bc]d
```
Before_2: if file has glob metachars but isn't a valid pattern, user
gets a confusing error:
```
> touch 'a[b'
> cp 'a[b' dest
Error: × Pattern syntax error near position 30: invalid range pattern
╭─[entry #13:1:1]
1 │ cp 'a[b' dest
· ──┬──
· ╰── invalid pattern
╰────
```
After: Args to cp, mv, etc. are tried first as literal files, and only
as globs if not found to be files.
```
> cp --verbose 'a[bc]d' dest
copied /home/bobhy/src/rust/work/r4/a[bc]d to /home/bobhy/src/rust/work/r4/dest/a[bc]d
> cp --verbose '[a][bc]d' dest
copied /home/bobhy/src/rust/work/r4/abd to /home/bobhy/src/rust/work/r4/dest/abd
copied /home/bobhy/src/rust/work/r4/acd to /home/bobhy/src/rust/work/r4/dest/acd
```
After_2: file with glob metachars but invalid pattern just works.
(though Windows does not allow file name to contain `*`.).
```
> cp --verbose 'a[b' dest
copied /home/bobhy/src/rust/work/r4/a[b to /home/bobhy/src/rust/work/r4/dest/a[b
```
So, with this fix, a file shadows a glob pattern with the same spelling.
If you have such a file and really want to use the glob pattern, you
will have to glob quote some of the characters in the pattern. I think
that's less confusing to the user: if ls shows a file with a weird name,
s/he'll still be able to copy, rename or delete it.
# User-Facing Changes
Could break some existing scripts. If user happened to have a file with
a globbish name but was using a glob pattern with the same spelling, the
new version will process the file and not expand the glob.
# 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 std testing; testing run-tests --path
crates/nu-std"` 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
> ```
-->
# 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.
-->
---------
Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
2023-10-18 20:31:15 +02:00
|
|
|
/// match options (i.e. `MatchOptions::default()`).
|
2022-03-13 19:30:27 +01:00
|
|
|
///
|
|
|
|
/// # Examples
|
|
|
|
///
|
|
|
|
/// ```rust
|
|
|
|
/// use nu_glob::Pattern;
|
|
|
|
///
|
|
|
|
/// assert!(Pattern::new("c?t").unwrap().matches("cat"));
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
/// assert!(Pattern::new("k[!e]tteh").unwrap().matches("kitteh"));
|
2022-03-13 19:30:27 +01:00
|
|
|
/// assert!(Pattern::new("d*g").unwrap().matches("doog"));
|
|
|
|
/// ```
|
|
|
|
pub fn matches(&self, str: &str) -> bool {
|
2023-10-09 16:31:15 +02:00
|
|
|
self.matches_with(str, MatchOptions::default())
|
2022-03-13 19:30:27 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Return if the given `Path`, when converted to a `str`, matches this
|
Allow filesystem commands to access files with glob metachars in name (#10694)
(squashed version of #10557, clean commit history and review thread)
Fixes #10571, also potentially: #10364, #10211, #9558, #9310,
# Description
Changes processing of arguments to filesystem commands that are source
paths or globs.
Applies to `cp, cp-old, mv, rm, du` but not `ls` (because it uses a
different globbing interface) or `glob` (because it uses a different
globbing library).
The core of the change is to lookup the argument first as a file and
only glob if it is not. That way,
a path containing glob metacharacters can be referenced without glob
quoting, though it will have to be single quoted to avoid nushell
parsing.
Before: A file path that looks like a glob is not matched by the glob
specified as a (source) argument and takes some thinking about to
access. You might say the glob pattern shadows a file with the same
spelling.
```
> ls a*
╭───┬────────┬──────┬──────┬────────────────╮
│ # │ name │ type │ size │ modified │
├───┼────────┼──────┼──────┼────────────────┤
│ 0 │ a[bc]d │ file │ 0 B │ 34 seconds ago │
│ 1 │ abd │ file │ 0 B │ now │
│ 2 │ acd │ file │ 0 B │ now │
╰───┴────────┴──────┴──────┴────────────────╯
> cp --verbose 'a[bc]d' dest
copied /home/bobhy/src/rust/work/r4/abd to /home/bobhy/src/rust/work/r4/dest/abd
copied /home/bobhy/src/rust/work/r4/acd to /home/bobhy/src/rust/work/r4/dest/acd
> ## Note -- a[bc]d *not* copied, and seemingly hard to access.
> cp --verbose 'a\[bc\]d' dest
Error: × No matches found
╭─[entry #33:1:1]
1 │ cp --verbose 'a\[bc\]d' dest
· ─────┬────
· ╰── no matches found
╰────
> #.. but is accessible with enough glob quoting.
> cp --verbose 'a[[]bc[]]d' dest
copied /home/bobhy/src/rust/work/r4/a[bc]d to /home/bobhy/src/rust/work/r4/dest/a[bc]d
```
Before_2: if file has glob metachars but isn't a valid pattern, user
gets a confusing error:
```
> touch 'a[b'
> cp 'a[b' dest
Error: × Pattern syntax error near position 30: invalid range pattern
╭─[entry #13:1:1]
1 │ cp 'a[b' dest
· ──┬──
· ╰── invalid pattern
╰────
```
After: Args to cp, mv, etc. are tried first as literal files, and only
as globs if not found to be files.
```
> cp --verbose 'a[bc]d' dest
copied /home/bobhy/src/rust/work/r4/a[bc]d to /home/bobhy/src/rust/work/r4/dest/a[bc]d
> cp --verbose '[a][bc]d' dest
copied /home/bobhy/src/rust/work/r4/abd to /home/bobhy/src/rust/work/r4/dest/abd
copied /home/bobhy/src/rust/work/r4/acd to /home/bobhy/src/rust/work/r4/dest/acd
```
After_2: file with glob metachars but invalid pattern just works.
(though Windows does not allow file name to contain `*`.).
```
> cp --verbose 'a[b' dest
copied /home/bobhy/src/rust/work/r4/a[b to /home/bobhy/src/rust/work/r4/dest/a[b
```
So, with this fix, a file shadows a glob pattern with the same spelling.
If you have such a file and really want to use the glob pattern, you
will have to glob quote some of the characters in the pattern. I think
that's less confusing to the user: if ls shows a file with a weird name,
s/he'll still be able to copy, rename or delete it.
# User-Facing Changes
Could break some existing scripts. If user happened to have a file with
a globbish name but was using a glob pattern with the same spelling, the
new version will process the file and not expand the glob.
# 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 std testing; testing run-tests --path
crates/nu-std"` 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
> ```
-->
# 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.
-->
---------
Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
2023-10-18 20:31:15 +02:00
|
|
|
/// `Pattern` using the default match options (i.e. `MatchOptions::default()`).
|
2022-03-13 19:30:27 +01:00
|
|
|
pub fn matches_path(&self, path: &Path) -> bool {
|
|
|
|
// FIXME (#9639): This needs to handle non-utf8 paths
|
|
|
|
path.to_str().map_or(false, |s| self.matches(s))
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Return if the given `str` matches this `Pattern` using the specified
|
|
|
|
/// match options.
|
|
|
|
pub fn matches_with(&self, str: &str, options: MatchOptions) -> bool {
|
|
|
|
self.matches_from(true, str.chars(), 0, options) == Match
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Return if the given `Path`, when converted to a `str`, matches this
|
|
|
|
/// `Pattern` using the specified match options.
|
|
|
|
pub fn matches_path_with(&self, path: &Path, options: MatchOptions) -> bool {
|
|
|
|
// FIXME (#9639): This needs to handle non-utf8 paths
|
|
|
|
path.to_str()
|
|
|
|
.map_or(false, |s| self.matches_with(s, options))
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Access the original glob pattern.
|
|
|
|
pub fn as_str(&self) -> &str {
|
|
|
|
&self.original
|
|
|
|
}
|
|
|
|
|
|
|
|
fn matches_from(
|
|
|
|
&self,
|
|
|
|
mut follows_separator: bool,
|
|
|
|
mut file: std::str::Chars,
|
|
|
|
i: usize,
|
|
|
|
options: MatchOptions,
|
|
|
|
) -> MatchResult {
|
|
|
|
for (ti, token) in self.tokens[i..].iter().enumerate() {
|
|
|
|
match *token {
|
|
|
|
AnySequence | AnyRecursiveSequence => {
|
|
|
|
// ** must be at the start.
|
|
|
|
debug_assert!(match *token {
|
|
|
|
AnyRecursiveSequence => follows_separator,
|
|
|
|
_ => true,
|
|
|
|
});
|
|
|
|
|
|
|
|
// Empty match
|
|
|
|
match self.matches_from(follows_separator, file.clone(), i + ti + 1, options) {
|
|
|
|
SubPatternDoesntMatch => (), // keep trying
|
|
|
|
m => return m,
|
|
|
|
};
|
|
|
|
|
|
|
|
while let Some(c) = file.next() {
|
|
|
|
if follows_separator && options.require_literal_leading_dot && c == '.' {
|
|
|
|
return SubPatternDoesntMatch;
|
|
|
|
}
|
|
|
|
follows_separator = path::is_separator(c);
|
|
|
|
match *token {
|
|
|
|
AnyRecursiveSequence if !follows_separator => continue,
|
|
|
|
AnySequence
|
|
|
|
if options.require_literal_separator && follows_separator =>
|
|
|
|
{
|
|
|
|
return SubPatternDoesntMatch
|
|
|
|
}
|
|
|
|
_ => (),
|
|
|
|
}
|
|
|
|
match self.matches_from(
|
|
|
|
follows_separator,
|
|
|
|
file.clone(),
|
|
|
|
i + ti + 1,
|
|
|
|
options,
|
|
|
|
) {
|
|
|
|
SubPatternDoesntMatch => (), // keep trying
|
|
|
|
m => return m,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_ => {
|
|
|
|
let c = match file.next() {
|
|
|
|
Some(c) => c,
|
|
|
|
None => return EntirePatternDoesntMatch,
|
|
|
|
};
|
|
|
|
|
|
|
|
let is_sep = path::is_separator(c);
|
|
|
|
|
|
|
|
if !match *token {
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
AnyChar | AnyWithin(..) | AnyExcept(..)
|
2022-03-13 19:30:27 +01:00
|
|
|
if (options.require_literal_separator && is_sep)
|
|
|
|
|| (follows_separator
|
|
|
|
&& options.require_literal_leading_dot
|
|
|
|
&& c == '.') =>
|
|
|
|
{
|
|
|
|
false
|
|
|
|
}
|
|
|
|
AnyChar => true,
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
AnyWithin(ref specifiers) => in_char_specifiers(specifiers, c, options),
|
|
|
|
AnyExcept(ref specifiers) => !in_char_specifiers(specifiers, c, options),
|
2022-03-13 19:30:27 +01:00
|
|
|
Char(c2) => chars_eq(c, c2, options.case_sensitive),
|
|
|
|
AnySequence | AnyRecursiveSequence => unreachable!(),
|
|
|
|
} {
|
|
|
|
return SubPatternDoesntMatch;
|
|
|
|
}
|
|
|
|
follows_separator = is_sep;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Iter is fused.
|
|
|
|
if file.next().is_none() {
|
|
|
|
Match
|
|
|
|
} else {
|
|
|
|
SubPatternDoesntMatch
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Fills `todo` with paths under `path` to be matched by `patterns[idx]`,
|
|
|
|
// special-casing patterns to match `.` and `..`, and avoiding `readdir()`
|
|
|
|
// calls when there are no metacharacters in the pattern.
|
|
|
|
fn fill_todo(
|
|
|
|
todo: &mut Vec<Result<(PathBuf, usize), GlobError>>,
|
|
|
|
patterns: &[Pattern],
|
|
|
|
idx: usize,
|
|
|
|
path: &Path,
|
|
|
|
options: MatchOptions,
|
|
|
|
) {
|
|
|
|
// convert a pattern that's just many Char(_) to a string
|
|
|
|
fn pattern_as_str(pattern: &Pattern) -> Option<String> {
|
|
|
|
let mut s = String::new();
|
|
|
|
for token in &pattern.tokens {
|
|
|
|
match *token {
|
|
|
|
Char(c) => s.push(c),
|
|
|
|
_ => return None,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Some(s)
|
|
|
|
}
|
|
|
|
|
|
|
|
let add = |todo: &mut Vec<_>, next_path: PathBuf| {
|
|
|
|
if idx + 1 == patterns.len() {
|
|
|
|
// We know it's good, so don't make the iterator match this path
|
|
|
|
// against the pattern again. In particular, it can't match
|
|
|
|
// . or .. globs since these never show up as path components.
|
2022-11-04 21:11:17 +01:00
|
|
|
todo.push(Ok((next_path, !0)));
|
2022-03-13 19:30:27 +01:00
|
|
|
} else {
|
|
|
|
fill_todo(todo, patterns, idx + 1, &next_path, options);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
let pattern = &patterns[idx];
|
|
|
|
let is_dir = is_dir(path);
|
|
|
|
let curdir = path == Path::new(".");
|
|
|
|
match pattern_as_str(pattern) {
|
|
|
|
Some(s) => {
|
|
|
|
// This pattern component doesn't have any metacharacters, so we
|
|
|
|
// don't need to read the current directory to know where to
|
|
|
|
// continue. So instead of passing control back to the iterator,
|
|
|
|
// we can just check for that one entry and potentially recurse
|
|
|
|
// right away.
|
|
|
|
let special = "." == s || ".." == s;
|
|
|
|
let next_path = if curdir {
|
|
|
|
PathBuf::from(s)
|
|
|
|
} else {
|
|
|
|
path.join(&s)
|
|
|
|
};
|
2022-05-14 02:56:26 +02:00
|
|
|
if (special && is_dir)
|
|
|
|
|| (!special
|
|
|
|
&& (fs::metadata(&next_path).is_ok()
|
|
|
|
|| fs::symlink_metadata(&next_path).is_ok()))
|
|
|
|
{
|
2022-03-13 19:30:27 +01:00
|
|
|
add(todo, next_path);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
None if is_dir => {
|
|
|
|
let dirs = fs::read_dir(path).and_then(|d| {
|
|
|
|
d.map(|e| {
|
|
|
|
e.map(|e| {
|
|
|
|
if curdir {
|
|
|
|
PathBuf::from(
|
|
|
|
e.path()
|
|
|
|
.file_name()
|
|
|
|
.expect("internal error: missing filename"),
|
|
|
|
)
|
|
|
|
} else {
|
|
|
|
e.path()
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.collect::<Result<Vec<_>, _>>()
|
|
|
|
});
|
|
|
|
match dirs {
|
|
|
|
Ok(mut children) => {
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
// FIXME: This check messes up a lot of tests for some reason
|
|
|
|
// if options.require_literal_leading_dot {
|
|
|
|
// children.retain(|x| {
|
|
|
|
// !x.file_name()
|
|
|
|
// .expect("internal error: getting filename")
|
|
|
|
// .to_str()
|
|
|
|
// .expect("internal error: filename to_str")
|
|
|
|
// .starts_with('.')
|
|
|
|
// });
|
|
|
|
// }
|
2022-03-13 19:30:27 +01:00
|
|
|
children.sort_by(|p1, p2| p2.file_name().cmp(&p1.file_name()));
|
|
|
|
todo.extend(children.into_iter().map(|x| Ok((x, idx))));
|
|
|
|
|
|
|
|
// Matching the special directory entries . and .. that
|
|
|
|
// refer to the current and parent directory respectively
|
|
|
|
// requires that the pattern has a leading dot, even if the
|
|
|
|
// `MatchOptions` field `require_literal_leading_dot` is not
|
|
|
|
// set.
|
|
|
|
if !pattern.tokens.is_empty() && pattern.tokens[0] == Char('.') {
|
|
|
|
for &special in &[".", ".."] {
|
|
|
|
if pattern.matches_with(special, options) {
|
|
|
|
add(todo, path.join(special));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Err(e) => {
|
|
|
|
todo.push(Err(GlobError {
|
|
|
|
path: path.to_path_buf(),
|
|
|
|
error: e,
|
|
|
|
}));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
None => {
|
|
|
|
// not a directory, nothing more to find
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
fn parse_char_specifiers(s: &[char]) -> Vec<CharSpecifier> {
|
|
|
|
let mut cs = Vec::new();
|
|
|
|
let mut i = 0;
|
|
|
|
while i < s.len() {
|
|
|
|
if i + 3 <= s.len() && s[i + 1] == '-' {
|
|
|
|
cs.push(CharRange(s[i], s[i + 2]));
|
|
|
|
i += 3;
|
|
|
|
} else {
|
|
|
|
cs.push(SingleChar(s[i]));
|
|
|
|
i += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
cs
|
|
|
|
}
|
|
|
|
|
|
|
|
fn in_char_specifiers(specifiers: &[CharSpecifier], c: char, options: MatchOptions) -> bool {
|
|
|
|
for &specifier in specifiers.iter() {
|
|
|
|
match specifier {
|
|
|
|
SingleChar(sc) => {
|
|
|
|
if chars_eq(c, sc, options.case_sensitive) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
CharRange(start, end) => {
|
|
|
|
// FIXME: work with non-ascii chars properly (issue #1347)
|
|
|
|
if !options.case_sensitive && c.is_ascii() && start.is_ascii() && end.is_ascii() {
|
|
|
|
// only allow case insensitive matching when
|
|
|
|
// both start and end are within a-z or A-Z
|
2023-11-08 23:58:54 +01:00
|
|
|
if start.is_ascii_alphabetic() && end.is_ascii_alphabetic() {
|
|
|
|
let start = start.to_ascii_lowercase();
|
|
|
|
let end = end.to_ascii_lowercase();
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
let c = c.to_ascii_lowercase();
|
2023-11-08 23:58:54 +01:00
|
|
|
if (start..=end).contains(&c) {
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-11-08 23:58:54 +01:00
|
|
|
if (start..=end).contains(&c) {
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
false
|
|
|
|
}
|
|
|
|
|
2022-03-13 19:30:27 +01:00
|
|
|
/// A helper function to determine if two chars are (possibly case-insensitively) equal.
|
|
|
|
fn chars_eq(a: char, b: char, case_sensitive: bool) -> bool {
|
|
|
|
if cfg!(windows) && path::is_separator(a) && path::is_separator(b) {
|
|
|
|
true
|
|
|
|
} else if !case_sensitive && a.is_ascii() && b.is_ascii() {
|
|
|
|
// FIXME: work with non-ascii chars properly (issue #9084)
|
|
|
|
a.to_ascii_lowercase() == b.to_ascii_lowercase()
|
|
|
|
} else {
|
|
|
|
a == b
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Configuration options to modify the behaviour of `Pattern::matches_with(..)`.
|
2023-10-09 16:31:15 +02:00
|
|
|
#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
2022-03-13 19:30:27 +01:00
|
|
|
pub struct MatchOptions {
|
|
|
|
/// Whether or not patterns should be matched in a case-sensitive manner.
|
|
|
|
/// This currently only considers upper/lower case relationships between
|
|
|
|
/// ASCII characters, but in future this might be extended to work with
|
|
|
|
/// Unicode.
|
|
|
|
pub case_sensitive: bool,
|
|
|
|
|
|
|
|
/// Whether or not path-component separator characters (e.g. `/` on
|
|
|
|
/// Posix) must be matched by a literal `/`, rather than by `*` or `?` or
|
|
|
|
/// `[...]`.
|
|
|
|
pub require_literal_separator: bool,
|
|
|
|
|
|
|
|
/// Whether or not paths that contain components that start with a `.`
|
|
|
|
/// will require that `.` appears literally in the pattern; `*`, `?`, `**`,
|
|
|
|
/// or `[...]` will not match. This is useful because such files are
|
|
|
|
/// conventionally considered hidden on Unix systems and it might be
|
|
|
|
/// desirable to skip them when listing files.
|
|
|
|
pub require_literal_leading_dot: bool,
|
2022-05-31 02:13:27 +02:00
|
|
|
|
|
|
|
/// if given pattern contains `**`, this flag check if `**` matches hidden directory.
|
|
|
|
/// For example: if true, `**` will match `.abcdef/ghi`.
|
|
|
|
pub recursive_match_hidden_dir: bool,
|
2022-03-13 19:30:27 +01:00
|
|
|
}
|
|
|
|
|
2023-10-09 16:31:15 +02:00
|
|
|
// Overwrite default behavior, because we want to make `recursive_match_hidden_dir` to true.
|
|
|
|
impl Default for MatchOptions {
|
|
|
|
fn default() -> Self {
|
2022-03-13 19:30:27 +01:00
|
|
|
Self {
|
|
|
|
case_sensitive: true,
|
|
|
|
require_literal_separator: false,
|
|
|
|
require_literal_leading_dot: false,
|
2022-05-31 02:13:27 +02:00
|
|
|
recursive_match_hidden_dir: true,
|
2022-03-13 19:30:27 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod test {
|
|
|
|
use super::{glob, MatchOptions, Pattern};
|
|
|
|
use std::path::Path;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_pattern_from_str() {
|
|
|
|
assert!("a*b".parse::<Pattern>().unwrap().matches("a_b"));
|
2023-01-15 03:03:32 +01:00
|
|
|
assert_eq!("a/**b".parse::<Pattern>().unwrap_err().pos, 4);
|
2022-03-13 19:30:27 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_wildcard_errors() {
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
assert!(Pattern::new("a/**b").unwrap_err().pos == 4);
|
|
|
|
assert!(Pattern::new("a/bc**").unwrap_err().pos == 3);
|
|
|
|
assert!(Pattern::new("a/*****").unwrap_err().pos == 4);
|
|
|
|
assert!(Pattern::new("a/b**c**d").unwrap_err().pos == 2);
|
|
|
|
assert!(Pattern::new("a**b").unwrap_err().pos == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_unclosed_bracket_errors() {
|
|
|
|
assert!(Pattern::new("abc[def").unwrap_err().pos == 3);
|
|
|
|
assert!(Pattern::new("abc[!def").unwrap_err().pos == 3);
|
|
|
|
assert!(Pattern::new("abc[").unwrap_err().pos == 3);
|
|
|
|
assert!(Pattern::new("abc[!").unwrap_err().pos == 3);
|
|
|
|
assert!(Pattern::new("abc[d").unwrap_err().pos == 3);
|
|
|
|
assert!(Pattern::new("abc[!d").unwrap_err().pos == 3);
|
|
|
|
assert!(Pattern::new("abc[]").unwrap_err().pos == 3);
|
|
|
|
assert!(Pattern::new("abc[!]").unwrap_err().pos == 3);
|
2022-03-13 19:30:27 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_glob_errors() {
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
assert!(glob("a/**b").err().unwrap().pos == 4);
|
|
|
|
assert!(glob("abc[def").err().unwrap().pos == 3);
|
2022-03-13 19:30:27 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// this test assumes that there is a /root directory and that
|
|
|
|
// the user running this test is not root or otherwise doesn't
|
|
|
|
// have permission to read its contents
|
2022-03-26 19:21:19 +01:00
|
|
|
#[cfg(all(
|
|
|
|
unix,
|
|
|
|
not(target_os = "macos"),
|
|
|
|
not(target_os = "android"),
|
|
|
|
not(target_os = "ios")
|
|
|
|
))]
|
2022-03-13 19:30:27 +01:00
|
|
|
#[test]
|
|
|
|
fn test_iteration_errors() {
|
|
|
|
use std::io;
|
|
|
|
let mut iter = glob("/root/*").unwrap();
|
|
|
|
|
2022-05-22 11:47:03 +02:00
|
|
|
// Skip test if running with permissions to read /root
|
|
|
|
if std::fs::read_dir("/root/").is_err() {
|
|
|
|
// GlobErrors shouldn't halt iteration
|
|
|
|
let next = iter.next();
|
|
|
|
assert!(next.is_some());
|
|
|
|
|
|
|
|
let err = next.unwrap();
|
|
|
|
assert!(err.is_err());
|
|
|
|
|
|
|
|
let err = err.err().unwrap();
|
|
|
|
assert!(err.path() == Path::new("/root"));
|
|
|
|
assert!(err.error().kind() == io::ErrorKind::PermissionDenied);
|
|
|
|
}
|
2022-03-13 19:30:27 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_absolute_pattern() {
|
|
|
|
assert!(glob("/").unwrap().next().is_some());
|
|
|
|
assert!(glob("//").unwrap().next().is_some());
|
|
|
|
|
|
|
|
// assume that the filesystem is not empty!
|
|
|
|
assert!(glob("/*").unwrap().next().is_some());
|
|
|
|
|
|
|
|
#[cfg(not(windows))]
|
|
|
|
fn win() {}
|
|
|
|
|
|
|
|
#[cfg(windows)]
|
|
|
|
fn win() {
|
|
|
|
use std::env::current_dir;
|
|
|
|
use std::path::Component;
|
|
|
|
|
|
|
|
// check windows absolute paths with host/device components
|
|
|
|
let root_with_device = current_dir()
|
|
|
|
.ok()
|
2023-10-06 23:29:58 +02:00
|
|
|
.map(|p| match p.components().next().unwrap() {
|
2022-03-13 19:30:27 +01:00
|
|
|
Component::Prefix(prefix_component) => {
|
2022-03-21 17:56:14 +01:00
|
|
|
let path = Path::new(prefix_component.as_os_str()).join("*");
|
2023-10-06 23:29:58 +02:00
|
|
|
path
|
2022-03-13 19:30:27 +01:00
|
|
|
}
|
|
|
|
_ => panic!("no prefix in this path"),
|
|
|
|
})
|
|
|
|
.unwrap();
|
|
|
|
// FIXME (#9639): This needs to handle non-utf8 paths
|
|
|
|
assert!(glob(root_with_device.as_os_str().to_str().unwrap())
|
|
|
|
.unwrap()
|
|
|
|
.next()
|
|
|
|
.is_some());
|
|
|
|
}
|
|
|
|
win()
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_wildcards() {
|
|
|
|
assert!(Pattern::new("a*b").unwrap().matches("a_b"));
|
|
|
|
assert!(Pattern::new("a*b*c").unwrap().matches("abc"));
|
|
|
|
assert!(!Pattern::new("a*b*c").unwrap().matches("abcd"));
|
|
|
|
assert!(Pattern::new("a*b*c").unwrap().matches("a_b_c"));
|
|
|
|
assert!(Pattern::new("a*b*c").unwrap().matches("a___b___c"));
|
|
|
|
assert!(Pattern::new("abc*abc*abc")
|
|
|
|
.unwrap()
|
|
|
|
.matches("abcabcabcabcabcabcabc"));
|
|
|
|
assert!(!Pattern::new("abc*abc*abc")
|
|
|
|
.unwrap()
|
|
|
|
.matches("abcabcabcabcabcabcabca"));
|
|
|
|
assert!(Pattern::new("a*a*a*a*a*a*a*a*a")
|
|
|
|
.unwrap()
|
|
|
|
.matches("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"));
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
assert!(Pattern::new("a*b[xyz]c*d").unwrap().matches("abxcdbxcddd"));
|
2022-03-13 19:30:27 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_recursive_wildcards() {
|
|
|
|
let pat = Pattern::new("some/**/needle.txt").unwrap();
|
|
|
|
assert!(pat.matches("some/needle.txt"));
|
|
|
|
assert!(pat.matches("some/one/needle.txt"));
|
|
|
|
assert!(pat.matches("some/one/two/needle.txt"));
|
|
|
|
assert!(pat.matches("some/other/needle.txt"));
|
|
|
|
assert!(!pat.matches("some/other/notthis.txt"));
|
|
|
|
|
|
|
|
// a single ** should be valid, for globs
|
|
|
|
// Should accept anything
|
|
|
|
let pat = Pattern::new("**").unwrap();
|
|
|
|
assert!(pat.is_recursive);
|
|
|
|
assert!(pat.matches("abcde"));
|
|
|
|
assert!(pat.matches(""));
|
|
|
|
assert!(pat.matches(".asdf"));
|
|
|
|
assert!(pat.matches("/x/.asdf"));
|
|
|
|
|
|
|
|
// collapse consecutive wildcards
|
|
|
|
let pat = Pattern::new("some/**/**/needle.txt").unwrap();
|
|
|
|
assert!(pat.matches("some/needle.txt"));
|
|
|
|
assert!(pat.matches("some/one/needle.txt"));
|
|
|
|
assert!(pat.matches("some/one/two/needle.txt"));
|
|
|
|
assert!(pat.matches("some/other/needle.txt"));
|
|
|
|
assert!(!pat.matches("some/other/notthis.txt"));
|
|
|
|
|
|
|
|
// ** can begin the pattern
|
|
|
|
let pat = Pattern::new("**/test").unwrap();
|
|
|
|
assert!(pat.matches("one/two/test"));
|
|
|
|
assert!(pat.matches("one/test"));
|
|
|
|
assert!(pat.matches("test"));
|
|
|
|
|
|
|
|
// /** can begin the pattern
|
|
|
|
let pat = Pattern::new("/**/test").unwrap();
|
|
|
|
assert!(pat.matches("/one/two/test"));
|
|
|
|
assert!(pat.matches("/one/test"));
|
|
|
|
assert!(pat.matches("/test"));
|
|
|
|
assert!(!pat.matches("/one/notthis"));
|
|
|
|
assert!(!pat.matches("/notthis"));
|
|
|
|
|
|
|
|
// Only start sub-patterns on start of path segment.
|
|
|
|
let pat = Pattern::new("**/.*").unwrap();
|
|
|
|
assert!(pat.matches(".abc"));
|
|
|
|
assert!(pat.matches("abc/.abc"));
|
|
|
|
assert!(!pat.matches("ab.c"));
|
|
|
|
assert!(!pat.matches("abc/ab.c"));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_lots_of_files() {
|
|
|
|
// this is a good test because it touches lots of differently named files
|
2023-05-24 21:53:57 +02:00
|
|
|
glob("/*/*/*/*").unwrap().nth(10000);
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_range_pattern() {
|
|
|
|
let pat = Pattern::new("a[0-9]b").unwrap();
|
|
|
|
for i in 0..10 {
|
2023-11-08 23:58:54 +01:00
|
|
|
assert!(pat.matches(&format!("a{}b", i)), "a{i}b =~ a[0-9]b");
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
}
|
|
|
|
assert!(!pat.matches("a_b"));
|
|
|
|
|
|
|
|
let pat = Pattern::new("a[!0-9]b").unwrap();
|
|
|
|
for i in 0..10 {
|
|
|
|
assert!(!pat.matches(&format!("a{}b", i)));
|
|
|
|
}
|
|
|
|
assert!(pat.matches("a_b"));
|
|
|
|
|
|
|
|
let pats = ["[a-z123]", "[1a-z23]", "[123a-z]"];
|
|
|
|
for &p in pats.iter() {
|
|
|
|
let pat = Pattern::new(p).unwrap();
|
|
|
|
for c in "abcdefghijklmnopqrstuvwxyz".chars() {
|
|
|
|
assert!(pat.matches(&c.to_string()));
|
|
|
|
}
|
|
|
|
for c in "ABCDEFGHIJKLMNOPQRSTUVWXYZ".chars() {
|
|
|
|
let options = MatchOptions {
|
|
|
|
case_sensitive: false,
|
2023-10-09 16:31:15 +02:00
|
|
|
..MatchOptions::default()
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
};
|
|
|
|
assert!(pat.matches_with(&c.to_string(), options));
|
|
|
|
}
|
|
|
|
assert!(pat.matches("1"));
|
|
|
|
assert!(pat.matches("2"));
|
|
|
|
assert!(pat.matches("3"));
|
|
|
|
}
|
|
|
|
|
|
|
|
let pats = ["[abc-]", "[-abc]", "[a-c-]"];
|
|
|
|
for &p in pats.iter() {
|
|
|
|
let pat = Pattern::new(p).unwrap();
|
|
|
|
assert!(pat.matches("a"));
|
|
|
|
assert!(pat.matches("b"));
|
|
|
|
assert!(pat.matches("c"));
|
|
|
|
assert!(pat.matches("-"));
|
|
|
|
assert!(!pat.matches("d"));
|
|
|
|
}
|
|
|
|
|
|
|
|
let pat = Pattern::new("[2-1]").unwrap();
|
|
|
|
assert!(!pat.matches("1"));
|
|
|
|
assert!(!pat.matches("2"));
|
|
|
|
|
|
|
|
assert!(Pattern::new("[-]").unwrap().matches("-"));
|
|
|
|
assert!(!Pattern::new("[!-]").unwrap().matches("-"));
|
2022-03-13 19:30:27 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_pattern_matches() {
|
|
|
|
let txt_pat = Pattern::new("*hello.txt").unwrap();
|
|
|
|
assert!(txt_pat.matches("hello.txt"));
|
|
|
|
assert!(txt_pat.matches("gareth_says_hello.txt"));
|
|
|
|
assert!(txt_pat.matches("some/path/to/hello.txt"));
|
|
|
|
assert!(txt_pat.matches("some\\path\\to\\hello.txt"));
|
|
|
|
assert!(txt_pat.matches("/an/absolute/path/to/hello.txt"));
|
|
|
|
assert!(!txt_pat.matches("hello.txt-and-then-some"));
|
|
|
|
assert!(!txt_pat.matches("goodbye.txt"));
|
|
|
|
|
|
|
|
let dir_pat = Pattern::new("*some/path/to/hello.txt").unwrap();
|
|
|
|
assert!(dir_pat.matches("some/path/to/hello.txt"));
|
|
|
|
assert!(dir_pat.matches("a/bigger/some/path/to/hello.txt"));
|
|
|
|
assert!(!dir_pat.matches("some/path/to/hello.txt-and-then-some"));
|
|
|
|
assert!(!dir_pat.matches("some/other/path/to/hello.txt"));
|
|
|
|
}
|
|
|
|
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
#[test]
|
|
|
|
fn test_pattern_escape() {
|
|
|
|
let s = "_[_]_?_*_!_";
|
|
|
|
assert_eq!(Pattern::escape(s), "_[[]_[]]_[?]_[*]_!_".to_string());
|
|
|
|
assert!(Pattern::new(&Pattern::escape(s)).unwrap().matches(s));
|
|
|
|
}
|
|
|
|
|
2022-03-13 19:30:27 +01:00
|
|
|
#[test]
|
|
|
|
fn test_pattern_matches_case_insensitive() {
|
|
|
|
let pat = Pattern::new("aBcDeFg").unwrap();
|
|
|
|
let options = MatchOptions {
|
|
|
|
case_sensitive: false,
|
|
|
|
require_literal_separator: false,
|
|
|
|
require_literal_leading_dot: false,
|
2022-05-31 02:13:27 +02:00
|
|
|
recursive_match_hidden_dir: true,
|
2022-03-13 19:30:27 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
assert!(pat.matches_with("aBcDeFg", options));
|
|
|
|
assert!(pat.matches_with("abcdefg", options));
|
|
|
|
assert!(pat.matches_with("ABCDEFG", options));
|
|
|
|
assert!(pat.matches_with("AbCdEfG", options));
|
|
|
|
}
|
|
|
|
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
#[test]
|
|
|
|
fn test_pattern_matches_case_insensitive_range() {
|
|
|
|
let pat_within = Pattern::new("[a]").unwrap();
|
|
|
|
let pat_except = Pattern::new("[!a]").unwrap();
|
|
|
|
|
|
|
|
let options_case_insensitive = MatchOptions {
|
|
|
|
case_sensitive: false,
|
|
|
|
require_literal_separator: false,
|
|
|
|
require_literal_leading_dot: false,
|
|
|
|
recursive_match_hidden_dir: false,
|
|
|
|
};
|
|
|
|
let options_case_sensitive = MatchOptions {
|
|
|
|
case_sensitive: true,
|
|
|
|
require_literal_separator: false,
|
|
|
|
require_literal_leading_dot: false,
|
|
|
|
recursive_match_hidden_dir: false,
|
|
|
|
};
|
|
|
|
|
|
|
|
assert!(pat_within.matches_with("a", options_case_insensitive));
|
|
|
|
assert!(pat_within.matches_with("A", options_case_insensitive));
|
|
|
|
assert!(!pat_within.matches_with("A", options_case_sensitive));
|
|
|
|
|
|
|
|
assert!(!pat_except.matches_with("a", options_case_insensitive));
|
|
|
|
assert!(!pat_except.matches_with("A", options_case_insensitive));
|
|
|
|
assert!(pat_except.matches_with("A", options_case_sensitive));
|
|
|
|
}
|
|
|
|
|
2022-03-13 19:30:27 +01:00
|
|
|
#[test]
|
|
|
|
fn test_pattern_matches_require_literal_separator() {
|
|
|
|
let options_require_literal = MatchOptions {
|
|
|
|
case_sensitive: true,
|
|
|
|
require_literal_separator: true,
|
|
|
|
require_literal_leading_dot: false,
|
2022-05-31 02:13:27 +02:00
|
|
|
recursive_match_hidden_dir: true,
|
2022-03-13 19:30:27 +01:00
|
|
|
};
|
|
|
|
let options_not_require_literal = MatchOptions {
|
|
|
|
case_sensitive: true,
|
|
|
|
require_literal_separator: false,
|
|
|
|
require_literal_leading_dot: false,
|
2022-05-31 02:13:27 +02:00
|
|
|
recursive_match_hidden_dir: true,
|
2022-03-13 19:30:27 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
assert!(Pattern::new("abc/def")
|
|
|
|
.unwrap()
|
|
|
|
.matches_with("abc/def", options_require_literal));
|
|
|
|
assert!(!Pattern::new("abc?def")
|
|
|
|
.unwrap()
|
|
|
|
.matches_with("abc/def", options_require_literal));
|
|
|
|
assert!(!Pattern::new("abc*def")
|
|
|
|
.unwrap()
|
|
|
|
.matches_with("abc/def", options_require_literal));
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
assert!(!Pattern::new("abc[/]def")
|
|
|
|
.unwrap()
|
|
|
|
.matches_with("abc/def", options_require_literal));
|
2022-03-13 19:30:27 +01:00
|
|
|
|
|
|
|
assert!(Pattern::new("abc/def")
|
|
|
|
.unwrap()
|
|
|
|
.matches_with("abc/def", options_not_require_literal));
|
|
|
|
assert!(Pattern::new("abc?def")
|
|
|
|
.unwrap()
|
|
|
|
.matches_with("abc/def", options_not_require_literal));
|
|
|
|
assert!(Pattern::new("abc*def")
|
|
|
|
.unwrap()
|
|
|
|
.matches_with("abc/def", options_not_require_literal));
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
assert!(Pattern::new("abc[/]def")
|
|
|
|
.unwrap()
|
|
|
|
.matches_with("abc/def", options_not_require_literal));
|
2022-03-13 19:30:27 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_pattern_matches_require_literal_leading_dot() {
|
|
|
|
let options_require_literal_leading_dot = MatchOptions {
|
|
|
|
case_sensitive: true,
|
|
|
|
require_literal_separator: false,
|
|
|
|
require_literal_leading_dot: true,
|
2022-05-31 02:13:27 +02:00
|
|
|
recursive_match_hidden_dir: true,
|
2022-03-13 19:30:27 +01:00
|
|
|
};
|
|
|
|
let options_not_require_literal_leading_dot = MatchOptions {
|
|
|
|
case_sensitive: true,
|
|
|
|
require_literal_separator: false,
|
|
|
|
require_literal_leading_dot: false,
|
2022-05-31 02:13:27 +02:00
|
|
|
recursive_match_hidden_dir: true,
|
2022-03-13 19:30:27 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
let f = |options| {
|
|
|
|
Pattern::new("*.txt")
|
|
|
|
.unwrap()
|
|
|
|
.matches_with(".hello.txt", options)
|
|
|
|
};
|
|
|
|
assert!(f(options_not_require_literal_leading_dot));
|
|
|
|
assert!(!f(options_require_literal_leading_dot));
|
|
|
|
|
|
|
|
let f = |options| {
|
|
|
|
Pattern::new(".*.*")
|
|
|
|
.unwrap()
|
|
|
|
.matches_with(".hello.txt", options)
|
|
|
|
};
|
|
|
|
assert!(f(options_not_require_literal_leading_dot));
|
|
|
|
assert!(f(options_require_literal_leading_dot));
|
|
|
|
|
|
|
|
let f = |options| {
|
|
|
|
Pattern::new("aaa/bbb/*")
|
|
|
|
.unwrap()
|
|
|
|
.matches_with("aaa/bbb/.ccc", options)
|
|
|
|
};
|
|
|
|
assert!(f(options_not_require_literal_leading_dot));
|
|
|
|
assert!(!f(options_require_literal_leading_dot));
|
|
|
|
|
|
|
|
let f = |options| {
|
|
|
|
Pattern::new("aaa/bbb/*")
|
|
|
|
.unwrap()
|
|
|
|
.matches_with("aaa/bbb/c.c.c.", options)
|
|
|
|
};
|
|
|
|
assert!(f(options_not_require_literal_leading_dot));
|
|
|
|
assert!(f(options_require_literal_leading_dot));
|
|
|
|
|
|
|
|
let f = |options| {
|
|
|
|
Pattern::new("aaa/bbb/.*")
|
|
|
|
.unwrap()
|
|
|
|
.matches_with("aaa/bbb/.ccc", options)
|
|
|
|
};
|
|
|
|
assert!(f(options_not_require_literal_leading_dot));
|
|
|
|
assert!(f(options_require_literal_leading_dot));
|
|
|
|
|
|
|
|
let f = |options| {
|
|
|
|
Pattern::new("aaa/?bbb")
|
|
|
|
.unwrap()
|
|
|
|
.matches_with("aaa/.bbb", options)
|
|
|
|
};
|
|
|
|
assert!(f(options_not_require_literal_leading_dot));
|
|
|
|
assert!(!f(options_require_literal_leading_dot));
|
|
|
|
|
update nu-glob based on latest glob 0.3.1 changes (#9099)
# Description
This PR updates `nu-glob` to add the latest changes and updates from
`rust-lang/glob` [v0.3.1](https://github.com/rust-lang/glob).
With these changes you can do this type of globbing
```rust
/// - `?` matches any single character.
///
/// - `*` matches any (possibly empty) sequence of characters.
///
/// - `**` matches the current directory and arbitrary subdirectories. This
/// sequence **must** form a single path component, so both `**a` and `b**`
/// are invalid and will result in an error. A sequence of more than two
/// consecutive `*` characters is also invalid.
///
/// - `[...]` matches any character inside the brackets. Character sequences
/// can also specify ranges of characters, as ordered by Unicode, so e.g.
/// `[0-9]` specifies any character between 0 and 9 inclusive. An unclosed
/// bracket is invalid.
///
/// - `[!...]` is the negation of `[...]`, i.e. it matches any characters
/// **not** in the brackets.
///
/// - The metacharacters `?`, `*`, `[`, `]` can be matched by using brackets
/// (e.g. `[?]`). When a `]` occurs immediately following `[` or `[!` then it
/// is interpreted as being part of, rather then ending, the character set, so
/// `]` and NOT `]` can be matched by `[]]` and `[!]]` respectively. The `-`
/// character can be specified inside a character sequence pattern by placing
/// it at the start or the end, e.g. `[abc-]`.
```
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236266670-03bf9384-4917-4074-9687-2c1c0d8ef34a.png)
Example - with character sequence negation
![image](https://user-images.githubusercontent.com/343840/236266421-73c3ee2c-1d10-4da0-86be-0afb51b50604.png)
Example - normal globbing
![image](https://user-images.githubusercontent.com/343840/236267138-60f22228-b8d3-4bf2-911b-a80560fdfa4f.png)
Example - with character sequences
![image](https://user-images.githubusercontent.com/343840/236267475-8c38fce9-87fe-4544-9757-34d319ce55b8.png)
Not that, if you're using a character sequence by itself, you need to
enclose it in quotes, otherwise nushell will think it's a range. But if
you already have a type of a bare word already, no quotes are necessary,
as in the last example.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
# 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 -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` 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
> ```
-->
# 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.
-->
2023-05-08 16:07:01 +02:00
|
|
|
let f = |options| {
|
|
|
|
Pattern::new("aaa/[.]bbb")
|
|
|
|
.unwrap()
|
|
|
|
.matches_with("aaa/.bbb", options)
|
|
|
|
};
|
|
|
|
assert!(f(options_not_require_literal_leading_dot));
|
|
|
|
assert!(!f(options_require_literal_leading_dot));
|
|
|
|
|
2022-03-13 19:30:27 +01:00
|
|
|
let f = |options| Pattern::new("**/*").unwrap().matches_with(".bbb", options);
|
|
|
|
assert!(f(options_not_require_literal_leading_dot));
|
|
|
|
assert!(!f(options_require_literal_leading_dot));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_matches_path() {
|
|
|
|
// on windows, (Path::new("a/b").as_str().unwrap() == "a\\b"), so this
|
|
|
|
// tests that / and \ are considered equivalent on windows
|
|
|
|
assert!(Pattern::new("a/b").unwrap().matches_path(Path::new("a/b")));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_path_join() {
|
2022-11-04 21:11:17 +01:00
|
|
|
let pattern = Path::new("one").join(Path::new("**/*.rs"));
|
2022-03-13 19:30:27 +01:00
|
|
|
assert!(Pattern::new(pattern.to_str().unwrap()).is_ok());
|
|
|
|
}
|
|
|
|
}
|